You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2017/04/20 09:52:01 UTC
[02/10] cassandra git commit: Avoid starting gossiper in RemoveTest
Avoid starting gossiper in RemoveTest
Patch by Alex Petrov; reviewed by Joel Knighton for CASSANDRA-13407
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31590f5d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31590f5d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31590f5d
Branch: refs/heads/cassandra-3.0
Commit: 31590f5da10de8bbcf36d19617ced02b37be2a57
Parents: 590e151
Author: Alex Petrov <ol...@gmail.com>
Authored: Fri Apr 7 10:32:54 2017 +0200
Committer: Alex Petrov <ol...@gmail.com>
Committed: Thu Apr 20 11:40:53 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
test/unit/org/apache/cassandra/service/RemoveTest.java | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/31590f5d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 366db50..33c24ad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
* Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
* Fix JVM metric paths (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/31590f5d/test/unit/org/apache/cassandra/service/RemoveTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/RemoveTest.java b/test/unit/org/apache/cassandra/service/RemoveTest.java
index 9f1d6a8..800c904 100644
--- a/test/unit/org/apache/cassandra/service/RemoveTest.java
+++ b/test/unit/org/apache/cassandra/service/RemoveTest.java
@@ -35,7 +35,6 @@ import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.RandomPartitioner;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.locator.TokenMetadata;
import org.apache.cassandra.net.MessageOut;
import org.apache.cassandra.net.MessagingService;
@@ -61,7 +60,7 @@ public class RemoveTest
public static void setupClass() throws ConfigurationException
{
oldPartitioner = StorageService.instance.setPartitionerUnsafe(partitioner);
- SchemaLoader.loadSchema();
+ SchemaLoader.prepareServer();
}
@AfterClass
@@ -79,7 +78,6 @@ public class RemoveTest
Util.createInitialRing(ss, partitioner, endpointTokens, keyTokens, hosts, hostIds, 6);
MessagingService.instance().listen();
- Gossiper.instance.start(1);
removalhost = hosts.get(5);
hosts.remove(removalhost);
removalId = hostIds.get(5);