diff --git a/CHANGES.txt b/CHANGES.txt index 56ed1be85a..8b7abe48fd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -104,6 +104,7 @@ 2.1.6 + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361) * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339) * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564) * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606) diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java index 60b4c09278..bfd85298eb 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java @@ -119,7 +119,7 @@ public abstract class SettingsCommand implements Serializable { final OptionSimple noWarmup = new OptionSimple("no-warmup", "", null, "Do not warmup the process", false); final OptionSimple truncate = new OptionSimple("truncate=", "never|once|always", "never", "Truncate the table: never, before performing any work, or before each iteration", false); - final OptionSimple consistencyLevel = new OptionSimple("cl=", "ONE|QUORUM|LOCAL_QUORUM|EACH_QUORUM|ALL|ANY", "ONE", "Consistency level to use", false); + final OptionSimple consistencyLevel = new OptionSimple("cl=", "ONE|QUORUM|LOCAL_QUORUM|EACH_QUORUM|ALL|ANY|TWO|THREE|LOCAL_ONE", "LOCAL_ONE", "Consistency level to use", false); } static class Count extends Options diff --git a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java index 43d9ddcacb..fa04dbc5d3 100644 --- a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java +++ b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java @@ -178,10 +178,6 @@ public class JavaDriverClient return com.datastax.driver.core.ConsistencyLevel.LOCAL_QUORUM; case EACH_QUORUM: return com.datastax.driver.core.ConsistencyLevel.EACH_QUORUM; - case SERIAL: - return com.datastax.driver.core.ConsistencyLevel.SERIAL; - case LOCAL_SERIAL: - return com.datastax.driver.core.ConsistencyLevel.LOCAL_SERIAL; case LOCAL_ONE: return com.datastax.driver.core.ConsistencyLevel.LOCAL_ONE; }