Updated Branches: refs/heads/cassandra-1.1.0 bd9e40215 -> 3f8db24e4
perform static initialization of StorageProxy on start-up patch by jbellis and scode for CASSANDRA-3797 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f8db24e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f8db24e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f8db24e Branch: refs/heads/cassandra-1.1.0 Commit: 3f8db24e4ae5d17442e15ad485d03021628e91c1 Parents: bd9e402 Author: Peter Schuller <[email protected]> Authored: Tue Feb 28 12:05:51 2012 -0800 Committer: Peter Schuller <[email protected]> Committed: Tue Feb 28 12:11:24 2012 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StorageService.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f8db24e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b6f1447..fec8f38 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -15,6 +15,7 @@ * CLI to report when unsupported column_metadata pair was given (CASSANDRA-3959) * reincarnate removed and deprecated KsDef/CfDef attributes (CASSANDRA-3953) * Fix race between writes and read for cache (CASSANDRA-3862) + * perform static initialization of StorageProxy on start-up (CASSANDRA-3797) Merged from 1.0: * remove the wait on hint future during write (CASSANDRA-3870) * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f8db24e/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 4ea8ed1..a06b5b7 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -421,6 +421,16 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe initialized = true; isClientMode = false; + // Ensure StorageProxy is initialized on start-up; see CASSANDRA-3797. + try + { + Class.forName("org.apache.cassandra.service.StorageProxy"); + } + catch (ClassNotFoundException e) + { + throw new AssertionError(e); + } + if (Boolean.parseBoolean(System.getProperty("cassandra.load_ring_state", "true"))) { logger_.info("Loading persisted ring state");
