You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/09/04 01:10:52 UTC

[1/2] git commit: Fix diffrence typo in HintedHandoffMetrics

Updated Branches:
  refs/heads/trunk 93ac0397d -> 2495c5f78


Fix diffrence typo in HintedHandoffMetrics


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

Branch: refs/heads/trunk
Commit: 3b4984977a1f5c4c4093f87c64ccb343f04ae743
Parents: 0573d95
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Sep 4 02:10:18 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Sep 4 02:10:18 2013 +0300

----------------------------------------------------------------------
 .../cassandra/metrics/HintedHandoffMetrics.java       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b498497/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
index 0f3992f..560f290 100644
--- a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
@@ -75,11 +75,11 @@ public class HintedHandoffMetrics
     {
         for (Entry<InetAddress, DifferencingCounter> entry : notStored.asMap().entrySet())
         {
-            long diffrence = entry.getValue().diffrence();
-            if (diffrence == 0)
+            long difference = entry.getValue().difference();
+            if (difference == 0)
                 continue;
-            logger.warn("{} has {} dropped hints, because node is down past configured hint window.", entry.getKey(), diffrence);
-            SystemKeyspace.updateHintsDropped(entry.getKey(), UUIDGen.getTimeUUID(), (int) diffrence);
+            logger.warn("{} has {} dropped hints, because node is down past configured hint window.", entry.getKey(), difference);
+            SystemKeyspace.updateHintsDropped(entry.getKey(), UUIDGen.getTimeUUID(), (int) difference);
         }
     }
 
@@ -93,12 +93,12 @@ public class HintedHandoffMetrics
             this.meter = Metrics.newCounter(new MetricName(GROUP_NAME, TYPE_NAME, "Hints_not_stored-" + address.getHostAddress()));
         }
 
-        public long diffrence()
+        public long difference()
         {
             long current = meter.count();
-            long diffrence = current - reported;
+            long difference = current - reported;
             this.reported = current;
-            return diffrence;
+            return difference;
         }
 
         public long count()


[2/2] git commit: Merge branch 'cassandra-2.0' into trunk

Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 2495c5f78dc89ef56da093c4c1c32e38f12a4a0e
Parents: 93ac039 3b49849
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Sep 4 02:10:41 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Sep 4 02:10:41 2013 +0300

----------------------------------------------------------------------
 .../cassandra/metrics/HintedHandoffMetrics.java       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------