You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2016/08/04 00:53:54 UTC
[1/6] cassandra git commit: Fixed ConcurrentModificationException
when reading metrics in GraphiteReporter
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 3431934b4 -> 52be7bac4
refs/heads/cassandra-3.9 b603720e4 -> 042e1f76a
refs/heads/trunk 4e21f7267 -> d4410263d
Fixed ConcurrentModificationException when reading metrics in GraphiteReporter
patch by Edward Ribeiro; reviewed by Stefania Alborghetti for CASSANDRA-11823
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52be7bac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52be7bac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52be7bac
Branch: refs/heads/cassandra-3.0
Commit: 52be7bac4160c392605f2ec6c2f98d4e49ccf2fe
Parents: 3431934
Author: Edward Ribeiro <ed...@gmail.com>
Authored: Wed Aug 3 10:07:13 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Aug 4 08:47:49 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/metrics/TableMetrics.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52be7bac/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e8b8abb..f0ceb70 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.9
+ * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823)
* Fix upgrade of super columns on thrift (CASSANDRA-12335)
* Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359)
* Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52be7bac/src/java/org/apache/cassandra/metrics/TableMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/TableMetrics.java b/src/java/org/apache/cassandra/metrics/TableMetrics.java
index 85bf7f6..a21e8ca 100644
--- a/src/java/org/apache/cassandra/metrics/TableMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/TableMetrics.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.metrics;
import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import com.codahale.metrics.*;
@@ -788,7 +789,7 @@ public class TableMetrics
*/
private boolean register(String name, String alias, Metric metric)
{
- boolean ret = allTableMetrics.putIfAbsent(name, new HashSet<>()) == null;
+ boolean ret = allTableMetrics.putIfAbsent(name, ConcurrentHashMap.newKeySet()) == null;
allTableMetrics.get(name).add(metric);
all.put(name, alias);
return ret;
[2/6] cassandra git commit: Fixed ConcurrentModificationException
when reading metrics in GraphiteReporter
Posted by st...@apache.org.
Fixed ConcurrentModificationException when reading metrics in GraphiteReporter
patch by Edward Ribeiro; reviewed by Stefania Alborghetti for CASSANDRA-11823
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52be7bac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52be7bac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52be7bac
Branch: refs/heads/cassandra-3.9
Commit: 52be7bac4160c392605f2ec6c2f98d4e49ccf2fe
Parents: 3431934
Author: Edward Ribeiro <ed...@gmail.com>
Authored: Wed Aug 3 10:07:13 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Aug 4 08:47:49 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/metrics/TableMetrics.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52be7bac/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e8b8abb..f0ceb70 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.9
+ * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823)
* Fix upgrade of super columns on thrift (CASSANDRA-12335)
* Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359)
* Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52be7bac/src/java/org/apache/cassandra/metrics/TableMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/TableMetrics.java b/src/java/org/apache/cassandra/metrics/TableMetrics.java
index 85bf7f6..a21e8ca 100644
--- a/src/java/org/apache/cassandra/metrics/TableMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/TableMetrics.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.metrics;
import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import com.codahale.metrics.*;
@@ -788,7 +789,7 @@ public class TableMetrics
*/
private boolean register(String name, String alias, Metric metric)
{
- boolean ret = allTableMetrics.putIfAbsent(name, new HashSet<>()) == null;
+ boolean ret = allTableMetrics.putIfAbsent(name, ConcurrentHashMap.newKeySet()) == null;
allTableMetrics.get(name).add(metric);
all.put(name, alias);
return ret;
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by st...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/042e1f76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/042e1f76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/042e1f76
Branch: refs/heads/cassandra-3.9
Commit: 042e1f76a9955553bb8f14ce31a13bde421ed071
Parents: b603720 52be7ba
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Aug 4 08:50:04 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Aug 4 08:50:04 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/metrics/TableMetrics.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/042e1f76/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 62a6e6f,f0ceb70..31d9434
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
-3.0.9
+3.9
+ * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
+ * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348)
+ * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
+ * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
+Merged from 3.0:
+ * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823)
* Fix upgrade of super columns on thrift (CASSANDRA-12335)
* Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359)
* Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/042e1f76/src/java/org/apache/cassandra/metrics/TableMetrics.java
----------------------------------------------------------------------
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Posted by st...@apache.org.
Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4410263
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4410263
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4410263
Branch: refs/heads/trunk
Commit: d4410263db587b4250fb1a9b4bc73d14c52f4fc0
Parents: 4e21f72 042e1f7
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Aug 4 08:51:14 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Aug 4 08:51:14 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/metrics/TableMetrics.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4410263/CHANGES.txt
----------------------------------------------------------------------
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by st...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/042e1f76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/042e1f76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/042e1f76
Branch: refs/heads/trunk
Commit: 042e1f76a9955553bb8f14ce31a13bde421ed071
Parents: b603720 52be7ba
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Aug 4 08:50:04 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Aug 4 08:50:04 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/metrics/TableMetrics.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/042e1f76/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 62a6e6f,f0ceb70..31d9434
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
-3.0.9
+3.9
+ * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
+ * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348)
+ * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
+ * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
+Merged from 3.0:
+ * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823)
* Fix upgrade of super columns on thrift (CASSANDRA-12335)
* Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359)
* Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/042e1f76/src/java/org/apache/cassandra/metrics/TableMetrics.java
----------------------------------------------------------------------
[3/6] cassandra git commit: Fixed ConcurrentModificationException
when reading metrics in GraphiteReporter
Posted by st...@apache.org.
Fixed ConcurrentModificationException when reading metrics in GraphiteReporter
patch by Edward Ribeiro; reviewed by Stefania Alborghetti for CASSANDRA-11823
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52be7bac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52be7bac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52be7bac
Branch: refs/heads/trunk
Commit: 52be7bac4160c392605f2ec6c2f98d4e49ccf2fe
Parents: 3431934
Author: Edward Ribeiro <ed...@gmail.com>
Authored: Wed Aug 3 10:07:13 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Aug 4 08:47:49 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/metrics/TableMetrics.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52be7bac/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e8b8abb..f0ceb70 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.9
+ * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823)
* Fix upgrade of super columns on thrift (CASSANDRA-12335)
* Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359)
* Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52be7bac/src/java/org/apache/cassandra/metrics/TableMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/TableMetrics.java b/src/java/org/apache/cassandra/metrics/TableMetrics.java
index 85bf7f6..a21e8ca 100644
--- a/src/java/org/apache/cassandra/metrics/TableMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/TableMetrics.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.metrics;
import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import com.codahale.metrics.*;
@@ -788,7 +789,7 @@ public class TableMetrics
*/
private boolean register(String name, String alias, Metric metric)
{
- boolean ret = allTableMetrics.putIfAbsent(name, new HashSet<>()) == null;
+ boolean ret = allTableMetrics.putIfAbsent(name, ConcurrentHashMap.newKeySet()) == null;
allTableMetrics.get(name).add(metric);
all.put(name, alias);
return ret;