You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/04/05 19:02:59 UTC
[1/3] git commit: add nodetool statusbinary command
Updated Branches:
refs/heads/cassandra-1.2 7039168e0 -> 530f5ba1e
refs/heads/trunk 3d0eb6231 -> aaa3648a4
add nodetool statusbinary command
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/530f5ba1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/530f5ba1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/530f5ba1
Branch: refs/heads/cassandra-1.2
Commit: 530f5ba1e490457239e76b9472ee7c3bf8fd2138
Parents: 7039168
Author: Brandon Williams <br...@apache.org>
Authored: Fri Apr 5 12:02:33 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Apr 5 12:02:33 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 7 +++++++
src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +++++
.../org/apache/cassandra/tools/NodeToolHelp.yaml | 3 +++
3 files changed, 15 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/530f5ba1/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 4f3e1e1..ed82e32 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -145,6 +145,7 @@ public class NodeCmd
SETTRACEPROBABILITY,
SNAPSHOT,
STATUS,
+ STATUSBINARY,
STATUSTHRIFT,
STOP,
TPSTATS,
@@ -912,6 +913,11 @@ public class NodeCmd
}
}
+ private void printIsNativeTransportRunning(PrintStream outs)
+ {
+ outs.println(probe.isNativeTransportRunning() ? "running" : "not running");
+ }
+
private void printIsThriftServerRunning(PrintStream outs)
{
outs.println(probe.isThriftServerRunning() ? "running" : "not running");
@@ -1052,6 +1058,7 @@ public class NodeCmd
case COMPACTIONSTATS : nodeCmd.printCompactionStats(System.out); break;
case DISABLEBINARY : probe.stopNativeTransport(); break;
case ENABLEBINARY : probe.startNativeTransport(); break;
+ case STATUSBINARY : nodeCmd.printIsNativeTransportRunning(System.out); break;
case DISABLEGOSSIP : probe.stopGossiping(); break;
case ENABLEGOSSIP : probe.startGossiping(); break;
case DISABLEHANDOFF : probe.disableHintedHandoff(); break;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/530f5ba1/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 43d99d2..e6eca7b 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -710,6 +710,11 @@ public class NodeProbe
ssProxy.startNativeTransport();
}
+ public boolean isNativeTransportRunning()
+ {
+ return ssProxy.isNativeTransportRunning();
+ }
+
public void stopGossiping()
{
ssProxy.stopGossiping();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/530f5ba1/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
index 6551b07..f3cd88e 100644
--- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
+++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
@@ -55,6 +55,9 @@ commands:
- name: enablebinary
help: |
Reenable native transport (binary protocol)
+ - name: statusbinary
+ help: |
+ Status of native transport (binary protocol)
- name: disablehandoff
help: |
Disable the future hints storing on the current node
[2/3] git commit: add nodetool statusbinary command
Posted by br...@apache.org.
add nodetool statusbinary command
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/530f5ba1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/530f5ba1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/530f5ba1
Branch: refs/heads/trunk
Commit: 530f5ba1e490457239e76b9472ee7c3bf8fd2138
Parents: 7039168
Author: Brandon Williams <br...@apache.org>
Authored: Fri Apr 5 12:02:33 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Apr 5 12:02:33 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 7 +++++++
src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +++++
.../org/apache/cassandra/tools/NodeToolHelp.yaml | 3 +++
3 files changed, 15 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/530f5ba1/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 4f3e1e1..ed82e32 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -145,6 +145,7 @@ public class NodeCmd
SETTRACEPROBABILITY,
SNAPSHOT,
STATUS,
+ STATUSBINARY,
STATUSTHRIFT,
STOP,
TPSTATS,
@@ -912,6 +913,11 @@ public class NodeCmd
}
}
+ private void printIsNativeTransportRunning(PrintStream outs)
+ {
+ outs.println(probe.isNativeTransportRunning() ? "running" : "not running");
+ }
+
private void printIsThriftServerRunning(PrintStream outs)
{
outs.println(probe.isThriftServerRunning() ? "running" : "not running");
@@ -1052,6 +1058,7 @@ public class NodeCmd
case COMPACTIONSTATS : nodeCmd.printCompactionStats(System.out); break;
case DISABLEBINARY : probe.stopNativeTransport(); break;
case ENABLEBINARY : probe.startNativeTransport(); break;
+ case STATUSBINARY : nodeCmd.printIsNativeTransportRunning(System.out); break;
case DISABLEGOSSIP : probe.stopGossiping(); break;
case ENABLEGOSSIP : probe.startGossiping(); break;
case DISABLEHANDOFF : probe.disableHintedHandoff(); break;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/530f5ba1/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 43d99d2..e6eca7b 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -710,6 +710,11 @@ public class NodeProbe
ssProxy.startNativeTransport();
}
+ public boolean isNativeTransportRunning()
+ {
+ return ssProxy.isNativeTransportRunning();
+ }
+
public void stopGossiping()
{
ssProxy.stopGossiping();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/530f5ba1/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
index 6551b07..f3cd88e 100644
--- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
+++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
@@ -55,6 +55,9 @@ commands:
- name: enablebinary
help: |
Reenable native transport (binary protocol)
+ - name: statusbinary
+ help: |
+ Status of native transport (binary protocol)
- name: disablehandoff
help: |
Disable the future hints storing on the current node
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aaa3648a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aaa3648a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aaa3648a
Branch: refs/heads/trunk
Commit: aaa3648a4c40229021ce9cc9f0239f695583f3b2
Parents: 3d0eb62 530f5ba
Author: Brandon Williams <br...@apache.org>
Authored: Fri Apr 5 12:02:43 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Apr 5 12:02:43 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 7 +++++++
src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +++++
.../org/apache/cassandra/tools/NodeToolHelp.yaml | 3 +++
3 files changed, 15 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaa3648a/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------