You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/11/06 01:13:50 UTC
[1/4] cassandra git commit: Do not run SizeEstimatesRecorder if a
node is not a member of the ring
Repository: cassandra
Updated Branches:
refs/heads/trunk 746e9e419 -> 8f189d110
Do not run SizeEstimatesRecorder if a node is not a member of the ring
patch by Paulo Motta; reviewed by Joel Knighton for CASSANDRA-9912
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ca75990
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ca75990
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ca75990
Branch: refs/heads/trunk
Commit: 2ca7599023a1e507f263b0c4854ab26b3ba283ac
Parents: b6015fa
Author: Paulo Motta <pa...@gmail.com>
Authored: Thu Oct 29 12:03:21 2015 -0700
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Nov 6 00:00:38 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/SizeEstimatesRecorder.java | 5 +++--
.../org/apache/cassandra/db/SystemKeyspace.java | 16 ----------------
.../apache/cassandra/service/StorageService.java | 5 +----
4 files changed, 5 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ca75990/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5ceabb4..a994ca1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Do not run SizeEstimatesRecorder if a node is not a member of the ring (CASSANDRA-9912)
* Improve handling of dead nodes in gossip (CASSANDRA-10298)
* Fix logback-tools.xml incorrectly configured for outputing to System.err
(CASSANDRA-9937)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ca75990/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java b/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
index 13d9c60..fe4ebd3 100644
--- a/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
+++ b/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
@@ -29,6 +29,7 @@ import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.service.MigrationListener;
import org.apache.cassandra.service.MigrationManager;
import org.apache.cassandra.service.StorageService;
+import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
import org.apache.cassandra.utils.concurrent.Refs;
@@ -55,9 +56,9 @@ public class SizeEstimatesRecorder extends MigrationListener implements Runnable
public void run()
{
- if (StorageService.instance.isStarting())
+ if (!StorageService.instance.getTokenMetadata().isMember(FBUtilities.getBroadcastAddress()))
{
- logger.debug("Node has not yet joined; not recording size estimates");
+ logger.debug("Node is not part of the ring; not recording size estimates");
return;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ca75990/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java b/src/java/org/apache/cassandra/db/SystemKeyspace.java
index 54fdb47..c600652 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -462,22 +462,6 @@ public class SystemKeyspace
forceBlockingFlush(LOCAL_CF);
}
- /**
- * Convenience method to update the list of tokens in the local system keyspace.
- *
- * @param addTokens tokens to add
- * @param rmTokens tokens to remove
- * @return the collection of persisted tokens
- */
- public static synchronized Collection<Token> updateLocalTokens(Collection<Token> addTokens, Collection<Token> rmTokens)
- {
- Collection<Token> tokens = getSavedTokens();
- tokens.removeAll(rmTokens);
- tokens.addAll(addTokens);
- updateTokens(tokens);
- return tokens;
- }
-
public static void forceBlockingFlush(String cfname)
{
if (!Boolean.getBoolean("cassandra.unsafesystem"))
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ca75990/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index d02a572..af3a00c 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1687,7 +1687,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
Set<Token> tokensToUpdateInMetadata = new HashSet<>();
Set<Token> tokensToUpdateInSystemKeyspace = new HashSet<>();
- Set<Token> localTokensToRemove = new HashSet<>();
Set<InetAddress> endpointsToRemove = new HashSet<>();
@@ -1790,9 +1789,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
Gossiper.instance.replacementQuarantine(ep); // quarantine locally longer than normally; see CASSANDRA-8260
}
if (!tokensToUpdateInSystemKeyspace.isEmpty())
- SystemKeyspace.updateTokens(endpoint, tokensToUpdateInSystemKeyspace);
- if (!localTokensToRemove.isEmpty())
- SystemKeyspace.updateLocalTokens(Collections.<Token>emptyList(), localTokensToRemove);
+ SystemKeyspace.updateTokens(endpoint, tokensToUpdateInSystemKeyspace);;
if (isMoving || operationMode == Mode.MOVING)
{
[2/4] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/801c50e6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/801c50e6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/801c50e6
Branch: refs/heads/trunk
Commit: 801c50e69f13bef3dc7b29a303dc11aad7d83d19
Parents: 0ff13d2 2ca7599
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Nov 6 00:10:09 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Nov 6 00:10:09 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/SizeEstimatesRecorder.java | 5 +++--
.../org/apache/cassandra/db/SystemKeyspace.java | 16 ----------------
.../apache/cassandra/service/StorageService.java | 5 +----
4 files changed, 5 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/801c50e6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fedede2,a994ca1..538d5e4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
-2.1.12
+2.2.4
+ * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
+ * Expose phi values from failure detector via JMX and tweak debug
+ and trace logging (CASSANDRA-9526)
+ * Fix RangeNamesQueryPager (CASSANDRA-10509)
+ * Deprecate Pig support (CASSANDRA-10542)
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+Merged from 2.1:
+ * Do not run SizeEstimatesRecorder if a node is not a member of the ring (CASSANDRA-9912)
* Improve handling of dead nodes in gossip (CASSANDRA-10298)
* Fix logback-tools.xml incorrectly configured for outputing to System.err
(CASSANDRA-9937)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/801c50e6/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/801c50e6/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/SystemKeyspace.java
index 62bf59e,c600652..1807101
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@@ -584,26 -458,10 +584,10 @@@ public final class SystemKeyspac
{
assert !tokens.isEmpty() : "removeEndpoint should be used instead";
String req = "INSERT INTO system.%s (key, tokens) VALUES ('%s', ?)";
- executeInternal(String.format(req, LOCAL_CF, LOCAL_KEY), tokensAsSet(tokens));
- forceBlockingFlush(LOCAL_CF);
+ executeInternal(String.format(req, LOCAL, LOCAL), tokensAsSet(tokens));
+ forceBlockingFlush(LOCAL);
}
- /**
- * Convenience method to update the list of tokens in the local system keyspace.
- *
- * @param addTokens tokens to add
- * @param rmTokens tokens to remove
- * @return the collection of persisted tokens
- */
- public static synchronized Collection<Token> updateLocalTokens(Collection<Token> addTokens, Collection<Token> rmTokens)
- {
- Collection<Token> tokens = getSavedTokens();
- tokens.removeAll(rmTokens);
- tokens.addAll(addTokens);
- updateTokens(tokens);
- return tokens;
- }
-
public static void forceBlockingFlush(String cfname)
{
if (!Boolean.getBoolean("cassandra.unsafesystem"))
http://git-wip-us.apache.org/repos/asf/cassandra/blob/801c50e6/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f189d11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f189d11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f189d11
Branch: refs/heads/trunk
Commit: 8f189d1107b354cb1e820f0e4593712e0faee8c7
Parents: 746e9e4 cc4d759
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Nov 6 00:13:40 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Nov 6 00:13:40 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/SizeEstimatesRecorder.java | 5 +++--
.../org/apache/cassandra/db/SystemKeyspace.java | 16 ----------------
.../apache/cassandra/service/StorageService.java | 5 +----
4 files changed, 5 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f189d11/CHANGES.txt
----------------------------------------------------------------------
[3/4] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc4d759c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc4d759c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc4d759c
Branch: refs/heads/trunk
Commit: cc4d759c9023878760b0cbef854938cd302609d1
Parents: 02a53fa 801c50e
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Nov 6 00:12:29 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Nov 6 00:12:29 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/SizeEstimatesRecorder.java | 5 +++--
.../org/apache/cassandra/db/SystemKeyspace.java | 16 ----------------
.../apache/cassandra/service/StorageService.java | 5 +----
4 files changed, 5 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc4d759c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6873edd,538d5e4..433bc85
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,12 +1,36 @@@
-2.2.4
- * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
+3.0
+ * Fix bootstrapping with MVs (CASSANDRA-10621)
+ * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)
+ * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)
+ * (Hadoop) fix CIF describeSplits() not handling 0 size estimates (CASSANDRA-10600)
+ * Fix reading of legacy sstables (CASSANDRA-10590)
+ * Use CQL type names in schema metadata tables (CASSANDRA-10365)
+ * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
+ * Fix bug when adding a column to thrift with the same name than a primary key (CASSANDRA-10608)
+ * Add client address argument to IAuthenticator::newSaslNegotiator (CASSANDRA-8068)
+ * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
+ * Don't use 'names query' read path for counters (CASSANDRA-10572)
+ * Fix backward compatibility for counters (CASSANDRA-10470)
+ * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581,10628)
+ * Execute the metadata reload task of all registered indexes on CFS::reload (CASSANDRA-10604)
+ * Fix thrift cas operations with defined columns (CASSANDRA-10576)
+ * Fix PartitionUpdate.operationCount()for updates with static column operations (CASSANDRA-10606)
+ * Fix thrift get() queries with defined columns (CASSANDRA-10586)
+ * Fix marking of indexes as built and removed (CASSANDRA-10601)
+ * Skip initialization of non-registered 2i instances, remove Index::getIndexName (CASSANDRA-10595)
+ * Fix batches on multiple tables (CASSANDRA-10554)
+ * Ensure compaction options are validated when updating KeyspaceMetadata (CASSANDRA-10569)
+ * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
+ * Remove token generator (CASSANDRA-5261)
+ * RolesCache should not be created for any authenticator that does not requireAuthentication (CASSANDRA-10562)
+ * Fix LogTransaction checking only a single directory for files (CASSANDRA-10421)
+ * Fix handling of range tombstones when reading old format sstables (CASSANDRA-10360)
+ * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
+Merged from 2.2:
* Expose phi values from failure detector via JMX and tweak debug
and trace logging (CASSANDRA-9526)
- * Fix RangeNamesQueryPager (CASSANDRA-10509)
- * Deprecate Pig support (CASSANDRA-10542)
- * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
Merged from 2.1:
+ * Do not run SizeEstimatesRecorder if a node is not a member of the ring (CASSANDRA-9912)
* Improve handling of dead nodes in gossip (CASSANDRA-10298)
* Fix logback-tools.xml incorrectly configured for outputing to System.err
(CASSANDRA-9937)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc4d759c/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc4d759c/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc4d759c/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------