Updated Branches: refs/heads/trunk 4a60654d1 -> 4f5ea3452
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f5ea345 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f5ea345 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f5ea345 Branch: refs/heads/trunk Commit: 4f5ea34523be945f057474caa4aa13a1cf0fd42d Parents: 4a60654 fb7dfc9 Author: Peter Schuller <peter.schul...@infidyne.com> Authored: Mon Mar 5 21:58:04 2012 -0800 Committer: Peter Schuller <peter.schul...@infidyne.com> Committed: Mon Mar 5 21:58:04 2012 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 1 + lib/metrics-core-2.0.3.jar | Bin 0 -> 80800 bytes .../cassandra/metrics/ClientRequestMetrics.java | 32 +++++++++++++++ .../org/apache/cassandra/service/StorageProxy.java | 20 +++++++++ .../apache/cassandra/service/StorageService.java | 8 ++++ 6 files changed, 62 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5ea345/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5ea345/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index cce0ac1,e59e384..9c08ab9 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -431,9 -433,16 +432,16 @@@ public class StorageService implements throw new AssertionError(e); } + if (!isClientMode) + { + // "Touch" metrics classes to trigger static initialization, such that all metrics become available + // on start-up even if they have not yet been used. + new ClientRequestMetrics(); + } + if (Boolean.parseBoolean(System.getProperty("cassandra.load_ring_state", "true"))) { - logger_.info("Loading persisted ring state"); + logger.info("Loading persisted ring state"); for (Map.Entry<Token, InetAddress> entry : SystemTable.loadTokens().entrySet()) { if (entry.getValue() == FBUtilities.getLocalAddress())
