You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/10/18 21:34:46 UTC
[1/3] git commit: millis->nanos
Updated Branches:
refs/heads/cassandra-2.0 99bef9dfe -> 2bc30e4ba
refs/heads/trunk 50b08f2b2 -> d9a03a073
millis->nanos
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2bc30e4b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bc30e4b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2bc30e4b
Branch: refs/heads/cassandra-2.0
Commit: 2bc30e4ba50f8f21d357d88ae4cf70e15df270bd
Parents: 99bef9d
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 18 14:33:05 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 18 14:33:05 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bc30e4b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 4065c9e..62f0907 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -685,7 +685,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
InetAddress existing = tokenMetadata.getEndpoint(token);
if (existing != null)
{
- if (Gossiper.instance.getEndpointStateForEndpoint(existing).getUpdateTimestamp() > (System.currentTimeMillis() - delay))
+ if (Gossiper.instance.getEndpointStateForEndpoint(existing).getUpdateTimestamp() > (System.nanoTime() - delay*1000))
throw new UnsupportedOperationException("Cannnot replace a live node... ");
current.add(existing);
}
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@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/d9a03a07
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9a03a07
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9a03a07
Branch: refs/heads/trunk
Commit: d9a03a07391d56a9795b94dbf872cd796d4a6e07
Parents: 50b08f2 2bc30e4
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 18 14:33:11 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 18 14:33:11 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9a03a07/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[2/3] git commit: millis->nanos
Posted by br...@apache.org.
millis->nanos
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2bc30e4b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bc30e4b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2bc30e4b
Branch: refs/heads/trunk
Commit: 2bc30e4ba50f8f21d357d88ae4cf70e15df270bd
Parents: 99bef9d
Author: Brandon Williams <br...@apache.org>
Authored: Fri Oct 18 14:33:05 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Oct 18 14:33:05 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bc30e4b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 4065c9e..62f0907 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -685,7 +685,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
InetAddress existing = tokenMetadata.getEndpoint(token);
if (existing != null)
{
- if (Gossiper.instance.getEndpointStateForEndpoint(existing).getUpdateTimestamp() > (System.currentTimeMillis() - delay))
+ if (Gossiper.instance.getEndpointStateForEndpoint(existing).getUpdateTimestamp() > (System.nanoTime() - delay*1000))
throw new UnsupportedOperationException("Cannnot replace a live node... ");
current.add(existing);
}