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 2015/06/04 17:26:30 UTC
[1/2] cassandra git commit: Revert "Populate TokenMetadata early
during startup."
Repository: cassandra
Updated Branches:
refs/heads/trunk 1a14efdfd -> 39b413149
Revert "Populate TokenMetadata early during startup."
This reverts commit 5012463b60e31c78a5a2af5e0ca78b64e4dc38a6.
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96677ca1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96677ca1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96677ca1
Branch: refs/heads/trunk
Commit: 96677ca1252cea37cfb8f1aa51f40b095e060d3b
Parents: 05253cc
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jun 4 17:21:09 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jun 4 17:22:35 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 -
.../apache/cassandra/service/CassandraDaemon.java | 1 -
.../apache/cassandra/service/StorageService.java | 16 +---------------
3 files changed, 1 insertion(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96677ca1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0ff9363..232e264 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -45,7 +45,6 @@ Merged from 2.0:
* faster async logback configuration for tests (CASSANDRA-9376)
* Add `smallint` and `tinyint` data types (CASSANDRA-8951)
* Avoid thrift schema creation when native driver is used in stress tool (CASSANDRA-9374)
- * Populate TokenMetadata early during startup (CASSANDRA-9317)
* Make Functions.declared thread-safe
* Add client warnings to native protocol v4 (CASSANDRA-8930)
* Allow roles cache to be invalidated (CASSANDRA-8967)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96677ca1/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 914600e..c1b4ad6 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -173,7 +173,6 @@ public class CassandraDaemon
}
});
- StorageService.instance.populateTokenMetadata();
// load schema from disk
Schema.instance.loadFromDisk();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96677ca1/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 4fdb7b7..e059348 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -565,21 +565,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
MessagingService.instance().listen(FBUtilities.getLocalAddress());
}
- public void populateTokenMetadata()
- {
- if (Boolean.parseBoolean(System.getProperty("cassandra.load_ring_state", "true")))
- {
- logger.info("Populating token metadata from system tables");
- Multimap<InetAddress, Token> loadedTokens = SystemKeyspace.loadTokens();
- if (!shouldBootstrap()) // if we have not completed bootstrapping, we should not add ourselves as a normal token
- loadedTokens.putAll(FBUtilities.getBroadcastAddress(), SystemKeyspace.getSavedTokens());
- for (InetAddress ep : loadedTokens.keySet())
- tokenMetadata.updateNormalTokens(loadedTokens.get(ep), ep);
-
- logger.info("Token metadata: {}", tokenMetadata);
- }
- }
-
public synchronized void initServer() throws ConfigurationException
{
initServer(RING_DELAY);
@@ -620,6 +605,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
}
else
{
+ tokenMetadata.updateNormalTokens(loadedTokens.get(ep), ep);
if (loadedHostIds.containsKey(ep))
tokenMetadata.updateHostId(loadedHostIds.get(ep), ep);
Gossiper.instance.addSavedEndpoint(ep);
[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39b41314
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39b41314
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39b41314
Branch: refs/heads/trunk
Commit: 39b413149077a9102fcd68e3596ae53be68c7a1c
Parents: 1a14efd 96677ca
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jun 4 17:23:19 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jun 4 17:23:50 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39b41314/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2c0c0b3,232e264..53d576f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,3 +1,10 @@@
+3.0:
+ * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
+ * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
+ * Change default garbage collector to G1 (CASSANDRA-7486)
++ * Populate TokenMetadata early during startup (CASSANDRA-9317)
+
+
2.2
* Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400)
* Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter (CASSANDRA-9546)