You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/04/13 17:36:05 UTC
[9/16] git commit: support PropertyFileSnitch in bulk loader patch by
Ji Cheng; reviewed by jbellis for CASSANDRA-4145
support PropertyFileSnitch in bulk loader
patch by Ji Cheng; reviewed by jbellis for CASSANDRA-4145
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7388130
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7388130
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7388130
Branch: refs/heads/cassandra-1.1
Commit: c738813098e4306f6e102526121820dbbb3ee648
Parents: 142e8c1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Apr 13 10:31:01 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Apr 13 10:31:01 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/locator/PropertyFileSnitch.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7388130/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e2fc4de..26d0011 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.0.10
+ * support PropertyFileSnitch in bulk loader (CASSANDRA-4145)
* add auto_snapshot option allowing disabling snapshot before drop/truncate
(CASSANDRA-3710)
* allow short snitch names (CASSANDRA-4130)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7388130/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
index f085a38..8ddebf8 100644
--- a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
+++ b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
@@ -167,6 +167,7 @@ public class PropertyFileSnitch extends AbstractNetworkTopologySnitch
logger.debug("loaded network topology {}", FBUtilities.toString(reloadedMap));
endpointMap = reloadedMap;
- StorageService.instance.getTokenMetadata().invalidateCaches();
+ if (StorageService.instance != null) // null check tolerates circular dependency; see CASSANDRA-4145
+ StorageService.instance.getTokenMetadata().invalidateCaches();
}
}