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 2014/02/06 17:13:10 UTC
[1/3] git commit: Improve nodetool cfhistograms formatting patch by
Tyler Hobbs; reviewed by Benedict Elliott Smith for CASSANDRA-6360
Updated Branches:
refs/heads/cassandra-2.0 cd26f48ce -> 43e6e184b
refs/heads/trunk 5653516e3 -> 3a82adb89
Improve nodetool cfhistograms formatting
patch by Tyler Hobbs; reviewed by Benedict Elliott Smith for CASSANDRA-6360
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43e6e184
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43e6e184
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43e6e184
Branch: refs/heads/cassandra-2.0
Commit: 43e6e184b0bc4881a3324fa1caad987207a95e9e
Parents: cd26f48
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Feb 6 10:11:51 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Feb 6 10:11:51 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/tools/NodeCmd.java | 128 +++++++++++++++----
2 files changed, 104 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/43e6e184/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 728c57a..dfbe5c6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.6
+ * Improve nodetool cfhistograms formatting (CASSANDRA-6360)
* Expose bulk loading progress over JMX (CASSANDRA-4757)
* Correctly handle null with IF conditions and TTL (CASSANDRA-6623)
Merged from 1.2:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/43e6e184/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index ab05d16..fd7b69b 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -75,7 +75,7 @@ public class NodeCmd
private static final Pair<String, String> CFSTATS_IGNORE_OPT = Pair.create("i", "ignore");
private static final Pair<String, String> RESOLVE_IP = Pair.create("r", "resolve-ip");
private static final Pair<String, String> SCRUB_SKIP_CORRUPTED_OPT = Pair.create("s", "skip-corrupted");
-
+ private static final Pair<String, String> COMPACT_OPT = Pair.create("c", "compact");
private static final String DEFAULT_HOST = "127.0.0.1";
private static final int DEFAULT_PORT = 7199;
@@ -104,6 +104,7 @@ public class NodeCmd
options.addOption(CFSTATS_IGNORE_OPT, false, "ignore the supplied list of keyspace.columnfamiles in statistics");
options.addOption(RESOLVE_IP, false, "show node domain names instead of IPs");
options.addOption(SCRUB_SKIP_CORRUPTED_OPT, false, "when scrubbing counter tables, skip corrupted rows");
+ options.addOption(COMPACT_OPT, false, "print histograms in a more compact format");
}
public NodeCmd(NodeProbe probe)
@@ -956,7 +957,47 @@ public class NodeCmd
outs.println("RemovalStatus: " + probe.getRemovalStatus());
}
- private void printCfHistograms(String keySpace, String columnFamily, PrintStream output)
+ /**
+ * Returns a pair of the min and max indexes we actually have histogram data for.
+ * If there's no data, -1 will be returned for the min and max.
+ */
+ private Pair<Integer, Integer> getDataBounds(long[] data)
+ {
+ int lowestIndex = -1;
+ int highestIndex = -1;
+ for (int i = 0; i < data.length; i++)
+ {
+ if (data[i] > 0)
+ {
+ highestIndex = i;
+ if (lowestIndex == -1)
+ lowestIndex = i;
+ }
+ }
+ return Pair.create(lowestIndex, highestIndex);
+ }
+
+ private void printHistogram(long[] data, long[] offsets, String unit, PrintStream output)
+ {
+ Pair<Integer, Integer> bounds = getDataBounds(data);
+ if (bounds.left == -1)
+ {
+ output.println("No Data");
+ }
+ else
+ {
+ long maxValue = -1;
+ for (int i = bounds.left; i <= bounds.right; i++)
+ maxValue = Math.max(maxValue, offsets[i]);
+
+ String format = "%" + new Long(maxValue).toString().length() + "d %s: %d";
+ for (int i = bounds.left; i <= bounds.right; i++)
+ output.println(String.format(format, offsets[i], unit, data[i]));
+ }
+ output.println("");
+ }
+
+ private void printCfHistograms(String keySpace, String columnFamily, PrintStream output, boolean compactFormat)
{
ColumnFamilyStoreMBean store = this.probe.getCfsProxy(keySpace, columnFamily);
@@ -970,25 +1011,46 @@ public class NodeCmd
long[] ecch = store.getEstimatedColumnCountHistogram();
output.println(String.format("%s/%s histograms", keySpace, columnFamily));
+ output.println("");
- output.println(String.format("%-10s%10s%18s%18s%18s%18s",
- "Offset", "SSTables", "Write Latency", "Read Latency", "Partition Size", "Cell Count"));
- output.println(String.format("%-10s%10s%18s%18s%18s%18s",
- "", "", "(micros)", "(micros)", "(bytes)", ""));
+ if (compactFormat)
+ {
+ output.println(String.format("%-10s%10s%18s%18s%18s%18s",
+ "Offset", "SSTables", "Write Latency", "Read Latency", "Partition Size", "Cell Count"));
+ output.println(String.format("%-10s%10s%18s%18s%18s%18s",
+ "", "", "(micros)", "(micros)", "(bytes)", ""));
- for (int i = 0; i < offsets.length; i++)
+ for (int i = 0; i < offsets.length; i++)
+ {
+ output.println(String.format("%-10d%10s%18s%18s%18s%18s",
+ offsets[i],
+ (i < sprh.length ? sprh[i] : "0"),
+ (i < rwlh.length ? rwlh[i] : "0"),
+ (i < rrlh.length ? rrlh[i] : "0"),
+ (i < ersh.length ? ersh[i] : "0"),
+ (i < ecch.length ? ecch[i] : "0")));
+ }
+ }
+ else
{
- output.println(String.format("%-10d%10s%18s%18s%18s%18s",
- offsets[i],
- (i < sprh.length ? sprh[i] : "0"),
- (i < rwlh.length ? rwlh[i] : "0"),
- (i < rrlh.length ? rrlh[i] : "0"),
- (i < ersh.length ? ersh[i] : "0"),
- (i < ecch.length ? ecch[i] : "0")));
+ output.println("SSTables per Read");
+ printHistogram(sprh, offsets, "sstables", output);
+
+ output.println("Write Latency (microseconds)");
+ printHistogram(rwlh, offsets, "us", output);
+
+ output.println("Read Latency (microseconds)");
+ printHistogram(rrlh, offsets, "us", output);
+
+ output.println("Partition Size (bytes)");
+ printHistogram(ersh, offsets, "bytes", output);
+
+ output.println("Cell Count per Partition");
+ printHistogram(ecch, offsets, "cells", output);
}
}
- private void printProxyHistograms(PrintStream output)
+ private void printProxyHistograms(PrintStream output, boolean compactFormat)
{
StorageProxyMBean sp = this.probe.getSpProxy();
long[] offsets = new EstimatedHistogram().getBucketOffsets();
@@ -997,15 +1059,31 @@ public class NodeCmd
long[] rrnglh = sp.getRecentRangeLatencyHistogramMicros();
output.println("proxy histograms");
- output.println(String.format("%-10s%18s%18s%18s",
- "Offset", "Read Latency", "Write Latency", "Range Latency"));
- for (int i = 0; i < offsets.length; i++)
+ output.println("");
+
+ if (compactFormat)
{
- output.println(String.format("%-10d%18s%18s%18s",
- offsets[i],
- (i < rrlh.length ? rrlh[i] : "0"),
- (i < rwlh.length ? rwlh[i] : "0"),
- (i < rrnglh.length ? rrnglh[i] : "0")));
+ output.println(String.format("%-10s%18s%18s%18s",
+ "Offset", "Read Latency", "Write Latency", "Range Latency"));
+ for (int i = 0; i < offsets.length; i++)
+ {
+ output.println(String.format("%-10d%18s%18s%18s",
+ offsets[i],
+ (i < rrlh.length ? rrlh[i] : "0"),
+ (i < rwlh.length ? rwlh[i] : "0"),
+ (i < rrnglh.length ? rrnglh[i] : "0")));
+ }
+ }
+ else
+ {
+ output.println("Read Latency (microseconds)");
+ printHistogram(rrlh, offsets, "us", output);
+
+ output.println("Write Latency (microseconds)");
+ printHistogram(rwlh, offsets, "us", output);
+
+ output.println("Range Latency (microseconds)");
+ printHistogram(rrnglh, offsets, "us", output);
}
}
@@ -1280,7 +1358,7 @@ public class NodeCmd
case CFHISTOGRAMS :
if (arguments.length != 2) { badUse("cfhistograms requires ks and cf args"); }
- nodeCmd.printCfHistograms(arguments[0], arguments[1], System.out);
+ nodeCmd.printCfHistograms(arguments[0], arguments[1], System.out, cmd.hasOption(COMPACT_OPT.left));
break;
case SETCACHECAPACITY :
@@ -1309,7 +1387,7 @@ public class NodeCmd
case PROXYHISTOGRAMS :
if (arguments.length != 0) { badUse("proxyhistograms does not take arguments"); }
- nodeCmd.printProxyHistograms(System.out);
+ nodeCmd.printProxyHistograms(System.out, cmd.hasOption(COMPACT_OPT.left));
break;
case GETSSTABLES:
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a82adb8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a82adb8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a82adb8
Branch: refs/heads/trunk
Commit: 3a82adb89a619339bffa676890bc534f0975987e
Parents: 5653516 43e6e18
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Feb 6 10:13:04 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Feb 6 10:13:04 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] git commit: Improve nodetool cfhistograms formatting patch by
Tyler Hobbs; reviewed by Benedict Elliott Smith for CASSANDRA-6360
Posted by jb...@apache.org.
Improve nodetool cfhistograms formatting
patch by Tyler Hobbs; reviewed by Benedict Elliott Smith for CASSANDRA-6360
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43e6e184
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43e6e184
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43e6e184
Branch: refs/heads/trunk
Commit: 43e6e184b0bc4881a3324fa1caad987207a95e9e
Parents: cd26f48
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Feb 6 10:11:51 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Feb 6 10:11:51 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/tools/NodeCmd.java | 128 +++++++++++++++----
2 files changed, 104 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/43e6e184/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 728c57a..dfbe5c6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.6
+ * Improve nodetool cfhistograms formatting (CASSANDRA-6360)
* Expose bulk loading progress over JMX (CASSANDRA-4757)
* Correctly handle null with IF conditions and TTL (CASSANDRA-6623)
Merged from 1.2:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/43e6e184/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index ab05d16..fd7b69b 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -75,7 +75,7 @@ public class NodeCmd
private static final Pair<String, String> CFSTATS_IGNORE_OPT = Pair.create("i", "ignore");
private static final Pair<String, String> RESOLVE_IP = Pair.create("r", "resolve-ip");
private static final Pair<String, String> SCRUB_SKIP_CORRUPTED_OPT = Pair.create("s", "skip-corrupted");
-
+ private static final Pair<String, String> COMPACT_OPT = Pair.create("c", "compact");
private static final String DEFAULT_HOST = "127.0.0.1";
private static final int DEFAULT_PORT = 7199;
@@ -104,6 +104,7 @@ public class NodeCmd
options.addOption(CFSTATS_IGNORE_OPT, false, "ignore the supplied list of keyspace.columnfamiles in statistics");
options.addOption(RESOLVE_IP, false, "show node domain names instead of IPs");
options.addOption(SCRUB_SKIP_CORRUPTED_OPT, false, "when scrubbing counter tables, skip corrupted rows");
+ options.addOption(COMPACT_OPT, false, "print histograms in a more compact format");
}
public NodeCmd(NodeProbe probe)
@@ -956,7 +957,47 @@ public class NodeCmd
outs.println("RemovalStatus: " + probe.getRemovalStatus());
}
- private void printCfHistograms(String keySpace, String columnFamily, PrintStream output)
+ /**
+ * Returns a pair of the min and max indexes we actually have histogram data for.
+ * If there's no data, -1 will be returned for the min and max.
+ */
+ private Pair<Integer, Integer> getDataBounds(long[] data)
+ {
+ int lowestIndex = -1;
+ int highestIndex = -1;
+ for (int i = 0; i < data.length; i++)
+ {
+ if (data[i] > 0)
+ {
+ highestIndex = i;
+ if (lowestIndex == -1)
+ lowestIndex = i;
+ }
+ }
+ return Pair.create(lowestIndex, highestIndex);
+ }
+
+ private void printHistogram(long[] data, long[] offsets, String unit, PrintStream output)
+ {
+ Pair<Integer, Integer> bounds = getDataBounds(data);
+ if (bounds.left == -1)
+ {
+ output.println("No Data");
+ }
+ else
+ {
+ long maxValue = -1;
+ for (int i = bounds.left; i <= bounds.right; i++)
+ maxValue = Math.max(maxValue, offsets[i]);
+
+ String format = "%" + new Long(maxValue).toString().length() + "d %s: %d";
+ for (int i = bounds.left; i <= bounds.right; i++)
+ output.println(String.format(format, offsets[i], unit, data[i]));
+ }
+ output.println("");
+ }
+
+ private void printCfHistograms(String keySpace, String columnFamily, PrintStream output, boolean compactFormat)
{
ColumnFamilyStoreMBean store = this.probe.getCfsProxy(keySpace, columnFamily);
@@ -970,25 +1011,46 @@ public class NodeCmd
long[] ecch = store.getEstimatedColumnCountHistogram();
output.println(String.format("%s/%s histograms", keySpace, columnFamily));
+ output.println("");
- output.println(String.format("%-10s%10s%18s%18s%18s%18s",
- "Offset", "SSTables", "Write Latency", "Read Latency", "Partition Size", "Cell Count"));
- output.println(String.format("%-10s%10s%18s%18s%18s%18s",
- "", "", "(micros)", "(micros)", "(bytes)", ""));
+ if (compactFormat)
+ {
+ output.println(String.format("%-10s%10s%18s%18s%18s%18s",
+ "Offset", "SSTables", "Write Latency", "Read Latency", "Partition Size", "Cell Count"));
+ output.println(String.format("%-10s%10s%18s%18s%18s%18s",
+ "", "", "(micros)", "(micros)", "(bytes)", ""));
- for (int i = 0; i < offsets.length; i++)
+ for (int i = 0; i < offsets.length; i++)
+ {
+ output.println(String.format("%-10d%10s%18s%18s%18s%18s",
+ offsets[i],
+ (i < sprh.length ? sprh[i] : "0"),
+ (i < rwlh.length ? rwlh[i] : "0"),
+ (i < rrlh.length ? rrlh[i] : "0"),
+ (i < ersh.length ? ersh[i] : "0"),
+ (i < ecch.length ? ecch[i] : "0")));
+ }
+ }
+ else
{
- output.println(String.format("%-10d%10s%18s%18s%18s%18s",
- offsets[i],
- (i < sprh.length ? sprh[i] : "0"),
- (i < rwlh.length ? rwlh[i] : "0"),
- (i < rrlh.length ? rrlh[i] : "0"),
- (i < ersh.length ? ersh[i] : "0"),
- (i < ecch.length ? ecch[i] : "0")));
+ output.println("SSTables per Read");
+ printHistogram(sprh, offsets, "sstables", output);
+
+ output.println("Write Latency (microseconds)");
+ printHistogram(rwlh, offsets, "us", output);
+
+ output.println("Read Latency (microseconds)");
+ printHistogram(rrlh, offsets, "us", output);
+
+ output.println("Partition Size (bytes)");
+ printHistogram(ersh, offsets, "bytes", output);
+
+ output.println("Cell Count per Partition");
+ printHistogram(ecch, offsets, "cells", output);
}
}
- private void printProxyHistograms(PrintStream output)
+ private void printProxyHistograms(PrintStream output, boolean compactFormat)
{
StorageProxyMBean sp = this.probe.getSpProxy();
long[] offsets = new EstimatedHistogram().getBucketOffsets();
@@ -997,15 +1059,31 @@ public class NodeCmd
long[] rrnglh = sp.getRecentRangeLatencyHistogramMicros();
output.println("proxy histograms");
- output.println(String.format("%-10s%18s%18s%18s",
- "Offset", "Read Latency", "Write Latency", "Range Latency"));
- for (int i = 0; i < offsets.length; i++)
+ output.println("");
+
+ if (compactFormat)
{
- output.println(String.format("%-10d%18s%18s%18s",
- offsets[i],
- (i < rrlh.length ? rrlh[i] : "0"),
- (i < rwlh.length ? rwlh[i] : "0"),
- (i < rrnglh.length ? rrnglh[i] : "0")));
+ output.println(String.format("%-10s%18s%18s%18s",
+ "Offset", "Read Latency", "Write Latency", "Range Latency"));
+ for (int i = 0; i < offsets.length; i++)
+ {
+ output.println(String.format("%-10d%18s%18s%18s",
+ offsets[i],
+ (i < rrlh.length ? rrlh[i] : "0"),
+ (i < rwlh.length ? rwlh[i] : "0"),
+ (i < rrnglh.length ? rrnglh[i] : "0")));
+ }
+ }
+ else
+ {
+ output.println("Read Latency (microseconds)");
+ printHistogram(rrlh, offsets, "us", output);
+
+ output.println("Write Latency (microseconds)");
+ printHistogram(rwlh, offsets, "us", output);
+
+ output.println("Range Latency (microseconds)");
+ printHistogram(rrnglh, offsets, "us", output);
}
}
@@ -1280,7 +1358,7 @@ public class NodeCmd
case CFHISTOGRAMS :
if (arguments.length != 2) { badUse("cfhistograms requires ks and cf args"); }
- nodeCmd.printCfHistograms(arguments[0], arguments[1], System.out);
+ nodeCmd.printCfHistograms(arguments[0], arguments[1], System.out, cmd.hasOption(COMPACT_OPT.left));
break;
case SETCACHECAPACITY :
@@ -1309,7 +1387,7 @@ public class NodeCmd
case PROXYHISTOGRAMS :
if (arguments.length != 0) { badUse("proxyhistograms does not take arguments"); }
- nodeCmd.printProxyHistograms(System.out);
+ nodeCmd.printProxyHistograms(System.out, cmd.hasOption(COMPACT_OPT.left));
break;
case GETSSTABLES: