You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by pa...@apache.org on 2018/03/20 01:34:47 UTC
[01/16] cassandra git commit: Handle static and partition deletion
properly on ThrottledUnfilteredIterator
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 4bbd28a04 -> 19d26bcb8
refs/heads/cassandra-2.2 9715fc09b -> 53b6116d5
refs/heads/cassandra-3.0 1d05bdab2 -> cccaf7ca2
refs/heads/cassandra-3.11 f57d12ee7 -> 656cca778
refs/heads/trunk 59814db54 -> c09e298a4
Handle static and partition deletion properly on ThrottledUnfilteredIterator
Patch by Zhao Yang; Reviewed by Paulo Motta for CASSANDRA-14315
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b9e9854
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b9e9854
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b9e9854
Branch: refs/heads/trunk
Commit: 5b9e985474e696a83d23e7cf4bedaf360cdb1eaf
Parents: 59814db
Author: Zhao Yang <zh...@gmail.com>
Authored: Thu Mar 15 11:47:54 2018 +0800
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 21:53:44 2018 -0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/rows/ThrottledUnfilteredIterator.java | 20 ++++-
.../rows/ThrottledUnfilteredIteratorTest.java | 88 +++++++++++++++++++-
3 files changed, 102 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b9e9854/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fed0cd1..fbcc1bb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0
+ * Handle static and partition deletion properly on ThrottledUnfilteredIterator (CASSANDRA-14315)
* NodeTool clientstats should show SSL Cipher (CASSANDRA-14322)
* Add ability to specify driver name and version (CASSANDRA-14275)
* Abstract streaming for pluggable storage (CASSANDRA-14115)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b9e9854/src/java/org/apache/cassandra/db/rows/ThrottledUnfilteredIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/ThrottledUnfilteredIterator.java b/src/java/org/apache/cassandra/db/rows/ThrottledUnfilteredIterator.java
index dd33b1e..a2e8425 100644
--- a/src/java/org/apache/cassandra/db/rows/ThrottledUnfilteredIterator.java
+++ b/src/java/org/apache/cassandra/db/rows/ThrottledUnfilteredIterator.java
@@ -75,8 +75,14 @@ public class ThrottledUnfilteredIterator extends AbstractIterator<UnfilteredRowI
while (throttledItr != null && throttledItr.hasNext())
throttledItr.next();
+ // The original UnfilteredRowIterator may have only partition deletion or static column but without unfiltereds.
+ // Return the original UnfilteredRowIterator
if (!origin.hasNext())
- return endOfData();
+ {
+ if (throttledItr != null)
+ return endOfData();
+ return throttledItr = origin;
+ }
throttledItr = new WrappingUnfilteredRowIterator(origin)
{
@@ -212,11 +218,18 @@ public class ThrottledUnfilteredIterator extends AbstractIterator<UnfilteredRowI
}
/**
- * Splits a {@link UnfilteredPartitionIterator} in {@link UnfilteredRowIterator} batches with size no higher
- * than <b>maxBatchSize</b>
+ * Splits a {@link UnfilteredPartitionIterator} in {@link UnfilteredRowIterator} batches with size no higher than
+ * <b>maxBatchSize</b>
+ *
+ * @param partitionIterator
+ * @param maxBatchSize max number of unfiltereds in the UnfilteredRowIterator. if 0 is given, it means no throttle.
+ * @return
*/
public static CloseableIterator<UnfilteredRowIterator> throttle(UnfilteredPartitionIterator partitionIterator, int maxBatchSize)
{
+ if (maxBatchSize == 0) // opt out
+ return partitionIterator;
+
return new AbstractIterator<UnfilteredRowIterator>()
{
ThrottledUnfilteredIterator current = null;
@@ -232,7 +245,6 @@ public class ThrottledUnfilteredIterator extends AbstractIterator<UnfilteredRowI
if (current == null && partitionIterator.hasNext())
{
current = new ThrottledUnfilteredIterator(partitionIterator.next(), maxBatchSize);
- assert current.hasNext() : "UnfilteredPartitionIterator should not contain empty partitions";
}
if (current != null && current.hasNext())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b9e9854/test/unit/org/apache/cassandra/db/rows/ThrottledUnfilteredIteratorTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/rows/ThrottledUnfilteredIteratorTest.java b/test/unit/org/apache/cassandra/db/rows/ThrottledUnfilteredIteratorTest.java
index 2d2cce0..a530521 100644
--- a/test/unit/org/apache/cassandra/db/rows/ThrottledUnfilteredIteratorTest.java
+++ b/test/unit/org/apache/cassandra/db/rows/ThrottledUnfilteredIteratorTest.java
@@ -84,6 +84,7 @@ public class ThrottledUnfilteredIteratorTest extends CQLTester
static final TableMetadata metadata;
static final ColumnMetadata v1Metadata;
static final ColumnMetadata v2Metadata;
+ static final ColumnMetadata staticMetadata;
static
{
@@ -93,9 +94,81 @@ public class ThrottledUnfilteredIteratorTest extends CQLTester
.addClusteringColumn("ck2", Int32Type.instance)
.addRegularColumn("v1", Int32Type.instance)
.addRegularColumn("v2", Int32Type.instance)
+ .addStaticColumn("s1", Int32Type.instance)
.build();
v1Metadata = metadata.regularAndStaticColumns().columns(false).getSimple(0);
v2Metadata = metadata.regularAndStaticColumns().columns(false).getSimple(1);
+ staticMetadata = metadata.regularAndStaticColumns().columns(true).getSimple(0);
+ }
+
+ @Test
+ public void emptyPartitionDeletionTest() throws Throwable
+ {
+ // create cell tombstone, range tombstone, partition deletion
+ createTable("CREATE TABLE %s (pk int, ck1 int, ck2 int, v1 int, v2 int, PRIMARY KEY (pk, ck1, ck2))");
+ // partition deletion
+ execute("DELETE FROM %s USING TIMESTAMP 160 WHERE pk=1");
+
+ // flush and generate 1 sstable
+ ColumnFamilyStore cfs = Keyspace.open(keyspace()).getColumnFamilyStore(currentTable());
+ cfs.forceBlockingFlush();
+ cfs.disableAutoCompaction();
+ cfs.forceMajorCompaction();
+
+ assertEquals(1, cfs.getLiveSSTables().size());
+ SSTableReader reader = cfs.getLiveSSTables().iterator().next();
+
+ try (ISSTableScanner scanner = reader.getScanner();
+ CloseableIterator<UnfilteredRowIterator> throttled = ThrottledUnfilteredIterator.throttle(scanner, 100))
+ {
+ assertTrue(throttled.hasNext());
+ UnfilteredRowIterator iterator = throttled.next();
+ assertFalse(throttled.hasNext());
+ assertFalse(iterator.hasNext());
+ assertEquals(iterator.partitionLevelDeletion().markedForDeleteAt(), 160);
+ }
+
+ // test opt out
+ try (ISSTableScanner scanner = reader.getScanner();
+ CloseableIterator<UnfilteredRowIterator> throttled = ThrottledUnfilteredIterator.throttle(scanner, 0))
+ {
+ assertEquals(scanner, throttled);
+ }
+ }
+
+ @Test
+ public void emptyStaticTest() throws Throwable
+ {
+ // create cell tombstone, range tombstone, partition deletion
+ createTable("CREATE TABLE %s (pk int, ck1 int, ck2 int, v1 int, v2 int static, PRIMARY KEY (pk, ck1, ck2))");
+ // partition deletion
+ execute("UPDATE %s SET v2 = 160 WHERE pk = 1");
+
+ // flush and generate 1 sstable
+ ColumnFamilyStore cfs = Keyspace.open(keyspace()).getColumnFamilyStore(currentTable());
+ cfs.forceBlockingFlush();
+ cfs.disableAutoCompaction();
+ cfs.forceMajorCompaction();
+
+ assertEquals(1, cfs.getLiveSSTables().size());
+ SSTableReader reader = cfs.getLiveSSTables().iterator().next();
+
+ try (ISSTableScanner scanner = reader.getScanner();
+ CloseableIterator<UnfilteredRowIterator> throttled = ThrottledUnfilteredIterator.throttle(scanner, 100))
+ {
+ assertTrue(throttled.hasNext());
+ UnfilteredRowIterator iterator = throttled.next();
+ assertFalse(throttled.hasNext());
+ assertFalse(iterator.hasNext());
+ assertEquals(Int32Type.instance.getSerializer().deserialize(iterator.staticRow().cells().iterator().next().value()), new Integer(160));
+ }
+
+ // test opt out
+ try (ISSTableScanner scanner = reader.getScanner();
+ CloseableIterator<UnfilteredRowIterator> throttled = ThrottledUnfilteredIterator.throttle(scanner, 0))
+ {
+ assertEquals(scanner, throttled);
+ }
}
@Test
@@ -296,7 +369,7 @@ public class ThrottledUnfilteredIteratorTest extends CQLTester
origin = rows(metadata.regularAndStaticColumns(),
1,
new DeletionTime(0, 100),
- Rows.EMPTY_STATIC_ROW,
+ createStaticRow(createCell(staticMetadata, 160)),
rows.toArray(new Row[0]));
throttledIterator = new ThrottledUnfilteredIterator(origin, throttle);
@@ -343,7 +416,7 @@ public class ThrottledUnfilteredIteratorTest extends CQLTester
{
origin = partitions(metadata.regularAndStaticColumns(),
new DeletionTime(0, 100),
- Rows.EMPTY_STATIC_ROW,
+ createStaticRow(createCell(staticMetadata, 160)),
partitions);
throttledIterator = ThrottledUnfilteredIterator.throttle(origin, throttle);
@@ -364,7 +437,7 @@ public class ThrottledUnfilteredIteratorTest extends CQLTester
UnfilteredRowIterator current = rows(metadata.regularAndStaticColumns(),
currentPartition,
new DeletionTime(0, 100),
- Rows.EMPTY_STATIC_ROW,
+ createStaticRow(createCell(staticMetadata, 160)),
partitions.get(currentPartition).toArray(new Row[0]));
assertMetadata(current, splitted, currentSplit == 1);
// no op
@@ -508,6 +581,15 @@ public class ThrottledUnfilteredIteratorTest extends CQLTester
return builder.build();
}
+ private static Row createStaticRow(Cell... columns)
+ {
+ Row.Builder builder = new BTreeRow.Builder(true);
+ builder.newRow(Clustering.STATIC_CLUSTERING);
+ for (Cell cell : columns)
+ builder.addCell(cell);
+ return builder.build();
+ }
+
private static Cell createCell(ColumnMetadata metadata, int v)
{
return createCell(metadata, v, 100L, BufferCell.NO_DELETION_TIME);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[05/16] cassandra git commit: ninja: fix nodetool scrub -r
(--reinsert-overflowed-ttl) option
Posted by pa...@apache.org.
ninja: fix nodetool scrub -r (--reinsert-overflowed-ttl) option
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19d26bcb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19d26bcb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19d26bcb
Branch: refs/heads/cassandra-2.1
Commit: 19d26bcb80219bce0089fbe8942a34e3a331fd17
Parents: 4bbd28a
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:02:26 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:02:26 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19d26bcb/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java
index 54d7fb7..9963dc3 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -1283,7 +1283,7 @@ public class NodeTool
private int jobs = 2;
@Option(title = "reinsert_overflowed_ttl",
- name = {"r", "--reinsert-overflowed-ttl"},
+ name = {"-r", "--reinsert-overflowed-ttl"},
description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
private boolean reinsertOverflowedTTL = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[16/16] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by pa...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c09e298a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c09e298a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c09e298a
Branch: refs/heads/trunk
Commit: c09e298a4e78bf0dc0e1b6e9a78a21801caef999
Parents: 5b9e985 656cca7
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:25:07 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:25:07 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c09e298a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[07/16] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by pa...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53b6116d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53b6116d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53b6116d
Branch: refs/heads/trunk
Commit: 53b6116d56a9353ad46fb90f181cd33fcabb9e0e
Parents: 9715fc0 19d26bc
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:03:46 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:15:55 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/53b6116d/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/nodetool/Scrub.java
index 50224a0,0000000..3c726b9
mode 100644,000000..100644
--- a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
@@@ -1,82 -1,0 +1,82 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cassandra.tools.nodetool;
+
+import io.airlift.command.Arguments;
+import io.airlift.command.Command;
+import io.airlift.command.Option;
+
+import java.util.ArrayList;
+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
+{
+ @Arguments(usage = "[<keyspace> <tables>...]", description = "The keyspace followed by one or many tables")
+ private List<String> args = new ArrayList<>();
+
+ @Option(title = "disable_snapshot",
+ name = {"-ns", "--no-snapshot"},
+ description = "Scrubbed CFs will be snapshotted first, if disableSnapshot is false. (default false)")
+ private boolean disableSnapshot = false;
+
+ @Option(title = "skip_corrupted",
+ name = {"-s", "--skip-corrupted"},
+ description = "Skip corrupted partitions even when scrubbing counter tables. (default false)")
+ private boolean skipCorrupted = false;
+
+ @Option(title = "no_validate",
+ name = {"-n", "--no-validate"},
+ description = "Do not validate columns using column validator")
+ private boolean noValidation = false;
+
+ @Option(title = "jobs",
+ name = {"-j", "--jobs"},
+ description = "Number of sstables to scrub simultanously, set to 0 to use all available compaction threads")
+ private int jobs = 2;
+
+ @Option(title = "reinsert_overflowed_ttl",
- name = {"r", "--reinsert-overflowed-ttl"},
++ name = {"-r", "--reinsert-overflowed-ttl"},
+ description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
+ private boolean reinsertOverflowedTTL = false;
+
+ @Override
+ public void execute(NodeProbe probe)
+ {
+ List<String> keyspaces = parseOptionalKeyspace(args, probe);
+ String[] cfnames = parseOptionalColumnFamilies(args);
+
+ for (String keyspace : keyspaces)
+ {
+ try
+ {
+ probe.scrub(System.out, disableSnapshot, skipCorrupted, !noValidation, reinsertOverflowedTTL, jobs, keyspace, cfnames);
+ } catch (IllegalArgumentException e)
+ {
+ throw e;
+ } catch (Exception e)
+ {
+ throw new RuntimeException("Error occurred during scrubbing", e);
+ }
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[03/16] cassandra git commit: ninja: fix nodetool scrub -r
(--reinsert-overflowed-ttl) option
Posted by pa...@apache.org.
ninja: fix nodetool scrub -r (--reinsert-overflowed-ttl) option
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19d26bcb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19d26bcb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19d26bcb
Branch: refs/heads/trunk
Commit: 19d26bcb80219bce0089fbe8942a34e3a331fd17
Parents: 4bbd28a
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:02:26 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:02:26 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19d26bcb/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java
index 54d7fb7..9963dc3 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -1283,7 +1283,7 @@ public class NodeTool
private int jobs = 2;
@Option(title = "reinsert_overflowed_ttl",
- name = {"r", "--reinsert-overflowed-ttl"},
+ name = {"-r", "--reinsert-overflowed-ttl"},
description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
private boolean reinsertOverflowedTTL = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[08/16] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by pa...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53b6116d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53b6116d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53b6116d
Branch: refs/heads/cassandra-2.2
Commit: 53b6116d56a9353ad46fb90f181cd33fcabb9e0e
Parents: 9715fc0 19d26bc
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:03:46 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:15:55 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/53b6116d/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/nodetool/Scrub.java
index 50224a0,0000000..3c726b9
mode 100644,000000..100644
--- a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
@@@ -1,82 -1,0 +1,82 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cassandra.tools.nodetool;
+
+import io.airlift.command.Arguments;
+import io.airlift.command.Command;
+import io.airlift.command.Option;
+
+import java.util.ArrayList;
+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
+{
+ @Arguments(usage = "[<keyspace> <tables>...]", description = "The keyspace followed by one or many tables")
+ private List<String> args = new ArrayList<>();
+
+ @Option(title = "disable_snapshot",
+ name = {"-ns", "--no-snapshot"},
+ description = "Scrubbed CFs will be snapshotted first, if disableSnapshot is false. (default false)")
+ private boolean disableSnapshot = false;
+
+ @Option(title = "skip_corrupted",
+ name = {"-s", "--skip-corrupted"},
+ description = "Skip corrupted partitions even when scrubbing counter tables. (default false)")
+ private boolean skipCorrupted = false;
+
+ @Option(title = "no_validate",
+ name = {"-n", "--no-validate"},
+ description = "Do not validate columns using column validator")
+ private boolean noValidation = false;
+
+ @Option(title = "jobs",
+ name = {"-j", "--jobs"},
+ description = "Number of sstables to scrub simultanously, set to 0 to use all available compaction threads")
+ private int jobs = 2;
+
+ @Option(title = "reinsert_overflowed_ttl",
- name = {"r", "--reinsert-overflowed-ttl"},
++ name = {"-r", "--reinsert-overflowed-ttl"},
+ description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
+ private boolean reinsertOverflowedTTL = false;
+
+ @Override
+ public void execute(NodeProbe probe)
+ {
+ List<String> keyspaces = parseOptionalKeyspace(args, probe);
+ String[] cfnames = parseOptionalColumnFamilies(args);
+
+ for (String keyspace : keyspaces)
+ {
+ try
+ {
+ probe.scrub(System.out, disableSnapshot, skipCorrupted, !noValidation, reinsertOverflowedTTL, jobs, keyspace, cfnames);
+ } catch (IllegalArgumentException e)
+ {
+ throw e;
+ } catch (Exception e)
+ {
+ throw new RuntimeException("Error occurred during scrubbing", e);
+ }
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[10/16] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by pa...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53b6116d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53b6116d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53b6116d
Branch: refs/heads/cassandra-3.11
Commit: 53b6116d56a9353ad46fb90f181cd33fcabb9e0e
Parents: 9715fc0 19d26bc
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:03:46 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:15:55 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/53b6116d/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/nodetool/Scrub.java
index 50224a0,0000000..3c726b9
mode 100644,000000..100644
--- a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
@@@ -1,82 -1,0 +1,82 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cassandra.tools.nodetool;
+
+import io.airlift.command.Arguments;
+import io.airlift.command.Command;
+import io.airlift.command.Option;
+
+import java.util.ArrayList;
+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
+{
+ @Arguments(usage = "[<keyspace> <tables>...]", description = "The keyspace followed by one or many tables")
+ private List<String> args = new ArrayList<>();
+
+ @Option(title = "disable_snapshot",
+ name = {"-ns", "--no-snapshot"},
+ description = "Scrubbed CFs will be snapshotted first, if disableSnapshot is false. (default false)")
+ private boolean disableSnapshot = false;
+
+ @Option(title = "skip_corrupted",
+ name = {"-s", "--skip-corrupted"},
+ description = "Skip corrupted partitions even when scrubbing counter tables. (default false)")
+ private boolean skipCorrupted = false;
+
+ @Option(title = "no_validate",
+ name = {"-n", "--no-validate"},
+ description = "Do not validate columns using column validator")
+ private boolean noValidation = false;
+
+ @Option(title = "jobs",
+ name = {"-j", "--jobs"},
+ description = "Number of sstables to scrub simultanously, set to 0 to use all available compaction threads")
+ private int jobs = 2;
+
+ @Option(title = "reinsert_overflowed_ttl",
- name = {"r", "--reinsert-overflowed-ttl"},
++ name = {"-r", "--reinsert-overflowed-ttl"},
+ description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
+ private boolean reinsertOverflowedTTL = false;
+
+ @Override
+ public void execute(NodeProbe probe)
+ {
+ List<String> keyspaces = parseOptionalKeyspace(args, probe);
+ String[] cfnames = parseOptionalColumnFamilies(args);
+
+ for (String keyspace : keyspaces)
+ {
+ try
+ {
+ probe.scrub(System.out, disableSnapshot, skipCorrupted, !noValidation, reinsertOverflowedTTL, jobs, keyspace, cfnames);
+ } catch (IllegalArgumentException e)
+ {
+ throw e;
+ } catch (Exception e)
+ {
+ throw new RuntimeException("Error occurred during scrubbing", e);
+ }
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[09/16] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by pa...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53b6116d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53b6116d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53b6116d
Branch: refs/heads/cassandra-3.0
Commit: 53b6116d56a9353ad46fb90f181cd33fcabb9e0e
Parents: 9715fc0 19d26bc
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:03:46 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:15:55 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/53b6116d/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/nodetool/Scrub.java
index 50224a0,0000000..3c726b9
mode 100644,000000..100644
--- a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
@@@ -1,82 -1,0 +1,82 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cassandra.tools.nodetool;
+
+import io.airlift.command.Arguments;
+import io.airlift.command.Command;
+import io.airlift.command.Option;
+
+import java.util.ArrayList;
+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
+{
+ @Arguments(usage = "[<keyspace> <tables>...]", description = "The keyspace followed by one or many tables")
+ private List<String> args = new ArrayList<>();
+
+ @Option(title = "disable_snapshot",
+ name = {"-ns", "--no-snapshot"},
+ description = "Scrubbed CFs will be snapshotted first, if disableSnapshot is false. (default false)")
+ private boolean disableSnapshot = false;
+
+ @Option(title = "skip_corrupted",
+ name = {"-s", "--skip-corrupted"},
+ description = "Skip corrupted partitions even when scrubbing counter tables. (default false)")
+ private boolean skipCorrupted = false;
+
+ @Option(title = "no_validate",
+ name = {"-n", "--no-validate"},
+ description = "Do not validate columns using column validator")
+ private boolean noValidation = false;
+
+ @Option(title = "jobs",
+ name = {"-j", "--jobs"},
+ description = "Number of sstables to scrub simultanously, set to 0 to use all available compaction threads")
+ private int jobs = 2;
+
+ @Option(title = "reinsert_overflowed_ttl",
- name = {"r", "--reinsert-overflowed-ttl"},
++ name = {"-r", "--reinsert-overflowed-ttl"},
+ description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
+ private boolean reinsertOverflowedTTL = false;
+
+ @Override
+ public void execute(NodeProbe probe)
+ {
+ List<String> keyspaces = parseOptionalKeyspace(args, probe);
+ String[] cfnames = parseOptionalColumnFamilies(args);
+
+ for (String keyspace : keyspaces)
+ {
+ try
+ {
+ probe.scrub(System.out, disableSnapshot, skipCorrupted, !noValidation, reinsertOverflowedTTL, jobs, keyspace, cfnames);
+ } catch (IllegalArgumentException e)
+ {
+ throw e;
+ } catch (Exception e)
+ {
+ throw new RuntimeException("Error occurred during scrubbing", e);
+ }
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[13/16] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by pa...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cccaf7ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cccaf7ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cccaf7ca
Branch: refs/heads/cassandra-3.0
Commit: cccaf7ca20ca521272835863aec91fff85b2ea06
Parents: 1d05bda 53b6116
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:22:22 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:22:22 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cccaf7ca/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/nodetool/Scrub.java
index ead2fd4,3c726b9..263291d
--- a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
@@@ -49,8 -49,13 +49,8 @@@ public class Scrub extends NodeToolCm
description = "Do not validate columns using column validator")
private boolean noValidation = false;
- @Option(title = "jobs",
- name = {"-j", "--jobs"},
- description = "Number of sstables to scrub simultanously, set to 0 to use all available compaction threads")
- private int jobs = 2;
-
@Option(title = "reinsert_overflowed_ttl",
- name = {"r", "--reinsert-overflowed-ttl"},
+ name = {"-r", "--reinsert-overflowed-ttl"},
description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
private boolean reinsertOverflowedTTL = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[11/16] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by pa...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cccaf7ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cccaf7ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cccaf7ca
Branch: refs/heads/trunk
Commit: cccaf7ca20ca521272835863aec91fff85b2ea06
Parents: 1d05bda 53b6116
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:22:22 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:22:22 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cccaf7ca/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/nodetool/Scrub.java
index ead2fd4,3c726b9..263291d
--- a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
@@@ -49,8 -49,13 +49,8 @@@ public class Scrub extends NodeToolCm
description = "Do not validate columns using column validator")
private boolean noValidation = false;
- @Option(title = "jobs",
- name = {"-j", "--jobs"},
- description = "Number of sstables to scrub simultanously, set to 0 to use all available compaction threads")
- private int jobs = 2;
-
@Option(title = "reinsert_overflowed_ttl",
- name = {"r", "--reinsert-overflowed-ttl"},
+ name = {"-r", "--reinsert-overflowed-ttl"},
description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
private boolean reinsertOverflowedTTL = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[06/16] cassandra git commit: ninja: fix nodetool scrub -r
(--reinsert-overflowed-ttl) option
Posted by pa...@apache.org.
ninja: fix nodetool scrub -r (--reinsert-overflowed-ttl) option
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19d26bcb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19d26bcb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19d26bcb
Branch: refs/heads/cassandra-3.11
Commit: 19d26bcb80219bce0089fbe8942a34e3a331fd17
Parents: 4bbd28a
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:02:26 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:02:26 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19d26bcb/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java
index 54d7fb7..9963dc3 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -1283,7 +1283,7 @@ public class NodeTool
private int jobs = 2;
@Option(title = "reinsert_overflowed_ttl",
- name = {"r", "--reinsert-overflowed-ttl"},
+ name = {"-r", "--reinsert-overflowed-ttl"},
description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
private boolean reinsertOverflowedTTL = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[12/16] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by pa...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cccaf7ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cccaf7ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cccaf7ca
Branch: refs/heads/cassandra-3.11
Commit: cccaf7ca20ca521272835863aec91fff85b2ea06
Parents: 1d05bda 53b6116
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:22:22 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:22:22 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cccaf7ca/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/nodetool/Scrub.java
index ead2fd4,3c726b9..263291d
--- a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
@@@ -49,8 -49,13 +49,8 @@@ public class Scrub extends NodeToolCm
description = "Do not validate columns using column validator")
private boolean noValidation = false;
- @Option(title = "jobs",
- name = {"-j", "--jobs"},
- description = "Number of sstables to scrub simultanously, set to 0 to use all available compaction threads")
- private int jobs = 2;
-
@Option(title = "reinsert_overflowed_ttl",
- name = {"r", "--reinsert-overflowed-ttl"},
+ name = {"-r", "--reinsert-overflowed-ttl"},
description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
private boolean reinsertOverflowedTTL = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[14/16] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by pa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/656cca77
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/656cca77
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/656cca77
Branch: refs/heads/cassandra-3.11
Commit: 656cca7783f1dec596dad8a2bab9a7b687b22e62
Parents: f57d12e cccaf7c
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:22:33 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:22:33 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[02/16] cassandra git commit: ninja: fix nodetool scrub -r
(--reinsert-overflowed-ttl) option
Posted by pa...@apache.org.
ninja: fix nodetool scrub -r (--reinsert-overflowed-ttl) option
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19d26bcb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19d26bcb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19d26bcb
Branch: refs/heads/cassandra-2.2
Commit: 19d26bcb80219bce0089fbe8942a34e3a331fd17
Parents: 4bbd28a
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:02:26 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:02:26 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19d26bcb/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java
index 54d7fb7..9963dc3 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -1283,7 +1283,7 @@ public class NodeTool
private int jobs = 2;
@Option(title = "reinsert_overflowed_ttl",
- name = {"r", "--reinsert-overflowed-ttl"},
+ name = {"-r", "--reinsert-overflowed-ttl"},
description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
private boolean reinsertOverflowedTTL = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[04/16] cassandra git commit: ninja: fix nodetool scrub -r
(--reinsert-overflowed-ttl) option
Posted by pa...@apache.org.
ninja: fix nodetool scrub -r (--reinsert-overflowed-ttl) option
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19d26bcb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19d26bcb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19d26bcb
Branch: refs/heads/cassandra-3.0
Commit: 19d26bcb80219bce0089fbe8942a34e3a331fd17
Parents: 4bbd28a
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:02:26 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:02:26 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19d26bcb/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java
index 54d7fb7..9963dc3 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -1283,7 +1283,7 @@ public class NodeTool
private int jobs = 2;
@Option(title = "reinsert_overflowed_ttl",
- name = {"r", "--reinsert-overflowed-ttl"},
+ name = {"-r", "--reinsert-overflowed-ttl"},
description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
private boolean reinsertOverflowedTTL = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[15/16] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by pa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/656cca77
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/656cca77
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/656cca77
Branch: refs/heads/trunk
Commit: 656cca7783f1dec596dad8a2bab9a7b687b22e62
Parents: f57d12e cccaf7c
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:22:33 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:22:33 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org