You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/11/19 18:23:57 UTC
[1/3] git commit: Fix ScrubTest
Updated Branches:
refs/heads/cassandra-1.2 0a5a766d5 -> 39e3a5e03
Fix ScrubTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/445c874f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/445c874f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/445c874f
Branch: refs/heads/cassandra-1.2
Commit: 445c874faa4c38b8e5b14835b282ac2efe358a43
Parents: 0a5a766
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Nov 19 18:22:24 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Nov 19 18:22:24 2013 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/ScrubTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/445c874f/test/unit/org/apache/cassandra/db/ScrubTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java
index c26939a..68d1f5e 100644
--- a/test/unit/org/apache/cassandra/db/ScrubTest.java
+++ b/test/unit/org/apache/cassandra/db/ScrubTest.java
@@ -85,6 +85,7 @@ public class ScrubTest extends SchemaLoader
CompactionManager.instance.disableAutoCompaction();
Table table = Table.open(TABLE);
ColumnFamilyStore cfs = table.getColumnFamilyStore(CF);
+ cfs.clearUnsafe();
List<Row> rows;
@@ -106,6 +107,7 @@ public class ScrubTest extends SchemaLoader
CompactionManager.instance.disableAutoCompaction();
Table table = Table.open(TABLE);
ColumnFamilyStore cfs = table.getColumnFamilyStore(CF3);
+ cfs.clearUnsafe();
RowMutation rm;
rm = new RowMutation(TABLE, ByteBufferUtil.bytes(1));
@@ -125,6 +127,7 @@ public class ScrubTest extends SchemaLoader
CompactionManager.instance.disableAutoCompaction();
Table table = Table.open(TABLE);
ColumnFamilyStore cfs = table.getColumnFamilyStore(CF);
+ cfs.clearUnsafe();
List<Row> rows;
@@ -147,6 +150,7 @@ public class ScrubTest extends SchemaLoader
Table table = Table.open(TABLE);
String columnFamily = "Standard3";
ColumnFamilyStore cfs = table.getColumnFamilyStore(columnFamily);
+ cfs.clearUnsafe();
/*
* Code used to generate an outOfOrder sstable. The test for out-of-order key in SSTableWriter must also be commented out.
[2/3] git commit: Fix LeaveAndBootstrapTest
Posted by sl...@apache.org.
Fix LeaveAndBootstrapTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eeb8d1bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eeb8d1bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eeb8d1bd
Branch: refs/heads/cassandra-1.2
Commit: eeb8d1bdc6ea67f472bcbc5225cdaca5a3199650
Parents: 445c874
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Nov 19 18:05:03 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Nov 19 18:22:59 2013 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/service/LeaveAndBootstrapTest.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eeb8d1bd/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 73abbe2..d385b11 100644
--- a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
+++ b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
@@ -107,6 +107,8 @@ public class LeaveAndBootstrapTest
valueFactory.leaving(Collections.singleton(endpointTokens.get(LEAVING_NODE))));
assertTrue(tmd.isLeaving(hosts.get(LEAVING_NODE)));
+ PendingRangeCalculatorService.instance.blockUntilFinished();
+
AbstractReplicationStrategy strategy;
for (String table : Schema.instance.getNonSystemTables())
{
@@ -232,6 +234,8 @@ public class LeaveAndBootstrapTest
expectedEndpoints.get("Keyspace4").putAll(new BigIntegerToken("85"), makeAddrs("127.0.0.10", "127.0.0.1", "127.0.0.2", "127.0.0.3"));
expectedEndpoints.get("Keyspace4").putAll(new BigIntegerToken("95"), makeAddrs("127.0.0.1", "127.0.0.2", "127.0.0.3"));
+ PendingRangeCalculatorService.instance.blockUntilFinished();
+
for (Map.Entry<String, AbstractReplicationStrategy> tableStrategy : tableStrategyMap.entrySet())
{
String table = tableStrategy.getKey();
@@ -352,6 +356,8 @@ public class LeaveAndBootstrapTest
expectedEndpoints.get("Keyspace4").get(new BigIntegerToken("75")).removeAll(makeAddrs("127.0.0.10"));
expectedEndpoints.get("Keyspace4").get(new BigIntegerToken("85")).removeAll(makeAddrs("127.0.0.10"));
+ PendingRangeCalculatorService.instance.blockUntilFinished();
+
for (Map.Entry<String, AbstractReplicationStrategy> tableStrategy : tableStrategyMap.entrySet())
{
String table = tableStrategy.getKey();
[3/3] git commit: Fix potential ConcurrentModificationException in
tests
Posted by sl...@apache.org.
Fix potential ConcurrentModificationException in tests
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39e3a5e0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39e3a5e0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39e3a5e0
Branch: refs/heads/cassandra-1.2
Commit: 39e3a5e039a61e649827950bb36f67617e0bd884
Parents: eeb8d1b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Nov 19 18:13:23 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Nov 19 18:23:02 2013 +0100
----------------------------------------------------------------------
.../apache/cassandra/locator/TokenMetadata.java | 22 +++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39e3a5e0/src/java/org/apache/cassandra/locator/TokenMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/TokenMetadata.java b/src/java/org/apache/cassandra/locator/TokenMetadata.java
index ac9a1d0..5ab1b3f 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -876,13 +876,21 @@ public class TokenMetadata
/** used by tests */
public void clearUnsafe()
{
- bootstrapTokens.clear();
- tokenToEndpointMap.clear();
- topology.clear();
- leavingEndpoints.clear();
- pendingRanges.clear();
- endpointToHostIdMap.clear();
- invalidateCaches();
+ lock.writeLock().lock();
+ try
+ {
+ bootstrapTokens.clear();
+ tokenToEndpointMap.clear();
+ topology.clear();
+ leavingEndpoints.clear();
+ pendingRanges.clear();
+ endpointToHostIdMap.clear();
+ invalidateCaches();
+ }
+ finally
+ {
+ lock.writeLock().unlock();
+ }
}
public String toString()