From fa39b6e2775abef6323598461f8fadbcbbe793e5 Mon Sep 17 00:00:00 2001 From: Paulo Motta Date: Sun, 11 Feb 2018 15:17:11 -0200 Subject: [PATCH] ninja: fix bad #14092 merge from cassandra-3.0 to cassandra-3.11 --- .../org/apache/cassandra/tools/StandaloneScrubber.java | 8 +++++++- src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java index ead8fc57d4..f4a5f9b962 100644 --- a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java +++ b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java @@ -43,6 +43,12 @@ import static org.apache.cassandra.tools.BulkLoader.CmdLineOptions; public class StandaloneScrubber { + public static final String REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION = "Rewrites rows with overflowed expiration date affected by CASSANDRA-14092 with " + + "the maximum supported expiration date of 2038-01-19T03:14:06+00:00. " + + "The rows are rewritten with the original timestamp incremented by one millisecond " + + "to override/supersede any potential tombstone that may have been generated " + + "during compaction of the affected rows."; + private static final String TOOL_NAME = "sstablescrub"; private static final String VERBOSE_OPTION = "verbose"; private static final String DEBUG_OPTION = "debug"; @@ -269,7 +275,7 @@ public class StandaloneScrubber options.addOption("m", MANIFEST_CHECK_OPTION, "only check and repair the leveled manifest, without actually scrubbing the sstables"); options.addOption("s", SKIP_CORRUPTED_OPTION, "skip corrupt rows in counter tables"); options.addOption("n", NO_VALIDATE_OPTION, "do not validate columns using column validator"); - options.addOption("r", REINSERT_OVERFLOWED_TTL_OPTION, "Reinsert found rows with overflowed TTL affected by CASSANDRA-14092"); + options.addOption("r", REINSERT_OVERFLOWED_TTL_OPTION, REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION); return options; } diff --git a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java index 812202dc25..ead2fd4c37 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java @@ -26,6 +26,7 @@ import java.util.List; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; +import org.apache.cassandra.tools.StandaloneScrubber; @Command(name = "scrub", description = "Scrub (rebuild sstables for) one or more tables") public class Scrub extends NodeToolCmd @@ -50,7 +51,7 @@ public class Scrub extends NodeToolCmd @Option(title = "reinsert_overflowed_ttl", name = {"r", "--reinsert-overflowed-ttl"}, - description = "Reinsert found rows with overflowed TTL affected by CASSANDRA-14092") + description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION) private boolean reinsertOverflowedTTL = false; @Option(title = "jobs",