cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Date Mon, 11 Feb 2013 19:05:58 GMT
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	src/java/org/apache/cassandra/db/HintedHandOffManager.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d3ef440
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d3ef440
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d3ef440

Branch: refs/heads/cassandra-1.2
Commit: 6d3ef440d127d6fe81d21b85357ebe6ccb43b747
Parents: 0820b20 577cb2c
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Mon Feb 11 13:05:51 2013 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Mon Feb 11 13:05:51 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../apache/cassandra/db/HintedHandOffManager.java  |   15 ++++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d3ef440/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d3ef440/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 483d8cd,eea4ec4..58e6ef0
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@@ -397,23 -377,16 +397,20 @@@ public class HintedHandOffManager imple
              }
          }
  
-         if (rowsReplayed.get() > 0)
+         try
          {
-             try
-             {
-                 compact().get();
-             }
-             catch (Exception e)
-             {
-                 throw new RuntimeException(e);
-             }
+             compact().get();
+         }
+         catch (Exception e)
+         {
+             throw new RuntimeException(e);
          }
  
 -        logger_.info(String.format("Finished hinted handoff of %s rows to endpoint %s",
rowsReplayed, endpoint));
 +        logger.info(String.format("Finished hinted handoff of %s rows to endpoint %s", rowsReplayed,
endpoint));
 +        if (hintedHandOffPaused)
 +        {
 +            logger.info("Hints delivery process is paused, not delivering further hints");
 +        }
      }
  
      /**


Mime
View raw message