Repository: cassandra Updated Branches: refs/heads/trunk ac09f2c94 -> b05a54691
Adjust nodetool for changes from CASSANDRA-5549. patch by Mikhail Stepura; reviewed by Yuki Morishita for CASSANDRA-6739 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d529ab9b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d529ab9b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d529ab9b Branch: refs/heads/trunk Commit: d529ab9b8cbb66f299bd69c7283e38caa4c57253 Parents: 974a3cc Author: Mikhail Stepura <mish...@apache.org> Authored: Wed Feb 19 16:13:08 2014 -0800 Committer: Mikhail Stepura <mish...@apache.org> Committed: Wed Feb 19 19:39:35 2014 -0800 ---------------------------------------------------------------------- .../org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 2 +- src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++-- src/java/org/apache/cassandra/tools/NodeTool.java | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d529ab9b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java index fbc2730..288bec9 100644 --- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java +++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java @@ -382,7 +382,7 @@ public class ColumnFamilyMetrics Metrics.defaultRegistry().removeMetric(factory.createMetricName("EstimatedRowSizeHistogram")); Metrics.defaultRegistry().removeMetric(factory.createMetricName("EstimatedColumnCountHistogram")); Metrics.defaultRegistry().removeMetric(factory.createMetricName("SSTablesPerReadHistogram")); - Metrics.defaultRegistry().removeMetric(factory.createMetricName("PendingTasks")); + Metrics.defaultRegistry().removeMetric(factory.createMetricName("PendingFlushes")); Metrics.defaultRegistry().removeMetric(factory.createMetricName("LiveSSTableCount")); Metrics.defaultRegistry().removeMetric(factory.createMetricName("LiveDiskSpaceUsed")); Metrics.defaultRegistry().removeMetric(factory.createMetricName("TotalDiskSpaceUsed")); http://git-wip-us.apache.org/repos/asf/cassandra/blob/d529ab9b/src/java/org/apache/cassandra/tools/NodeProbe.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index 2288953..dc5e8e7 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -991,9 +991,8 @@ public class NodeProbe implements AutoCloseable case "MaxRowSize": case "MeanRowSize": case "MemtableColumnsCount": - case "MemtableDataSize": + case "MemtableLiveDataSize": case "MinRowSize": - case "PendingTasks": case "RecentBloomFilterFalsePositives": case "RecentBloomFilterFalseRatio": case "SnapshotsSize": @@ -1004,6 +1003,7 @@ public class NodeProbe implements AutoCloseable case "TotalDiskSpaceUsed": case "WriteTotalLatency": case "ReadTotalLatency": + case "PendingFlushes": return JMX.newMBeanProxy(mbeanServerConn, oName, JmxReporter.CounterMBean.class).getCount(); case "ReadLatency": case "CoordinatorReadLatency": http://git-wip-us.apache.org/repos/asf/cassandra/blob/d529ab9b/src/java/org/apache/cassandra/tools/NodeTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java index fedf2c1..d24e013 100644 --- a/src/java/org/apache/cassandra/tools/NodeTool.java +++ b/src/java/org/apache/cassandra/tools/NodeTool.java @@ -656,7 +656,7 @@ public class NodeTool List<ColumnFamilyStoreMBean> columnFamilies = entry.getValue(); long keyspaceReadCount = 0; long keyspaceWriteCount = 0; - int keyspacePendingTasks = 0; + int keyspacePendingFlushes = 0; double keyspaceTotalReadTime = 0.0f; double keyspaceTotalWriteTime = 0.0f; @@ -677,7 +677,7 @@ public class NodeTool keyspaceWriteCount += writeCount; keyspaceTotalWriteTime += (long) probe.getColumnFamilyMetric(keyspaceName, cfName, "WriteTotalLatency"); } - keyspacePendingTasks += (int) probe.getColumnFamilyMetric(keyspaceName, cfName, "PendingTasks"); + keyspacePendingFlushes += (long) probe.getColumnFamilyMetric(keyspaceName, cfName, "PendingFlushes"); } double keyspaceReadLatency = keyspaceReadCount > 0 @@ -691,7 +691,7 @@ public class NodeTool System.out.println("\tRead Latency: " + format("%s", keyspaceReadLatency) + " ms."); System.out.println("\tWrite Count: " + keyspaceWriteCount); System.out.println("\tWrite Latency: " + format("%s", keyspaceWriteLatency) + " ms."); - System.out.println("\tPending Tasks: " + keyspacePendingTasks); + System.out.println("\tPending Flushes: " + keyspacePendingFlushes); // print out column family statistics for this keyspace for (ColumnFamilyStoreMBean cfstore : columnFamilies) @@ -730,7 +730,7 @@ public class NodeTool System.out.println("\t\tSpace used by snapshots (total), bytes: " + probe.getColumnFamilyMetric(keyspaceName, cfName, "SnapshotsSize")); System.out.println("\t\tSSTable Compression Ratio: " + probe.getColumnFamilyMetric(keyspaceName, cfName, "CompressionRatio")); System.out.println("\t\tMemtable cell count: " + probe.getColumnFamilyMetric(keyspaceName, cfName, "MemtableColumnsCount")); - System.out.println("\t\tMemtable data size, bytes: " + probe.getColumnFamilyMetric(keyspaceName, cfName, "MemtableDataSize")); + System.out.println("\t\tMemtable data size, bytes: " + probe.getColumnFamilyMetric(keyspaceName, cfName, "MemtableLiveDataSize")); System.out.println("\t\tMemtable switch count: " + probe.getColumnFamilyMetric(keyspaceName, cfName, "MemtableSwitchCount")); System.out.println("\t\tLocal read count: " + ((JmxReporter.TimerMBean) probe.getColumnFamilyMetric(keyspaceName, cfName, "ReadLatency")).getCount()); double localReadLatency = ((JmxReporter.TimerMBean) probe.getColumnFamilyMetric(keyspaceName, cfName, "ReadLatency")).getMean() / 1000; @@ -740,7 +740,7 @@ public class NodeTool double localWriteLatency = ((JmxReporter.TimerMBean) probe.getColumnFamilyMetric(keyspaceName, cfName, "WriteLatency")).getMean() / 1000; double localWLatency = localWriteLatency > 0 ? localWriteLatency : Double.NaN; System.out.printf("\t\tLocal write latency: %01.3f ms%n", localWLatency); - System.out.println("\t\tPending tasks: " + probe.getColumnFamilyMetric(keyspaceName, cfName, "PendingTasks")); + System.out.println("\t\tPending flushes: " + probe.getColumnFamilyMetric(keyspaceName, cfName, "PendingFlushes")); System.out.println("\t\tBloom filter false positives: " + probe.getColumnFamilyMetric(keyspaceName, cfName, "BloomFilterFalsePositives")); System.out.println("\t\tBloom filter false ratio: " + format("%01.5f", probe.getColumnFamilyMetric(keyspaceName, cfName, "RecentBloomFilterFalseRatio"))); System.out.println("\t\tBloom filter space used, bytes: " + probe.getColumnFamilyMetric(keyspaceName, cfName, "BloomFilterDiskSpaceUsed"));
