You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2021/08/06 18:14:34 UTC
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 952df13f257dc1ef19f79915f1a0a4d593de0fd5
Merge: cb37035 acf38bf
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Fri Aug 6 18:33:16 2021 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeProbe.java | 8 +++-----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --cc CHANGES.txt
index 9ce666b,b35b838..b6d0e78
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
-3.0.26:
+3.11.12
+ * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072)
+ * Avoid sending CDC column if not enabled (CASSANDRA-16770)
+Merged from 3.0:
+ * Use JMX to validate nodetool --jobs parameter (CASSANDRA-16104)
* Handle properly UnsatisfiedLinkError in NativeLibrary#getProcessID() (CASSANDRA-16578)
* Remove mutation data from error log message (CASSANDRA-16817)
diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java
index c3e1948,224b676..122cc3a
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@@ -292,17 -287,11 +291,16 @@@ public class NodeProbe implements AutoC
return ssProxy.upgradeSSTables(keyspaceName, excludeCurrentVersion, jobs, tableNames);
}
+ public int garbageCollect(String tombstoneOption, int jobs, String keyspaceName, String... tableNames) throws IOException, ExecutionException, InterruptedException
+ {
+ return ssProxy.garbageCollect(tombstoneOption, jobs, keyspaceName, tableNames);
+ }
+
private void checkJobs(PrintStream out, int jobs)
{
- // TODO this should get the configured number of concurrent_compactors via JMX and not using DatabaseDescriptor
- DatabaseDescriptor.toolInitialization(false); // if running in dtest, this would fail if true (default)
- if (jobs > DatabaseDescriptor.getConcurrentCompactors())
- out.println(String.format("jobs (%d) is bigger than configured concurrent_compactors (%d) on this host, using at most %d threads", jobs, DatabaseDescriptor.getConcurrentCompactors(), DatabaseDescriptor.getConcurrentCompactors()));
+ int compactors = ssProxy.getConcurrentCompactors();
+ if (jobs > compactors)
- out.println(String.format("jobs (%d) is bigger than configured concurrent_compactors (%d), using at most %d threads", jobs, compactors, compactors));
++ out.println(String.format("jobs (%d) is bigger than configured concurrent_compactors (%d) on the host, using at most %d threads", jobs, compactors, compactors));
}
public void forceKeyspaceCleanup(PrintStream out, int jobs, String keyspaceName, String... tableNames) throws IOException, ExecutionException, InterruptedException
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org