You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2017/06/02 13:53:34 UTC
[1/6] cassandra git commit: nodetool scrub/cleanup/upgradesstables
exit code
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 e22cb278b -> 6bf5cf7f0
refs/heads/cassandra-3.11 5c9db9af9 -> ac3afba0c
refs/heads/trunk 9c49fbcc5 -> 3e73d7f6b
nodetool scrub/cleanup/upgradesstables exit code
Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-13542
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bf5cf7f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bf5cf7f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bf5cf7f
Branch: refs/heads/cassandra-3.0
Commit: 6bf5cf7f090eef853c02711bf4079b0f16748088
Parents: e22cb27
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon May 22 08:46:17 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Jun 2 15:49:17 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java | 12 ++++-
.../org/apache/cassandra/tools/NodeProbe.java | 48 +++++++++++++++-----
3 files changed, 47 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bf5cf7f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4232084..8ab8422 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.14
+ * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
* Fix the reported number of sstable data files accessed per read (CASSANDRA-13120)
* Fix schema digest mismatch during rolling upgrades from versions before 3.0.12 (CASSANDRA-13559)
* Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bf5cf7f/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 8d470d5..e0fe4ec 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -287,7 +287,10 @@ public class CompactionManager implements CompactionManagerMBean
List<LifecycleTransaction> transactions = new ArrayList<>();
try (LifecycleTransaction compacting = cfs.markAllCompacting(operationType))
{
- Iterable<SSTableReader> sstables = compacting != null ? Lists.newArrayList(operation.filterSSTables(compacting)) : Collections.<SSTableReader>emptyList();
+ if (compacting == null)
+ return AllSSTableOpStatus.UNABLE_TO_CANCEL;
+
+ Iterable<SSTableReader> sstables = Lists.newArrayList(operation.filterSSTables(compacting));
if (Iterables.isEmpty(sstables))
{
logger.info("No sstables for {}.{}", cfs.keyspace.getName(), cfs.name);
@@ -339,7 +342,12 @@ public class CompactionManager implements CompactionManagerMBean
void execute(LifecycleTransaction input) throws IOException;
}
- public enum AllSSTableOpStatus { ABORTED(1), SUCCESSFUL(0);
+ public enum AllSSTableOpStatus
+ {
+ SUCCESSFUL(0),
+ ABORTED(1),
+ UNABLE_TO_CANCEL(2);
+
public final int statusCode;
AllSSTableOpStatus(int statusCode)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bf5cf7f/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 394ce6e..5ffdf3b 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -275,29 +275,47 @@ public class NodeProbe implements AutoCloseable
public void forceKeyspaceCleanup(PrintStream out, int jobs, String keyspaceName, String... tableNames) throws IOException, ExecutionException, InterruptedException
{
checkJobs(out, jobs);
- if (forceKeyspaceCleanup(jobs, keyspaceName, tableNames) != 0)
+ switch (forceKeyspaceCleanup(jobs, keyspaceName, tableNames))
{
- failed = true;
- out.println("Aborted cleaning up at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ case 1:
+ failed = true;
+ out.println("Aborted cleaning up at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ break;
+ case 2:
+ failed = true;
+ out.println("Failed marking some sstables compacting in keyspace "+keyspaceName+", check server logs for more information");
+ break;
}
}
public void scrub(PrintStream out, boolean disableSnapshot, boolean skipCorrupted, boolean checkData, int jobs, String keyspaceName, String... tables) throws IOException, ExecutionException, InterruptedException
{
checkJobs(out, jobs);
- if (scrub(disableSnapshot, skipCorrupted, checkData, jobs, keyspaceName, tables) != 0)
+ switch (scrub(disableSnapshot, skipCorrupted, checkData, jobs, keyspaceName, tables))
{
- failed = true;
- out.println("Aborted scrubbing at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ case 1:
+ failed = true;
+ out.println("Aborted scrubbing at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ break;
+ case 2:
+ failed = true;
+ out.println("Failed marking some sstables compacting in keyspace "+keyspaceName+", check server logs for more information");
+ break;
}
}
public void verify(PrintStream out, boolean extendedVerify, String keyspaceName, String... tableNames) throws IOException, ExecutionException, InterruptedException
{
- if (verify(extendedVerify, keyspaceName, tableNames) != 0)
+ switch (verify(extendedVerify, keyspaceName, tableNames))
{
- failed = true;
- out.println("Aborted verifying at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ case 1:
+ failed = true;
+ out.println("Aborted verifying at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ break;
+ case 2:
+ failed = true;
+ out.println("Failed marking some sstables compacting in keyspace "+keyspaceName+", check server logs for more information");
+ break;
}
}
@@ -305,10 +323,16 @@ public class NodeProbe implements AutoCloseable
public void upgradeSSTables(PrintStream out, String keyspaceName, boolean excludeCurrentVersion, int jobs, String... tableNames) throws IOException, ExecutionException, InterruptedException
{
checkJobs(out, jobs);
- if (upgradeSSTables(keyspaceName, excludeCurrentVersion, jobs, tableNames) != 0)
+ switch (upgradeSSTables(keyspaceName, excludeCurrentVersion, jobs, tableNames))
{
- failed = true;
- out.println("Aborted upgrading sstables for atleast one table in keyspace "+keyspaceName+", check server logs for more information.");
+ case 1:
+ failed = true;
+ out.println("Aborted upgrading sstables for atleast one table in keyspace "+keyspaceName+", check server logs for more information.");
+ break;
+ case 2:
+ failed = true;
+ out.println("Failed marking some sstables compacting in keyspace "+keyspaceName+", check server logs for more information");
+ break;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ma...@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/ac3afba0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac3afba0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac3afba0
Branch: refs/heads/trunk
Commit: ac3afba0c2f8926d113996f3c1178e84cb62760c
Parents: 5c9db9a 6bf5cf7
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Jun 2 15:51:51 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Jun 2 15:51:51 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java | 12 ++++-
.../org/apache/cassandra/tools/NodeProbe.java | 48 +++++++++++++++-----
3 files changed, 47 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac3afba0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2c96521,8ab8422..5202428
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,5 +1,42 @@@
-3.0.14
+3.11.0
+ * Fix formatting of duration columns in CQLSH (CASSANDRA-13549)
+ * Fix the problem with duplicated rows when using paging with SASI (CASSANDRA-13302)
+ * Allow CONTAINS statements filtering on the partition key and it’s parts (CASSANDRA-13275)
+ * Fall back to even ranges calculation in clusters with vnodes when tokens are distributed unevenly (CASSANDRA-13229)
+ * Fix duration type validation to prevent overflow (CASSANDRA-13218)
+ * Forbid unsupported creation of SASI indexes over partition key columns (CASSANDRA-13228)
+ * Reject multiple values for a key in CQL grammar. (CASSANDRA-13369)
+ * UDA fails without input rows (CASSANDRA-13399)
+ * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188)
+ * V5 protocol flags decoding broken (CASSANDRA-13443)
+ * Use write lock not read lock for removing sstables from compaction strategies. (CASSANDRA-13422)
+ * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors (CASSANDRA-13329)
+ * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
+ * Add charset to Analyser input stream (CASSANDRA-13151)
+ * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
+ * cdc column addition strikes again (CASSANDRA-13382)
+ * Fix static column indexes (CASSANDRA-13277)
+ * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
+ * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
+ * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns (CASSANDRA-13247)
+ * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317)
+ * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366)
+ * Support unaligned memory access for AArch64 (CASSANDRA-13326)
+ * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915).
+ * Fix equality comparisons of columns using the duration type (CASSANDRA-13174)
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
+ * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
+ * nodetool stopdaemon errors out (CASSANDRA-13030)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
+ * Fix primary index calculation for SASI (CASSANDRA-12910)
+ * More fixes to the TokenAllocator (CASSANDRA-12990)
+ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
+ * Address message coalescing regression (CASSANDRA-12676)
+ * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
+ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
+ * Tracing payload not passed from QueryMessage to tracing session (CASSANDRA-12835)
+Merged from 3.0:
+ * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
* Fix the reported number of sstable data files accessed per read (CASSANDRA-13120)
* Fix schema digest mismatch during rolling upgrades from versions before 3.0.12 (CASSANDRA-13559)
* Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac3afba0/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index bcf7808,e0fe4ec..eb078b0
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -291,10 -287,13 +291,13 @@@ public class CompactionManager implemen
List<LifecycleTransaction> transactions = new ArrayList<>();
try (LifecycleTransaction compacting = cfs.markAllCompacting(operationType))
{
- Iterable<SSTableReader> sstables = compacting != null ? Lists.newArrayList(operation.filterSSTables(compacting)) : Collections.<SSTableReader>emptyList();
+ if (compacting == null)
+ return AllSSTableOpStatus.UNABLE_TO_CANCEL;
+
+ Iterable<SSTableReader> sstables = Lists.newArrayList(operation.filterSSTables(compacting));
if (Iterables.isEmpty(sstables))
{
- logger.info("No sstables for {}.{}", cfs.keyspace.getName(), cfs.name);
+ logger.info("No sstables to {} for {}.{}", operationType.name(), cfs.keyspace.getName(), cfs.name);
return AllSSTableOpStatus.SUCCESSFUL;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac3afba0/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java
index 8c01891,5ffdf3b..c065c90
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@@ -315,10 -323,16 +333,16 @@@ public class NodeProbe implements AutoC
public void upgradeSSTables(PrintStream out, String keyspaceName, boolean excludeCurrentVersion, int jobs, String... tableNames) throws IOException, ExecutionException, InterruptedException
{
checkJobs(out, jobs);
- if (upgradeSSTables(keyspaceName, excludeCurrentVersion, jobs, tableNames) != 0)
+ switch (upgradeSSTables(keyspaceName, excludeCurrentVersion, jobs, tableNames))
{
- failed = true;
- out.println("Aborted upgrading sstables for at least one table in keyspace " + keyspaceName + ", check server logs for more information.");
+ case 1:
+ failed = true;
- out.println("Aborted upgrading sstables for atleast one table in keyspace "+keyspaceName+", check server logs for more information.");
++ out.println("Aborted upgrading sstables for at least one table in keyspace " + keyspaceName + ", check server logs for more information.");
+ break;
+ case 2:
+ failed = true;
+ out.println("Failed marking some sstables compacting in keyspace "+keyspaceName+", check server logs for more information");
+ break;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by ma...@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/3e73d7f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e73d7f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e73d7f6
Branch: refs/heads/trunk
Commit: 3e73d7f6b46479bbe71fc6da9b340e09296b45a1
Parents: 9c49fbc ac3afba
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Jun 2 15:52:52 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Jun 2 15:52:52 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java | 12 ++++-
.../org/apache/cassandra/tools/NodeProbe.java | 48 +++++++++++++++-----
3 files changed, 47 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e73d7f6/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e73d7f6/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e73d7f6/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: nodetool scrub/cleanup/upgradesstables
exit code
Posted by ma...@apache.org.
nodetool scrub/cleanup/upgradesstables exit code
Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-13542
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bf5cf7f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bf5cf7f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bf5cf7f
Branch: refs/heads/cassandra-3.11
Commit: 6bf5cf7f090eef853c02711bf4079b0f16748088
Parents: e22cb27
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon May 22 08:46:17 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Jun 2 15:49:17 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java | 12 ++++-
.../org/apache/cassandra/tools/NodeProbe.java | 48 +++++++++++++++-----
3 files changed, 47 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bf5cf7f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4232084..8ab8422 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.14
+ * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
* Fix the reported number of sstable data files accessed per read (CASSANDRA-13120)
* Fix schema digest mismatch during rolling upgrades from versions before 3.0.12 (CASSANDRA-13559)
* Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bf5cf7f/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 8d470d5..e0fe4ec 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -287,7 +287,10 @@ public class CompactionManager implements CompactionManagerMBean
List<LifecycleTransaction> transactions = new ArrayList<>();
try (LifecycleTransaction compacting = cfs.markAllCompacting(operationType))
{
- Iterable<SSTableReader> sstables = compacting != null ? Lists.newArrayList(operation.filterSSTables(compacting)) : Collections.<SSTableReader>emptyList();
+ if (compacting == null)
+ return AllSSTableOpStatus.UNABLE_TO_CANCEL;
+
+ Iterable<SSTableReader> sstables = Lists.newArrayList(operation.filterSSTables(compacting));
if (Iterables.isEmpty(sstables))
{
logger.info("No sstables for {}.{}", cfs.keyspace.getName(), cfs.name);
@@ -339,7 +342,12 @@ public class CompactionManager implements CompactionManagerMBean
void execute(LifecycleTransaction input) throws IOException;
}
- public enum AllSSTableOpStatus { ABORTED(1), SUCCESSFUL(0);
+ public enum AllSSTableOpStatus
+ {
+ SUCCESSFUL(0),
+ ABORTED(1),
+ UNABLE_TO_CANCEL(2);
+
public final int statusCode;
AllSSTableOpStatus(int statusCode)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bf5cf7f/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 394ce6e..5ffdf3b 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -275,29 +275,47 @@ public class NodeProbe implements AutoCloseable
public void forceKeyspaceCleanup(PrintStream out, int jobs, String keyspaceName, String... tableNames) throws IOException, ExecutionException, InterruptedException
{
checkJobs(out, jobs);
- if (forceKeyspaceCleanup(jobs, keyspaceName, tableNames) != 0)
+ switch (forceKeyspaceCleanup(jobs, keyspaceName, tableNames))
{
- failed = true;
- out.println("Aborted cleaning up at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ case 1:
+ failed = true;
+ out.println("Aborted cleaning up at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ break;
+ case 2:
+ failed = true;
+ out.println("Failed marking some sstables compacting in keyspace "+keyspaceName+", check server logs for more information");
+ break;
}
}
public void scrub(PrintStream out, boolean disableSnapshot, boolean skipCorrupted, boolean checkData, int jobs, String keyspaceName, String... tables) throws IOException, ExecutionException, InterruptedException
{
checkJobs(out, jobs);
- if (scrub(disableSnapshot, skipCorrupted, checkData, jobs, keyspaceName, tables) != 0)
+ switch (scrub(disableSnapshot, skipCorrupted, checkData, jobs, keyspaceName, tables))
{
- failed = true;
- out.println("Aborted scrubbing at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ case 1:
+ failed = true;
+ out.println("Aborted scrubbing at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ break;
+ case 2:
+ failed = true;
+ out.println("Failed marking some sstables compacting in keyspace "+keyspaceName+", check server logs for more information");
+ break;
}
}
public void verify(PrintStream out, boolean extendedVerify, String keyspaceName, String... tableNames) throws IOException, ExecutionException, InterruptedException
{
- if (verify(extendedVerify, keyspaceName, tableNames) != 0)
+ switch (verify(extendedVerify, keyspaceName, tableNames))
{
- failed = true;
- out.println("Aborted verifying at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ case 1:
+ failed = true;
+ out.println("Aborted verifying at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ break;
+ case 2:
+ failed = true;
+ out.println("Failed marking some sstables compacting in keyspace "+keyspaceName+", check server logs for more information");
+ break;
}
}
@@ -305,10 +323,16 @@ public class NodeProbe implements AutoCloseable
public void upgradeSSTables(PrintStream out, String keyspaceName, boolean excludeCurrentVersion, int jobs, String... tableNames) throws IOException, ExecutionException, InterruptedException
{
checkJobs(out, jobs);
- if (upgradeSSTables(keyspaceName, excludeCurrentVersion, jobs, tableNames) != 0)
+ switch (upgradeSSTables(keyspaceName, excludeCurrentVersion, jobs, tableNames))
{
- failed = true;
- out.println("Aborted upgrading sstables for atleast one table in keyspace "+keyspaceName+", check server logs for more information.");
+ case 1:
+ failed = true;
+ out.println("Aborted upgrading sstables for atleast one table in keyspace "+keyspaceName+", check server logs for more information.");
+ break;
+ case 2:
+ failed = true;
+ out.println("Failed marking some sstables compacting in keyspace "+keyspaceName+", check server logs for more information");
+ break;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ma...@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/ac3afba0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac3afba0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac3afba0
Branch: refs/heads/cassandra-3.11
Commit: ac3afba0c2f8926d113996f3c1178e84cb62760c
Parents: 5c9db9a 6bf5cf7
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Jun 2 15:51:51 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Jun 2 15:51:51 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java | 12 ++++-
.../org/apache/cassandra/tools/NodeProbe.java | 48 +++++++++++++++-----
3 files changed, 47 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac3afba0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2c96521,8ab8422..5202428
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,5 +1,42 @@@
-3.0.14
+3.11.0
+ * Fix formatting of duration columns in CQLSH (CASSANDRA-13549)
+ * Fix the problem with duplicated rows when using paging with SASI (CASSANDRA-13302)
+ * Allow CONTAINS statements filtering on the partition key and it’s parts (CASSANDRA-13275)
+ * Fall back to even ranges calculation in clusters with vnodes when tokens are distributed unevenly (CASSANDRA-13229)
+ * Fix duration type validation to prevent overflow (CASSANDRA-13218)
+ * Forbid unsupported creation of SASI indexes over partition key columns (CASSANDRA-13228)
+ * Reject multiple values for a key in CQL grammar. (CASSANDRA-13369)
+ * UDA fails without input rows (CASSANDRA-13399)
+ * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188)
+ * V5 protocol flags decoding broken (CASSANDRA-13443)
+ * Use write lock not read lock for removing sstables from compaction strategies. (CASSANDRA-13422)
+ * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors (CASSANDRA-13329)
+ * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
+ * Add charset to Analyser input stream (CASSANDRA-13151)
+ * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
+ * cdc column addition strikes again (CASSANDRA-13382)
+ * Fix static column indexes (CASSANDRA-13277)
+ * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
+ * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
+ * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns (CASSANDRA-13247)
+ * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317)
+ * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366)
+ * Support unaligned memory access for AArch64 (CASSANDRA-13326)
+ * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915).
+ * Fix equality comparisons of columns using the duration type (CASSANDRA-13174)
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
+ * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
+ * nodetool stopdaemon errors out (CASSANDRA-13030)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
+ * Fix primary index calculation for SASI (CASSANDRA-12910)
+ * More fixes to the TokenAllocator (CASSANDRA-12990)
+ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
+ * Address message coalescing regression (CASSANDRA-12676)
+ * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
+ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
+ * Tracing payload not passed from QueryMessage to tracing session (CASSANDRA-12835)
+Merged from 3.0:
+ * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
* Fix the reported number of sstable data files accessed per read (CASSANDRA-13120)
* Fix schema digest mismatch during rolling upgrades from versions before 3.0.12 (CASSANDRA-13559)
* Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac3afba0/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index bcf7808,e0fe4ec..eb078b0
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -291,10 -287,13 +291,13 @@@ public class CompactionManager implemen
List<LifecycleTransaction> transactions = new ArrayList<>();
try (LifecycleTransaction compacting = cfs.markAllCompacting(operationType))
{
- Iterable<SSTableReader> sstables = compacting != null ? Lists.newArrayList(operation.filterSSTables(compacting)) : Collections.<SSTableReader>emptyList();
+ if (compacting == null)
+ return AllSSTableOpStatus.UNABLE_TO_CANCEL;
+
+ Iterable<SSTableReader> sstables = Lists.newArrayList(operation.filterSSTables(compacting));
if (Iterables.isEmpty(sstables))
{
- logger.info("No sstables for {}.{}", cfs.keyspace.getName(), cfs.name);
+ logger.info("No sstables to {} for {}.{}", operationType.name(), cfs.keyspace.getName(), cfs.name);
return AllSSTableOpStatus.SUCCESSFUL;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac3afba0/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java
index 8c01891,5ffdf3b..c065c90
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@@ -315,10 -323,16 +333,16 @@@ public class NodeProbe implements AutoC
public void upgradeSSTables(PrintStream out, String keyspaceName, boolean excludeCurrentVersion, int jobs, String... tableNames) throws IOException, ExecutionException, InterruptedException
{
checkJobs(out, jobs);
- if (upgradeSSTables(keyspaceName, excludeCurrentVersion, jobs, tableNames) != 0)
+ switch (upgradeSSTables(keyspaceName, excludeCurrentVersion, jobs, tableNames))
{
- failed = true;
- out.println("Aborted upgrading sstables for at least one table in keyspace " + keyspaceName + ", check server logs for more information.");
+ case 1:
+ failed = true;
- out.println("Aborted upgrading sstables for atleast one table in keyspace "+keyspaceName+", check server logs for more information.");
++ out.println("Aborted upgrading sstables for at least one table in keyspace " + keyspaceName + ", check server logs for more information.");
+ break;
+ case 2:
+ failed = true;
+ out.println("Failed marking some sstables compacting in keyspace "+keyspaceName+", check server logs for more information");
+ break;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: nodetool scrub/cleanup/upgradesstables
exit code
Posted by ma...@apache.org.
nodetool scrub/cleanup/upgradesstables exit code
Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-13542
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bf5cf7f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bf5cf7f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bf5cf7f
Branch: refs/heads/trunk
Commit: 6bf5cf7f090eef853c02711bf4079b0f16748088
Parents: e22cb27
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon May 22 08:46:17 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Jun 2 15:49:17 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java | 12 ++++-
.../org/apache/cassandra/tools/NodeProbe.java | 48 +++++++++++++++-----
3 files changed, 47 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bf5cf7f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4232084..8ab8422 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.14
+ * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
* Fix the reported number of sstable data files accessed per read (CASSANDRA-13120)
* Fix schema digest mismatch during rolling upgrades from versions before 3.0.12 (CASSANDRA-13559)
* Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bf5cf7f/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 8d470d5..e0fe4ec 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -287,7 +287,10 @@ public class CompactionManager implements CompactionManagerMBean
List<LifecycleTransaction> transactions = new ArrayList<>();
try (LifecycleTransaction compacting = cfs.markAllCompacting(operationType))
{
- Iterable<SSTableReader> sstables = compacting != null ? Lists.newArrayList(operation.filterSSTables(compacting)) : Collections.<SSTableReader>emptyList();
+ if (compacting == null)
+ return AllSSTableOpStatus.UNABLE_TO_CANCEL;
+
+ Iterable<SSTableReader> sstables = Lists.newArrayList(operation.filterSSTables(compacting));
if (Iterables.isEmpty(sstables))
{
logger.info("No sstables for {}.{}", cfs.keyspace.getName(), cfs.name);
@@ -339,7 +342,12 @@ public class CompactionManager implements CompactionManagerMBean
void execute(LifecycleTransaction input) throws IOException;
}
- public enum AllSSTableOpStatus { ABORTED(1), SUCCESSFUL(0);
+ public enum AllSSTableOpStatus
+ {
+ SUCCESSFUL(0),
+ ABORTED(1),
+ UNABLE_TO_CANCEL(2);
+
public final int statusCode;
AllSSTableOpStatus(int statusCode)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bf5cf7f/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 394ce6e..5ffdf3b 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -275,29 +275,47 @@ public class NodeProbe implements AutoCloseable
public void forceKeyspaceCleanup(PrintStream out, int jobs, String keyspaceName, String... tableNames) throws IOException, ExecutionException, InterruptedException
{
checkJobs(out, jobs);
- if (forceKeyspaceCleanup(jobs, keyspaceName, tableNames) != 0)
+ switch (forceKeyspaceCleanup(jobs, keyspaceName, tableNames))
{
- failed = true;
- out.println("Aborted cleaning up at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ case 1:
+ failed = true;
+ out.println("Aborted cleaning up at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ break;
+ case 2:
+ failed = true;
+ out.println("Failed marking some sstables compacting in keyspace "+keyspaceName+", check server logs for more information");
+ break;
}
}
public void scrub(PrintStream out, boolean disableSnapshot, boolean skipCorrupted, boolean checkData, int jobs, String keyspaceName, String... tables) throws IOException, ExecutionException, InterruptedException
{
checkJobs(out, jobs);
- if (scrub(disableSnapshot, skipCorrupted, checkData, jobs, keyspaceName, tables) != 0)
+ switch (scrub(disableSnapshot, skipCorrupted, checkData, jobs, keyspaceName, tables))
{
- failed = true;
- out.println("Aborted scrubbing at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ case 1:
+ failed = true;
+ out.println("Aborted scrubbing at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ break;
+ case 2:
+ failed = true;
+ out.println("Failed marking some sstables compacting in keyspace "+keyspaceName+", check server logs for more information");
+ break;
}
}
public void verify(PrintStream out, boolean extendedVerify, String keyspaceName, String... tableNames) throws IOException, ExecutionException, InterruptedException
{
- if (verify(extendedVerify, keyspaceName, tableNames) != 0)
+ switch (verify(extendedVerify, keyspaceName, tableNames))
{
- failed = true;
- out.println("Aborted verifying at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ case 1:
+ failed = true;
+ out.println("Aborted verifying at least one table in keyspace "+keyspaceName+", check server logs for more information.");
+ break;
+ case 2:
+ failed = true;
+ out.println("Failed marking some sstables compacting in keyspace "+keyspaceName+", check server logs for more information");
+ break;
}
}
@@ -305,10 +323,16 @@ public class NodeProbe implements AutoCloseable
public void upgradeSSTables(PrintStream out, String keyspaceName, boolean excludeCurrentVersion, int jobs, String... tableNames) throws IOException, ExecutionException, InterruptedException
{
checkJobs(out, jobs);
- if (upgradeSSTables(keyspaceName, excludeCurrentVersion, jobs, tableNames) != 0)
+ switch (upgradeSSTables(keyspaceName, excludeCurrentVersion, jobs, tableNames))
{
- failed = true;
- out.println("Aborted upgrading sstables for atleast one table in keyspace "+keyspaceName+", check server logs for more information.");
+ case 1:
+ failed = true;
+ out.println("Aborted upgrading sstables for atleast one table in keyspace "+keyspaceName+", check server logs for more information.");
+ break;
+ case 2:
+ failed = true;
+ out.println("Failed marking some sstables compacting in keyspace "+keyspaceName+", check server logs for more information");
+ break;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org