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 20:17:40 UTC
[1/3] cassandra git commit: Damnit, Carl
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 642487143 -> dd1dd8eb7
refs/heads/trunk f5fa97819 -> 986b7a603
Damnit, Carl
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd1dd8eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd1dd8eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd1dd8eb
Branch: refs/heads/cassandra-2.1
Commit: dd1dd8eb76767d4d81feb3d5c35b78a12bb61162
Parents: 6424871
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 13:17:15 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 13:17:15 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 5 +++++
src/java/org/apache/cassandra/service/StorageServiceMBean.java | 3 +++
src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +++++
3 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd1dd8eb/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 19b4615..332fbe5 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3567,6 +3567,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/dd1dd8eb/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 e7d6f14..a661b97 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -365,6 +365,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/dd1dd8eb/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 38d0f74..9c9e93d 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -650,6 +650,11 @@ public class NodeProbe implements AutoCloseable
return ssProxy.getOperationMode();
}
+ public boolean isStarting()
+ {
+ return ssProxy.isStarting();
+ }
+
public void truncate(String keyspaceName, String cfName)
{
try
[3/3] 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/986b7a60
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/986b7a60
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/986b7a60
Branch: refs/heads/trunk
Commit: 986b7a6032938163a429a909065a060cd7cefd8c
Parents: f5fa978 dd1dd8e
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 13:17:30 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 13:17:30 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 5 +++++
src/java/org/apache/cassandra/service/StorageServiceMBean.java | 3 +++
src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +++++
3 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/986b7a60/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/986b7a60/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/986b7a60/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
[2/3] cassandra git commit: Damnit, Carl
Posted by br...@apache.org.
Damnit, Carl
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd1dd8eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd1dd8eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd1dd8eb
Branch: refs/heads/trunk
Commit: dd1dd8eb76767d4d81feb3d5c35b78a12bb61162
Parents: 6424871
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 13:17:15 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 13:17:15 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 5 +++++
src/java/org/apache/cassandra/service/StorageServiceMBean.java | 3 +++
src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +++++
3 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd1dd8eb/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 19b4615..332fbe5 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3567,6 +3567,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/dd1dd8eb/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 e7d6f14..a661b97 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -365,6 +365,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/dd1dd8eb/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 38d0f74..9c9e93d 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -650,6 +650,11 @@ public class NodeProbe implements AutoCloseable
return ssProxy.getOperationMode();
}
+ public boolean isStarting()
+ {
+ return ssProxy.isStarting();
+ }
+
public void truncate(String keyspaceName, String cfName)
{
try