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 2014/12/01 19:23:44 UTC
[1/8] cassandra git commit: Fix undeclared throwable exception while
executing 'nodetool netstats localhost'
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 902e43b93 -> 54b4b99e1
refs/heads/cassandra-2.1 37dfe4303 -> 642487143
refs/heads/trunk 7add7ead1 -> f5fa97819
Fix undeclared throwable exception while executing 'nodetool netstats localhost'
Patch by Vishal Mehta and Carl Yeksigian, reviewed by Carl Yeksigian for
CASSANDRA-8122
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54b4b99e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54b4b99e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54b4b99e
Branch: refs/heads/cassandra-2.0
Commit: 54b4b99e1e12328005df51feb71448a320a9b7d6
Parents: 902e43b
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 12:18:54 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 12:18:54 2014 -0600
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 5 ++
.../cassandra/service/StorageServiceMBean.java | 3 ++
.../org/apache/cassandra/tools/NodeCmd.java | 55 +++++++++++---------
.../org/apache/cassandra/tools/NodeProbe.java | 5 ++
4 files changed, 42 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b4b99e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 601e036..0456907 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3387,6 +3387,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return operationMode.toString();
}
+ public boolean isStarting()
+ {
+ return operationMode == Mode.STARTING;
+ }
+
public String getDrainProgress()
{
return String.format("Drained %s/%s ColumnFamilies", remainingCFs, totalCFs);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b4b99e/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 2386fc8..0ea08a2 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -358,6 +358,9 @@ public interface StorageServiceMBean extends NotificationEmitter
/** get the operational mode (leaving, joining, normal, decommissioned, client) **/
public String getOperationMode();
+ /** Returns whether the storage service is starting or not */
+ public boolean isStarting();
+
/** get the progress of a drain operation */
public String getDrainProgress();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b4b99e/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 e4a14b2..b085088 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -762,32 +762,35 @@ public class NodeCmd
}
}
- outs.printf("Read Repair Statistics:%nAttempted: %d%nMismatch (Blocking): %d%nMismatch (Background): %d%n", probe.getReadRepairAttempted(), probe.getReadRepairRepairedBlocking(), probe.getReadRepairRepairedBackground());
-
- MessagingServiceMBean ms = probe.msProxy;
- outs.printf("%-25s", "Pool Name");
- outs.printf("%10s", "Active");
- outs.printf("%10s", "Pending");
- outs.printf("%15s%n", "Completed");
-
- int pending;
- long completed;
-
- pending = 0;
- for (int n : ms.getCommandPendingTasks().values())
- pending += n;
- completed = 0;
- for (long n : ms.getCommandCompletedTasks().values())
- completed += n;
- outs.printf("%-25s%10s%10s%15s%n", "Commands", "n/a", pending, completed);
-
- pending = 0;
- for (int n : ms.getResponsePendingTasks().values())
- pending += n;
- completed = 0;
- for (long n : ms.getResponseCompletedTasks().values())
- completed += n;
- outs.printf("%-25s%10s%10s%15s%n", "Responses", "n/a", pending, completed);
+ if (!probe.isStarting())
+ {
+ outs.printf("Read Repair Statistics:%nAttempted: %d%nMismatch (Blocking): %d%nMismatch (Background): %d%n", probe.getReadRepairAttempted(), probe.getReadRepairRepairedBlocking(), probe.getReadRepairRepairedBackground());
+
+ MessagingServiceMBean ms = probe.msProxy;
+ outs.printf("%-25s", "Pool Name");
+ outs.printf("%10s", "Active");
+ outs.printf("%10s", "Pending");
+ outs.printf("%15s%n", "Completed");
+
+ int pending;
+ long completed;
+
+ pending = 0;
+ for (int n : ms.getCommandPendingTasks().values())
+ pending += n;
+ completed = 0;
+ for (long n : ms.getCommandCompletedTasks().values())
+ completed += n;
+ outs.printf("%-25s%10s%10s%15s%n", "Commands", "n/a", pending, completed);
+
+ pending = 0;
+ for (int n : ms.getResponsePendingTasks().values())
+ pending += n;
+ completed = 0;
+ for (long n : ms.getResponseCompletedTasks().values())
+ completed += n;
+ outs.printf("%-25s%10s%10s%15s%n", "Responses", "n/a", pending, completed);
+ }
}
public void printCompactionStats(PrintStream outs)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b4b99e/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 261d416..3736659 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -602,6 +602,11 @@ public class NodeProbe
return ssProxy.getOperationMode();
}
+ public boolean isStarting()
+ {
+ return ssProxy.isStarting();
+ }
+
public void truncate(String keyspaceName, String cfName)
{
try
[7/8] cassandra git commit: Fix undeclared throwable exception while
executing 'nodetool netstats localhost'
Posted by br...@apache.org.
Fix undeclared throwable exception while executing 'nodetool netstats localhost'
Patch by Vishal Mehta and Carl Yeksigian, reviewed by Carl Yeksigian for CASSANDRA-8122
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/64248714
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64248714
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64248714
Branch: refs/heads/cassandra-2.1
Commit: 6424871439c6e203f0531736dcac71b1c50f41d9
Parents: 74a5f79
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 12:21:56 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 12:21:56 2014 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/tools/NodeTool.java | 55 +++++++++++---------
1 file changed, 29 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/64248714/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 fe4535b..5038d29 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -638,32 +638,35 @@ public class NodeTool
}
}
- System.out.printf("Read Repair Statistics:%nAttempted: %d%nMismatch (Blocking): %d%nMismatch (Background): %d%n", probe.getReadRepairAttempted(), probe.getReadRepairRepairedBlocking(), probe.getReadRepairRepairedBackground());
-
- MessagingServiceMBean ms = probe.msProxy;
- System.out.printf("%-25s", "Pool Name");
- System.out.printf("%10s", "Active");
- System.out.printf("%10s", "Pending");
- System.out.printf("%15s%n", "Completed");
-
- int pending;
- long completed;
-
- pending = 0;
- for (int n : ms.getCommandPendingTasks().values())
- pending += n;
- completed = 0;
- for (long n : ms.getCommandCompletedTasks().values())
- completed += n;
- System.out.printf("%-25s%10s%10s%15s%n", "Commands", "n/a", pending, completed);
-
- pending = 0;
- for (int n : ms.getResponsePendingTasks().values())
- pending += n;
- completed = 0;
- for (long n : ms.getResponseCompletedTasks().values())
- completed += n;
- System.out.printf("%-25s%10s%10s%15s%n", "Responses", "n/a", pending, completed);
+ if (!probe.isStarting())
+ {
+ System.out.printf("Read Repair Statistics:%nAttempted: %d%nMismatch (Blocking): %d%nMismatch (Background): %d%n", probe.getReadRepairAttempted(), probe.getReadRepairRepairedBlocking(), probe.getReadRepairRepairedBackground());
+
+ MessagingServiceMBean ms = probe.msProxy;
+ System.out.printf("%-25s", "Pool Name");
+ System.out.printf("%10s", "Active");
+ System.out.printf("%10s", "Pending");
+ System.out.printf("%15s%n", "Completed");
+
+ int pending;
+ long completed;
+
+ pending = 0;
+ for (int n : ms.getCommandPendingTasks().values())
+ pending += n;
+ completed = 0;
+ for (long n : ms.getCommandCompletedTasks().values())
+ completed += n;
+ System.out.printf("%-25s%10s%10s%15s%n", "Commands", "n/a", pending, completed);
+
+ pending = 0;
+ for (int n : ms.getResponsePendingTasks().values())
+ pending += n;
+ completed = 0;
+ for (long n : ms.getResponseCompletedTasks().values())
+ completed += n;
+ System.out.printf("%-25s%10s%10s%15s%n", "Responses", "n/a", pending, completed);
+ }
}
}
[8/8] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.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/f5fa9781
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5fa9781
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5fa9781
Branch: refs/heads/trunk
Commit: f5fa97819f7d3727f1a649ad01d5334e512f7ed7
Parents: 7add7ea 6424871
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 12:23:36 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 12:23:36 2014 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/tools/NodeTool.java | 55 +++++++++++---------
1 file changed, 29 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5fa9781/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
[3/8] cassandra git commit: Fix undeclared throwable exception while
executing 'nodetool netstats localhost'
Posted by br...@apache.org.
Fix undeclared throwable exception while executing 'nodetool netstats localhost'
Patch by Vishal Mehta and Carl Yeksigian, reviewed by Carl Yeksigian for
CASSANDRA-8122
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54b4b99e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54b4b99e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54b4b99e
Branch: refs/heads/trunk
Commit: 54b4b99e1e12328005df51feb71448a320a9b7d6
Parents: 902e43b
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 12:18:54 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 12:18:54 2014 -0600
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 5 ++
.../cassandra/service/StorageServiceMBean.java | 3 ++
.../org/apache/cassandra/tools/NodeCmd.java | 55 +++++++++++---------
.../org/apache/cassandra/tools/NodeProbe.java | 5 ++
4 files changed, 42 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b4b99e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 601e036..0456907 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3387,6 +3387,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return operationMode.toString();
}
+ public boolean isStarting()
+ {
+ return operationMode == Mode.STARTING;
+ }
+
public String getDrainProgress()
{
return String.format("Drained %s/%s ColumnFamilies", remainingCFs, totalCFs);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b4b99e/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 2386fc8..0ea08a2 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -358,6 +358,9 @@ public interface StorageServiceMBean extends NotificationEmitter
/** get the operational mode (leaving, joining, normal, decommissioned, client) **/
public String getOperationMode();
+ /** Returns whether the storage service is starting or not */
+ public boolean isStarting();
+
/** get the progress of a drain operation */
public String getDrainProgress();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b4b99e/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 e4a14b2..b085088 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -762,32 +762,35 @@ public class NodeCmd
}
}
- outs.printf("Read Repair Statistics:%nAttempted: %d%nMismatch (Blocking): %d%nMismatch (Background): %d%n", probe.getReadRepairAttempted(), probe.getReadRepairRepairedBlocking(), probe.getReadRepairRepairedBackground());
-
- MessagingServiceMBean ms = probe.msProxy;
- outs.printf("%-25s", "Pool Name");
- outs.printf("%10s", "Active");
- outs.printf("%10s", "Pending");
- outs.printf("%15s%n", "Completed");
-
- int pending;
- long completed;
-
- pending = 0;
- for (int n : ms.getCommandPendingTasks().values())
- pending += n;
- completed = 0;
- for (long n : ms.getCommandCompletedTasks().values())
- completed += n;
- outs.printf("%-25s%10s%10s%15s%n", "Commands", "n/a", pending, completed);
-
- pending = 0;
- for (int n : ms.getResponsePendingTasks().values())
- pending += n;
- completed = 0;
- for (long n : ms.getResponseCompletedTasks().values())
- completed += n;
- outs.printf("%-25s%10s%10s%15s%n", "Responses", "n/a", pending, completed);
+ if (!probe.isStarting())
+ {
+ outs.printf("Read Repair Statistics:%nAttempted: %d%nMismatch (Blocking): %d%nMismatch (Background): %d%n", probe.getReadRepairAttempted(), probe.getReadRepairRepairedBlocking(), probe.getReadRepairRepairedBackground());
+
+ MessagingServiceMBean ms = probe.msProxy;
+ outs.printf("%-25s", "Pool Name");
+ outs.printf("%10s", "Active");
+ outs.printf("%10s", "Pending");
+ outs.printf("%15s%n", "Completed");
+
+ int pending;
+ long completed;
+
+ pending = 0;
+ for (int n : ms.getCommandPendingTasks().values())
+ pending += n;
+ completed = 0;
+ for (long n : ms.getCommandCompletedTasks().values())
+ completed += n;
+ outs.printf("%-25s%10s%10s%15s%n", "Commands", "n/a", pending, completed);
+
+ pending = 0;
+ for (int n : ms.getResponsePendingTasks().values())
+ pending += n;
+ completed = 0;
+ for (long n : ms.getResponseCompletedTasks().values())
+ completed += n;
+ outs.printf("%-25s%10s%10s%15s%n", "Responses", "n/a", pending, completed);
+ }
}
public void printCompactionStats(PrintStream outs)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b4b99e/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 261d416..3736659 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -602,6 +602,11 @@ public class NodeProbe
return ssProxy.getOperationMode();
}
+ public boolean isStarting()
+ {
+ return ssProxy.isStarting();
+ }
+
public void truncate(String keyspaceName, String cfName)
{
try
[6/8] cassandra git commit: Fix undeclared throwable exception while
executing 'nodetool netstats localhost'
Posted by br...@apache.org.
Fix undeclared throwable exception while executing 'nodetool netstats localhost'
Patch by Vishal Mehta and Carl Yeksigian, reviewed by Carl Yeksigian for CASSANDRA-8122
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/64248714
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64248714
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64248714
Branch: refs/heads/trunk
Commit: 6424871439c6e203f0531736dcac71b1c50f41d9
Parents: 74a5f79
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 12:21:56 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 12:21:56 2014 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/tools/NodeTool.java | 55 +++++++++++---------
1 file changed, 29 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/64248714/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 fe4535b..5038d29 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -638,32 +638,35 @@ public class NodeTool
}
}
- System.out.printf("Read Repair Statistics:%nAttempted: %d%nMismatch (Blocking): %d%nMismatch (Background): %d%n", probe.getReadRepairAttempted(), probe.getReadRepairRepairedBlocking(), probe.getReadRepairRepairedBackground());
-
- MessagingServiceMBean ms = probe.msProxy;
- System.out.printf("%-25s", "Pool Name");
- System.out.printf("%10s", "Active");
- System.out.printf("%10s", "Pending");
- System.out.printf("%15s%n", "Completed");
-
- int pending;
- long completed;
-
- pending = 0;
- for (int n : ms.getCommandPendingTasks().values())
- pending += n;
- completed = 0;
- for (long n : ms.getCommandCompletedTasks().values())
- completed += n;
- System.out.printf("%-25s%10s%10s%15s%n", "Commands", "n/a", pending, completed);
-
- pending = 0;
- for (int n : ms.getResponsePendingTasks().values())
- pending += n;
- completed = 0;
- for (long n : ms.getResponseCompletedTasks().values())
- completed += n;
- System.out.printf("%-25s%10s%10s%15s%n", "Responses", "n/a", pending, completed);
+ if (!probe.isStarting())
+ {
+ System.out.printf("Read Repair Statistics:%nAttempted: %d%nMismatch (Blocking): %d%nMismatch (Background): %d%n", probe.getReadRepairAttempted(), probe.getReadRepairRepairedBlocking(), probe.getReadRepairRepairedBackground());
+
+ MessagingServiceMBean ms = probe.msProxy;
+ System.out.printf("%-25s", "Pool Name");
+ System.out.printf("%10s", "Active");
+ System.out.printf("%10s", "Pending");
+ System.out.printf("%15s%n", "Completed");
+
+ int pending;
+ long completed;
+
+ pending = 0;
+ for (int n : ms.getCommandPendingTasks().values())
+ pending += n;
+ completed = 0;
+ for (long n : ms.getCommandCompletedTasks().values())
+ completed += n;
+ System.out.printf("%-25s%10s%10s%15s%n", "Commands", "n/a", pending, completed);
+
+ pending = 0;
+ for (int n : ms.getResponsePendingTasks().values())
+ pending += n;
+ completed = 0;
+ for (long n : ms.getResponseCompletedTasks().values())
+ completed += n;
+ System.out.printf("%-25s%10s%10s%15s%n", "Responses", "n/a", pending, completed);
+ }
}
}
[5/8] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74a5f79a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74a5f79a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74a5f79a
Branch: refs/heads/trunk
Commit: 74a5f79ad134b6e60f144b77b49c9eaa8b3eb32e
Parents: 37dfe43 54b4b99
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 12:21:19 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 12:21:19 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/8] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74a5f79a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74a5f79a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74a5f79a
Branch: refs/heads/cassandra-2.1
Commit: 74a5f79ad134b6e60f144b77b49c9eaa8b3eb32e
Parents: 37dfe43 54b4b99
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 12:21:19 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 12:21:19 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/8] cassandra git commit: Fix undeclared throwable exception while
executing 'nodetool netstats localhost'
Posted by br...@apache.org.
Fix undeclared throwable exception while executing 'nodetool netstats localhost'
Patch by Vishal Mehta and Carl Yeksigian, reviewed by Carl Yeksigian for
CASSANDRA-8122
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54b4b99e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54b4b99e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54b4b99e
Branch: refs/heads/cassandra-2.1
Commit: 54b4b99e1e12328005df51feb71448a320a9b7d6
Parents: 902e43b
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 12:18:54 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 12:18:54 2014 -0600
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 5 ++
.../cassandra/service/StorageServiceMBean.java | 3 ++
.../org/apache/cassandra/tools/NodeCmd.java | 55 +++++++++++---------
.../org/apache/cassandra/tools/NodeProbe.java | 5 ++
4 files changed, 42 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b4b99e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 601e036..0456907 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3387,6 +3387,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return operationMode.toString();
}
+ public boolean isStarting()
+ {
+ return operationMode == Mode.STARTING;
+ }
+
public String getDrainProgress()
{
return String.format("Drained %s/%s ColumnFamilies", remainingCFs, totalCFs);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b4b99e/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 2386fc8..0ea08a2 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -358,6 +358,9 @@ public interface StorageServiceMBean extends NotificationEmitter
/** get the operational mode (leaving, joining, normal, decommissioned, client) **/
public String getOperationMode();
+ /** Returns whether the storage service is starting or not */
+ public boolean isStarting();
+
/** get the progress of a drain operation */
public String getDrainProgress();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b4b99e/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 e4a14b2..b085088 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -762,32 +762,35 @@ public class NodeCmd
}
}
- outs.printf("Read Repair Statistics:%nAttempted: %d%nMismatch (Blocking): %d%nMismatch (Background): %d%n", probe.getReadRepairAttempted(), probe.getReadRepairRepairedBlocking(), probe.getReadRepairRepairedBackground());
-
- MessagingServiceMBean ms = probe.msProxy;
- outs.printf("%-25s", "Pool Name");
- outs.printf("%10s", "Active");
- outs.printf("%10s", "Pending");
- outs.printf("%15s%n", "Completed");
-
- int pending;
- long completed;
-
- pending = 0;
- for (int n : ms.getCommandPendingTasks().values())
- pending += n;
- completed = 0;
- for (long n : ms.getCommandCompletedTasks().values())
- completed += n;
- outs.printf("%-25s%10s%10s%15s%n", "Commands", "n/a", pending, completed);
-
- pending = 0;
- for (int n : ms.getResponsePendingTasks().values())
- pending += n;
- completed = 0;
- for (long n : ms.getResponseCompletedTasks().values())
- completed += n;
- outs.printf("%-25s%10s%10s%15s%n", "Responses", "n/a", pending, completed);
+ if (!probe.isStarting())
+ {
+ outs.printf("Read Repair Statistics:%nAttempted: %d%nMismatch (Blocking): %d%nMismatch (Background): %d%n", probe.getReadRepairAttempted(), probe.getReadRepairRepairedBlocking(), probe.getReadRepairRepairedBackground());
+
+ MessagingServiceMBean ms = probe.msProxy;
+ outs.printf("%-25s", "Pool Name");
+ outs.printf("%10s", "Active");
+ outs.printf("%10s", "Pending");
+ outs.printf("%15s%n", "Completed");
+
+ int pending;
+ long completed;
+
+ pending = 0;
+ for (int n : ms.getCommandPendingTasks().values())
+ pending += n;
+ completed = 0;
+ for (long n : ms.getCommandCompletedTasks().values())
+ completed += n;
+ outs.printf("%-25s%10s%10s%15s%n", "Commands", "n/a", pending, completed);
+
+ pending = 0;
+ for (int n : ms.getResponsePendingTasks().values())
+ pending += n;
+ completed = 0;
+ for (long n : ms.getResponseCompletedTasks().values())
+ completed += n;
+ outs.printf("%-25s%10s%10s%15s%n", "Responses", "n/a", pending, completed);
+ }
}
public void printCompactionStats(PrintStream outs)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b4b99e/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 261d416..3736659 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -602,6 +602,11 @@ public class NodeProbe
return ssProxy.getOperationMode();
}
+ public boolean isStarting()
+ {
+ return ssProxy.isStarting();
+ }
+
public void truncate(String keyspaceName, String cfName)
{
try