Repository: cassandra Updated Branches: refs/heads/trunk 9ffb19569 -> e48a00b6d
return all cpu values from BackgroundActivityMonitor.readAndCompute patch by dbrosius reviewed by jbellis for cassandra-7183 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c4fcb166 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4fcb166 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c4fcb166 Branch: refs/heads/trunk Commit: c4fcb16699690b7ed66014cd3a8d38516b14b607 Parents: dceb739 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed May 7 19:20:13 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed May 7 19:20:13 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/utils/BackgroundActivityMonitor.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4fcb166/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 20fd115..8df7d95 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,7 @@ 2.0.9 * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) 2.0.8 * Correctly delete scheduled range xfers (CASSANDRA-7143) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4fcb166/src/java/org/apache/cassandra/utils/BackgroundActivityMonitor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/BackgroundActivityMonitor.java b/src/java/org/apache/cassandra/utils/BackgroundActivityMonitor.java index 93906eb..43113fc 100644 --- a/src/java/org/apache/cassandra/utils/BackgroundActivityMonitor.java +++ b/src/java/org/apache/cassandra/utils/BackgroundActivityMonitor.java @@ -85,7 +85,7 @@ public class BackgroundActivityMonitor String name = tokenizer.nextToken(); assert name.equalsIgnoreCase("cpu"); long[] returned = new long[tokenizer.countTokens()]; - for (int i = 0; i < tokenizer.countTokens(); i++) + for (int i = 0; i < returned.length; i++) returned[i] = Long.parseLong(tokenizer.nextToken()); return returned; }
