Repository: cassandra Updated Branches: refs/heads/trunk b19687691 -> a5f70ad4b
really commit CASSANDRA-13722 to trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a5f70ad4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5f70ad4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5f70ad4 Branch: refs/heads/trunk Commit: a5f70ad4b84fa301c6e46b68549b4326f09fd9cf Parents: b196876 Author: Jason Brown <[email protected]> Authored: Thu Aug 24 14:47:31 2017 -0700 Committer: Jason Brown <[email protected]> Committed: Thu Aug 24 14:47:31 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../stress/operations/predefined/CqlOperation.java | 11 +++++++---- .../apache/cassandra/stress/settings/SettingsErrors.java | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5f70ad4/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index cdcfe25..6b3ea2b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -125,6 +125,7 @@ 3.11.1 + * Add a skip read validation flag to cassandra-stress (CASSANDRA-13772) * Fix cassandra-stress hang issues when an error during cluster connection happens (CASSANDRA-12938) * Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744) * "ignore" option is ignored in sstableloader (CASSANDRA-13721) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5f70ad4/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java b/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java index 7fcc63d..c524107 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java @@ -186,11 +186,14 @@ public abstract class CqlOperation<V> extends PredefinedOperation public boolean validate(ByteBuffer[][] result) { - if (result.length != expect.size()) - return false; - for (int i = 0 ; i < result.length ; i++) - if (expect.get(i) != null && !expect.get(i).equals(Arrays.asList(result[i]))) + if (!settings.errors.skipReadValidation) + { + if (result.length != expect.size()) return false; + for (int i = 0; i < result.length; i++) + if (expect.get(i) != null && !expect.get(i).equals(Arrays.asList(result[i]))) + return false; + } return true; } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5f70ad4/tools/stress/src/org/apache/cassandra/stress/settings/SettingsErrors.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsErrors.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsErrors.java index aae4dd9..41a3dbd 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsErrors.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsErrors.java @@ -33,11 +33,13 @@ public class SettingsErrors implements Serializable public final boolean ignore; public final int tries; + public final boolean skipReadValidation; public SettingsErrors(Options options) { ignore = options.ignore.setByUser(); this.tries = Math.max(1, Integer.parseInt(options.retries.value()) + 1); + skipReadValidation = options.skipReadValidation.setByUser(); } // Option Declarations @@ -46,11 +48,11 @@ public class SettingsErrors implements Serializable { final OptionSimple retries = new OptionSimple("retries=", "[0-9]+", "9", "Number of tries to perform for each operation before failing", false); final OptionSimple ignore = new OptionSimple("ignore", "", null, "Do not fail on errors", false); - + final OptionSimple skipReadValidation = new OptionSimple("skip-read-validation", "", null, "Skip read validation and message output", false); @Override public List<? extends Option> options() { - return Arrays.asList(retries, ignore); + return Arrays.asList(retries, ignore, skipReadValidation); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
