You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2018/05/14 09:11:24 UTC
[1/6] cassandra git commit: Fix deprecated repair error notifications
from 3.x clusters to legacy JMX clients
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 b9b2a4e1a -> 6efa99c7a
refs/heads/cassandra-3.11 28058608f -> 704f9b093
refs/heads/trunk 45f250535 -> ecf52ed3f
Fix deprecated repair error notifications from 3.x clusters to legacy JMX clients
patch by Patrick Bannister; reviewed by Mick Semb Wever for CASSANDRA-13121
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6efa99c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6efa99c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6efa99c7
Branch: refs/heads/cassandra-3.0
Commit: 6efa99c7a753e3ec04b7d5b5f50461e90d416db2
Parents: b9b2a4e
Author: Mick Semb Wever <mc...@apache.org>
Authored: Sun May 13 11:47:46 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Mon May 14 19:05:30 2018 +1000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/repair/RepairRunnable.java | 2 +-
.../cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6efa99c7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7c557f7..3da808a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.17
+ * Fix deprecated repair error notifications from 3.x clusters to legacy JMX clients (CASSANDRA-13121)
* Cassandra not starting when using enhanced startup scripts in windows (CASSANDRA-14418)
* Fix progress stats and units in compactionstats (CASSANDRA-12244)
* Better handle missing partition columns in system_schema.columns (CASSANDRA-14379)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6efa99c7/src/java/org/apache/cassandra/repair/RepairRunnable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/RepairRunnable.java b/src/java/org/apache/cassandra/repair/RepairRunnable.java
index 77726d4..774409f 100644
--- a/src/java/org/apache/cassandra/repair/RepairRunnable.java
+++ b/src/java/org/apache/cassandra/repair/RepairRunnable.java
@@ -103,7 +103,7 @@ public class RepairRunnable extends WrappedRunnable implements ProgressEventNoti
protected void fireErrorAndComplete(String tag, int progressCount, int totalProgress, String message)
{
- fireProgressEvent(tag, new ProgressEvent(ProgressEventType.ERROR, progressCount, totalProgress, message));
+ fireProgressEvent(tag, new ProgressEvent(ProgressEventType.ERROR, progressCount, totalProgress, String.format("Repair command #%d failed with error %s", cmd, message)));
fireProgressEvent(tag, new ProgressEvent(ProgressEventType.COMPLETE, progressCount, totalProgress, String.format("Repair command #%d finished with error", cmd)));
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6efa99c7/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java b/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
index 275673e..91629fe 100644
--- a/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
+++ b/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
@@ -35,7 +35,7 @@ import static org.apache.cassandra.service.ActiveRepairService.Status;
*/
public class LegacyJMXProgressSupport implements ProgressListener
{
- protected static final Pattern SESSION_FAILED_MATCHER = Pattern.compile("Repair session .* for range .* failed with error .*");
+ protected static final Pattern SESSION_FAILED_MATCHER = Pattern.compile("Repair session .* for range .* failed with error .*|Repair command .* failed with error .*");
protected static final Pattern SESSION_SUCCESS_MATCHER = Pattern.compile("Repair session .* for range .* finished");
private final AtomicLong notificationSerialNumber = new AtomicLong();
@@ -86,6 +86,7 @@ public class LegacyJMXProgressSupport implements ProgressListener
return Optional.of(Status.STARTED);
case COMPLETE:
return Optional.of(Status.FINISHED);
+ case ERROR:
case PROGRESS:
if (SESSION_FAILED_MATCHER.matcher(event.getMessage()).matches())
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: Fix deprecated repair error notifications
from 3.x clusters to legacy JMX clients
Posted by mc...@apache.org.
Fix deprecated repair error notifications from 3.x clusters to legacy JMX clients
patch by Patrick Bannister; reviewed by Mick Semb Wever for CASSANDRA-13121
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6efa99c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6efa99c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6efa99c7
Branch: refs/heads/cassandra-3.11
Commit: 6efa99c7a753e3ec04b7d5b5f50461e90d416db2
Parents: b9b2a4e
Author: Mick Semb Wever <mc...@apache.org>
Authored: Sun May 13 11:47:46 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Mon May 14 19:05:30 2018 +1000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/repair/RepairRunnable.java | 2 +-
.../cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6efa99c7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7c557f7..3da808a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.17
+ * Fix deprecated repair error notifications from 3.x clusters to legacy JMX clients (CASSANDRA-13121)
* Cassandra not starting when using enhanced startup scripts in windows (CASSANDRA-14418)
* Fix progress stats and units in compactionstats (CASSANDRA-12244)
* Better handle missing partition columns in system_schema.columns (CASSANDRA-14379)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6efa99c7/src/java/org/apache/cassandra/repair/RepairRunnable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/RepairRunnable.java b/src/java/org/apache/cassandra/repair/RepairRunnable.java
index 77726d4..774409f 100644
--- a/src/java/org/apache/cassandra/repair/RepairRunnable.java
+++ b/src/java/org/apache/cassandra/repair/RepairRunnable.java
@@ -103,7 +103,7 @@ public class RepairRunnable extends WrappedRunnable implements ProgressEventNoti
protected void fireErrorAndComplete(String tag, int progressCount, int totalProgress, String message)
{
- fireProgressEvent(tag, new ProgressEvent(ProgressEventType.ERROR, progressCount, totalProgress, message));
+ fireProgressEvent(tag, new ProgressEvent(ProgressEventType.ERROR, progressCount, totalProgress, String.format("Repair command #%d failed with error %s", cmd, message)));
fireProgressEvent(tag, new ProgressEvent(ProgressEventType.COMPLETE, progressCount, totalProgress, String.format("Repair command #%d finished with error", cmd)));
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6efa99c7/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java b/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
index 275673e..91629fe 100644
--- a/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
+++ b/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
@@ -35,7 +35,7 @@ import static org.apache.cassandra.service.ActiveRepairService.Status;
*/
public class LegacyJMXProgressSupport implements ProgressListener
{
- protected static final Pattern SESSION_FAILED_MATCHER = Pattern.compile("Repair session .* for range .* failed with error .*");
+ protected static final Pattern SESSION_FAILED_MATCHER = Pattern.compile("Repair session .* for range .* failed with error .*|Repair command .* failed with error .*");
protected static final Pattern SESSION_SUCCESS_MATCHER = Pattern.compile("Repair session .* for range .* finished");
private final AtomicLong notificationSerialNumber = new AtomicLong();
@@ -86,6 +86,7 @@ public class LegacyJMXProgressSupport implements ProgressListener
return Optional.of(Status.STARTED);
case COMPLETE:
return Optional.of(Status.FINISHED);
+ case ERROR:
case PROGRESS:
if (SESSION_FAILED_MATCHER.matcher(event.getMessage()).matches())
{
---------------------------------------------------------------------
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 mc...@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/ecf52ed3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ecf52ed3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ecf52ed3
Branch: refs/heads/trunk
Commit: ecf52ed3f82af1ae52f202c7ed856380583e9ff6
Parents: 45f2505 704f9b0
Author: Mick Semb Wever <mc...@apache.org>
Authored: Mon May 14 19:08:25 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Mon May 14 19:08:25 2018 +1000
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: Fix deprecated repair error notifications
from 3.x clusters to legacy JMX clients
Posted by mc...@apache.org.
Fix deprecated repair error notifications from 3.x clusters to legacy JMX clients
patch by Patrick Bannister; reviewed by Mick Semb Wever for CASSANDRA-13121
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6efa99c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6efa99c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6efa99c7
Branch: refs/heads/trunk
Commit: 6efa99c7a753e3ec04b7d5b5f50461e90d416db2
Parents: b9b2a4e
Author: Mick Semb Wever <mc...@apache.org>
Authored: Sun May 13 11:47:46 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Mon May 14 19:05:30 2018 +1000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/repair/RepairRunnable.java | 2 +-
.../cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6efa99c7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7c557f7..3da808a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.17
+ * Fix deprecated repair error notifications from 3.x clusters to legacy JMX clients (CASSANDRA-13121)
* Cassandra not starting when using enhanced startup scripts in windows (CASSANDRA-14418)
* Fix progress stats and units in compactionstats (CASSANDRA-12244)
* Better handle missing partition columns in system_schema.columns (CASSANDRA-14379)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6efa99c7/src/java/org/apache/cassandra/repair/RepairRunnable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/RepairRunnable.java b/src/java/org/apache/cassandra/repair/RepairRunnable.java
index 77726d4..774409f 100644
--- a/src/java/org/apache/cassandra/repair/RepairRunnable.java
+++ b/src/java/org/apache/cassandra/repair/RepairRunnable.java
@@ -103,7 +103,7 @@ public class RepairRunnable extends WrappedRunnable implements ProgressEventNoti
protected void fireErrorAndComplete(String tag, int progressCount, int totalProgress, String message)
{
- fireProgressEvent(tag, new ProgressEvent(ProgressEventType.ERROR, progressCount, totalProgress, message));
+ fireProgressEvent(tag, new ProgressEvent(ProgressEventType.ERROR, progressCount, totalProgress, String.format("Repair command #%d failed with error %s", cmd, message)));
fireProgressEvent(tag, new ProgressEvent(ProgressEventType.COMPLETE, progressCount, totalProgress, String.format("Repair command #%d finished with error", cmd)));
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6efa99c7/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java b/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
index 275673e..91629fe 100644
--- a/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
+++ b/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
@@ -35,7 +35,7 @@ import static org.apache.cassandra.service.ActiveRepairService.Status;
*/
public class LegacyJMXProgressSupport implements ProgressListener
{
- protected static final Pattern SESSION_FAILED_MATCHER = Pattern.compile("Repair session .* for range .* failed with error .*");
+ protected static final Pattern SESSION_FAILED_MATCHER = Pattern.compile("Repair session .* for range .* failed with error .*|Repair command .* failed with error .*");
protected static final Pattern SESSION_SUCCESS_MATCHER = Pattern.compile("Repair session .* for range .* finished");
private final AtomicLong notificationSerialNumber = new AtomicLong();
@@ -86,6 +86,7 @@ public class LegacyJMXProgressSupport implements ProgressListener
return Optional.of(Status.STARTED);
case COMPLETE:
return Optional.of(Status.FINISHED);
+ case ERROR:
case PROGRESS:
if (SESSION_FAILED_MATCHER.matcher(event.getMessage()).matches())
{
---------------------------------------------------------------------
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 mc...@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/704f9b09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/704f9b09
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/704f9b09
Branch: refs/heads/cassandra-3.11
Commit: 704f9b093a219c71bc5be0682db88c447b6c433f
Parents: 2805860 6efa99c
Author: Mick Semb Wever <mc...@apache.org>
Authored: Mon May 14 19:06:40 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Mon May 14 19:08:00 2018 +1000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/repair/RepairRunnable.java | 2 +-
.../cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/704f9b09/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e63e5f3,3da808a..0e4346b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
-3.0.17
+3.11.3
+ * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
+ * Update metrics to 3.1.5 (CASSANDRA-12924)
+ * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
+ * Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271)
+ * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
+ * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
+ * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
+ * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
+ * Serialize empty buffer as empty string for json output format (CASSANDRA-14245)
+ * Allow logging implementation to be interchanged for embedded testing (CASSANDRA-13396)
+ * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
+ * Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170)
+ * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163)
+ * Fix wildcard GROUP BY queries (CASSANDRA-14209)
+Merged from 3.0:
+ * Fix deprecated repair error notifications from 3.x clusters to legacy JMX clients (CASSANDRA-13121)
* Cassandra not starting when using enhanced startup scripts in windows (CASSANDRA-14418)
* Fix progress stats and units in compactionstats (CASSANDRA-12244)
* Better handle missing partition columns in system_schema.columns (CASSANDRA-14379)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/704f9b09/src/java/org/apache/cassandra/repair/RepairRunnable.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/704f9b09/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
----------------------------------------------------------------------
---------------------------------------------------------------------
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 mc...@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/704f9b09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/704f9b09
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/704f9b09
Branch: refs/heads/trunk
Commit: 704f9b093a219c71bc5be0682db88c447b6c433f
Parents: 2805860 6efa99c
Author: Mick Semb Wever <mc...@apache.org>
Authored: Mon May 14 19:06:40 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Mon May 14 19:08:00 2018 +1000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/repair/RepairRunnable.java | 2 +-
.../cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/704f9b09/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e63e5f3,3da808a..0e4346b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
-3.0.17
+3.11.3
+ * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
+ * Update metrics to 3.1.5 (CASSANDRA-12924)
+ * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
+ * Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271)
+ * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
+ * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
+ * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
+ * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
+ * Serialize empty buffer as empty string for json output format (CASSANDRA-14245)
+ * Allow logging implementation to be interchanged for embedded testing (CASSANDRA-13396)
+ * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
+ * Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170)
+ * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163)
+ * Fix wildcard GROUP BY queries (CASSANDRA-14209)
+Merged from 3.0:
+ * Fix deprecated repair error notifications from 3.x clusters to legacy JMX clients (CASSANDRA-13121)
* Cassandra not starting when using enhanced startup scripts in windows (CASSANDRA-14418)
* Fix progress stats and units in compactionstats (CASSANDRA-12244)
* Better handle missing partition columns in system_schema.columns (CASSANDRA-14379)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/704f9b09/src/java/org/apache/cassandra/repair/RepairRunnable.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/704f9b09/src/java/org/apache/cassandra/utils/progress/jmx/LegacyJMXProgressSupport.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org