This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.11 by this push:
new 6e089c3 Add new compaction types to nodetool help stop command output
6e089c3 is described below
commit 6e089c3bd00c13065e10afc315b97a6146b33c29
Author: Ekaterina Dimitrova <[email protected]>
AuthorDate: Wed Oct 30 18:47:20 2019 -0400
Add new compaction types to nodetool help stop command output
Patch by Ekaterina Dimitrova; reviewed by marcuse for CASSANDRA-15401
---
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/compaction/OperationType.java | 1 +
src/java/org/apache/cassandra/tools/nodetool/Stop.java | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 95fecc0..d8563c7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@
* Fix nodetool compactionstats showing extra pending task for TWCS - patch
implemented (CASSANDRA-15409)
* Fix SELECT JSON formatting for the "duration" type (CASSANDRA-15075)
* Fix LegacyLayout to have same behavior as 2.x when handling unknown column
names (CASSANDRA-15081)
+ * Update nodetool help stop output (CASSANDRA-15401)
Merged from 3.0:
* Fix point-in-time recoevery ignoring timestamp of updates to static columns
(CASSANDRA-15292)
* GC logs are also put under $CASSANDRA_LOG_DIR (CASSANDRA-14306)
diff --git a/src/java/org/apache/cassandra/db/compaction/OperationType.java
b/src/java/org/apache/cassandra/db/compaction/OperationType.java
index 27b8530..e957e42 100644
--- a/src/java/org/apache/cassandra/db/compaction/OperationType.java
+++ b/src/java/org/apache/cassandra/db/compaction/OperationType.java
@@ -19,6 +19,7 @@ package org.apache.cassandra.db.compaction;
public enum OperationType
{
+ /** Each modification here should be also applied to {@link
org.apache.cassandra.tools.nodetool.Stop#compactionType} */
COMPACTION("Compaction"),
VALIDATION("Validation"),
KEY_CACHE_SAVE("Key cache save"),
diff --git a/src/java/org/apache/cassandra/tools/nodetool/Stop.java
b/src/java/org/apache/cassandra/tools/nodetool/Stop.java
index 6a4cf0d..7d785ab 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/Stop.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Stop.java
@@ -30,7 +30,7 @@ public class Stop extends NodeToolCmd
{
@Arguments(title = "compaction_type",
usage = "<compaction type>",
- description = "Supported types are COMPACTION, VALIDATION,
CLEANUP, SCRUB, VERIFY, INDEX_BUILD",
+ description = "Supported types are COMPACTION, VALIDATION,
CLEANUP, SCRUB, UPGRADE_SSTABLES, INDEX_BUILD, TOMBSTONE_COMPACTION,
ANTICOMPACTION, VERIFY, VIEW_BUILD, INDEX_SUMMARY, RELOCATE, GARBAGE_COLLECT",
required = false)
private OperationType compactionType = OperationType.UNKNOWN;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
