From 109313c3ed3f7b2d8a79318e532e5f90a1e26414 Mon Sep 17 00:00:00 2001 From: Benedict Elliott Smith Date: Tue, 16 Sep 2014 20:48:29 +0100 Subject: [PATCH] cassandra-stress: fix support for NetworkTopologyStrategy patch by benedict; reviewed by yukim for CASSANDRA-7945 --- CHANGES.txt | 1 + .../apache/cassandra/stress/settings/OptionReplication.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index f89cc6d871..1764a20663 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.1 + * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945) * Fix saving caches when a table is dropped (CASSANDRA-7784) * Add better error checking of new stress profile (CASSANDRA-7716) * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom (CASSANDRA-7934) diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/OptionReplication.java b/tools/stress/src/org/apache/cassandra/stress/settings/OptionReplication.java index 06ec9b88cd..8b655871cc 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/OptionReplication.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/OptionReplication.java @@ -51,7 +51,8 @@ class OptionReplication extends OptionMulti public Map getOptions() { Map options = extraOptions(); - options.put("replication_factor", factor.value()); + if (!options.containsKey("replication_factor") && (strategy.value().equals("org.apache.cassandra.locator.SimpleStrategy") || factor.setByUser())) + options.put("replication_factor", factor.value()); return options; }