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/17 22:58:04 UTC
[1/2] git commit: Alter the wording of assassination end logging
Updated Branches:
refs/heads/cassandra-2.0 83b0b2fb5 -> cfa097cdd
Alter the wording of assassination end logging
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e2401e0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e2401e0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e2401e0
Branch: refs/heads/cassandra-2.0
Commit: 6e2401e00ed75bac364f4a8f7429f34e6b9d7d7b
Parents: dc95c8c
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Sep 17 23:56:02 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Sep 17 23:56:02 2013 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e2401e0/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 0dcfb90..b4ea88a 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -488,7 +488,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
{
throw new AssertionError(e);
}
- logger.warn("Finished killing {}", endpoint);
+ logger.warn("Finished assassinating {}", endpoint);
}
public boolean isKnownEndpoint(InetAddress endpoint)
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/gms/Gossiper.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfa097cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfa097cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfa097cd
Branch: refs/heads/cassandra-2.0
Commit: cfa097cdd5e28d7fe8204248e246a1fae226d2c0
Parents: 83b0b2f 6e2401e
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Sep 17 23:57:48 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Sep 17 23:57:48 2013 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfa097cd/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index 518b9ab,b4ea88a..ed69442
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -474,8 -480,15 +474,8 @@@ public class Gossiper implements IFailu
// do not pass go, do not collect 200 dollars, just gtfo
epState.addApplicationState(ApplicationState.STATUS, StorageService.instance.valueFactory.left(tokens, computeExpireTime()));
handleMajorStateChange(endpoint, epState);
- try
- {
- Thread.sleep(intervalInMillis * 4);
- }
- catch (InterruptedException e)
- {
- throw new AssertionError(e);
- }
+ Uninterruptibles.sleepUninterruptibly(intervalInMillis * 4, TimeUnit.MILLISECONDS);
- logger.warn("Finished killing {}", endpoint);
+ logger.warn("Finished assassinating {}", endpoint);
}
public boolean isKnownEndpoint(InetAddress endpoint)