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 2014/02/07 17:40:09 UTC
[1/6] git commit: fix race in LeaveAndBootstrapTest
Updated Branches:
refs/heads/cassandra-1.2 ab5372f0f -> 2dd55c7d3
refs/heads/cassandra-2.0 fe571421d -> 7407cf981
refs/heads/trunk 65e09fa5b -> 4c0b4fa2e
fix race in LeaveAndBootstrapTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2dd55c7d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2dd55c7d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2dd55c7d
Branch: refs/heads/cassandra-1.2
Commit: 2dd55c7d31829b7746201fd86b647296b0c8ae58
Parents: ab5372f
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 10:37:36 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 10:37:53 2014 -0600
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd55c7d/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
index de7958f..c8a634a 100644
--- a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
+++ b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
@@ -108,6 +108,7 @@ public class LeaveAndBootstrapTest
valueFactory.leaving(Collections.singleton(endpointTokens.get(LEAVING_NODE))));
assertTrue(tmd.isLeaving(hosts.get(LEAVING_NODE)));
+ Thread.sleep(100); // because there is a tight race between submit and blockUntilFinished
PendingRangeCalculatorService.instance.blockUntilFinished();
AbstractReplicationStrategy strategy;
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7407cf98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7407cf98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7407cf98
Branch: refs/heads/trunk
Commit: 7407cf981b928886a868cb82f899a99dd03fe612
Parents: fe57142 2dd55c7
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 10:38:00 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 10:38:00 2014 -0600
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7407cf98/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
----------------------------------------------------------------------
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7407cf98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7407cf98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7407cf98
Branch: refs/heads/cassandra-2.0
Commit: 7407cf981b928886a868cb82f899a99dd03fe612
Parents: fe57142 2dd55c7
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 10:38:00 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 10:38:00 2014 -0600
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7407cf98/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
----------------------------------------------------------------------
[3/6] git commit: fix race in LeaveAndBootstrapTest
Posted by br...@apache.org.
fix race in LeaveAndBootstrapTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2dd55c7d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2dd55c7d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2dd55c7d
Branch: refs/heads/trunk
Commit: 2dd55c7d31829b7746201fd86b647296b0c8ae58
Parents: ab5372f
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 10:37:36 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 10:37:53 2014 -0600
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd55c7d/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
index de7958f..c8a634a 100644
--- a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
+++ b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
@@ -108,6 +108,7 @@ public class LeaveAndBootstrapTest
valueFactory.leaving(Collections.singleton(endpointTokens.get(LEAVING_NODE))));
assertTrue(tmd.isLeaving(hosts.get(LEAVING_NODE)));
+ Thread.sleep(100); // because there is a tight race between submit and blockUntilFinished
PendingRangeCalculatorService.instance.blockUntilFinished();
AbstractReplicationStrategy strategy;
[2/6] git commit: fix race in LeaveAndBootstrapTest
Posted by br...@apache.org.
fix race in LeaveAndBootstrapTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2dd55c7d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2dd55c7d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2dd55c7d
Branch: refs/heads/cassandra-2.0
Commit: 2dd55c7d31829b7746201fd86b647296b0c8ae58
Parents: ab5372f
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 10:37:36 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 10:37:53 2014 -0600
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd55c7d/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
index de7958f..c8a634a 100644
--- a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
+++ b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
@@ -108,6 +108,7 @@ public class LeaveAndBootstrapTest
valueFactory.leaving(Collections.singleton(endpointTokens.get(LEAVING_NODE))));
assertTrue(tmd.isLeaving(hosts.get(LEAVING_NODE)));
+ Thread.sleep(100); // because there is a tight race between submit and blockUntilFinished
PendingRangeCalculatorService.instance.blockUntilFinished();
AbstractReplicationStrategy strategy;
[6/6] 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/4c0b4fa2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c0b4fa2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c0b4fa2
Branch: refs/heads/trunk
Commit: 4c0b4fa2e5a65be804d8179c376d672a42f4882b
Parents: 65e09fa 7407cf9
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 10:38:10 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 10:38:10 2014 -0600
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c0b4fa2/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
----------------------------------------------------------------------