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/01/15 23:04:20 UTC
[1/6] git commit: Refuse snapshots during bootstrap. Patch by
brandonwilliams, reviewed by thobbs for CASSANDRA-6585
Updated Branches:
refs/heads/cassandra-1.2 0d38b25f6 -> 5f635782a
refs/heads/cassandra-2.0 7514e61b4 -> 27488a57c
refs/heads/trunk 8b0906126 -> 6abe16d36
Refuse snapshots during bootstrap.
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-6585
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f635782
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f635782
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f635782
Branch: refs/heads/cassandra-1.2
Commit: 5f635782a8cbe45f1d00ec4f2ed50e1827d3d498
Parents: 0d38b25
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jan 15 15:58:46 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jan 15 15:58:46 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f635782/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 043a1eb..7c8a257 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2172,6 +2172,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
*/
public void takeSnapshot(String tag, String... tableNames) throws IOException
{
+ if (operationMode.equals(Mode.JOINING))
+ throw new IOException("Cannot snapshot until bootstrap completes");
if (tag == null || tag.equals(""))
throw new IOException("You must supply a snapshot name.");
@@ -2207,6 +2209,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
*/
public void takeColumnFamilySnapshot(String tableName, String columnFamilyName, String tag) throws IOException
{
+ if (operationMode.equals(Mode.JOINING))
+ throw new IOException("Cannot snapshot until bootstrap completes");
if (tableName == null)
throw new IOException("You must supply a table name");
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27488a57
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27488a57
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27488a57
Branch: refs/heads/cassandra-2.0
Commit: 27488a57ca9e0c872fb1e34d2c6e89a0608404b5
Parents: 7514e61 5f63578
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jan 15 16:02:14 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jan 15 16:02:14 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/27488a57/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 1ab97b2,7c8a257..8470078
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2148,13 -2165,15 +2148,15 @@@ public class StorageService extends Not
}
/**
- * Takes the snapshot for the given tables. A snapshot name must be specified.
+ * Takes the snapshot for the given keyspaces. A snapshot name must be specified.
*
* @param tag the tag given to the snapshot; may not be null or empty
- * @param tableNames the name of the tables to snapshot; empty means "all."
+ * @param keyspaceNames the names of the keyspaces to snapshot; empty means "all."
*/
- public void takeSnapshot(String tag, String... tableNames) throws IOException
+ public void takeSnapshot(String tag, String... keyspaceNames) throws IOException
{
+ if (operationMode.equals(Mode.JOINING))
+ throw new IOException("Cannot snapshot until bootstrap completes");
if (tag == null || tag.equals(""))
throw new IOException("You must supply a snapshot name.");
@@@ -2188,10 -2207,12 +2190,12 @@@
* @param columnFamilyName the column family to snapshot
* @param tag the tag given to the snapshot; may not be null or empty
*/
- public void takeColumnFamilySnapshot(String tableName, String columnFamilyName, String tag) throws IOException
+ public void takeColumnFamilySnapshot(String keyspaceName, String columnFamilyName, String tag) throws IOException
{
+ if (keyspaceName == null)
+ throw new IOException("You must supply a keyspace name");
+ if (operationMode.equals(Mode.JOINING))
+ throw new IOException("Cannot snapshot until bootstrap completes");
- if (tableName == null)
- throw new IOException("You must supply a table name");
if (columnFamilyName == null)
throw new IOException("You must supply a column family name");
[3/6] git commit: Refuse snapshots during bootstrap. Patch by
brandonwilliams, reviewed by thobbs for CASSANDRA-6585
Posted by br...@apache.org.
Refuse snapshots during bootstrap.
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-6585
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f635782
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f635782
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f635782
Branch: refs/heads/trunk
Commit: 5f635782a8cbe45f1d00ec4f2ed50e1827d3d498
Parents: 0d38b25
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jan 15 15:58:46 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jan 15 15:58:46 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f635782/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 043a1eb..7c8a257 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2172,6 +2172,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
*/
public void takeSnapshot(String tag, String... tableNames) throws IOException
{
+ if (operationMode.equals(Mode.JOINING))
+ throw new IOException("Cannot snapshot until bootstrap completes");
if (tag == null || tag.equals(""))
throw new IOException("You must supply a snapshot name.");
@@ -2207,6 +2209,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
*/
public void takeColumnFamilySnapshot(String tableName, String columnFamilyName, String tag) throws IOException
{
+ if (operationMode.equals(Mode.JOINING))
+ throw new IOException("Cannot snapshot until bootstrap completes");
if (tableName == null)
throw new IOException("You must supply a table name");
[2/6] git commit: Refuse snapshots during bootstrap. Patch by
brandonwilliams, reviewed by thobbs for CASSANDRA-6585
Posted by br...@apache.org.
Refuse snapshots during bootstrap.
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-6585
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f635782
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f635782
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f635782
Branch: refs/heads/cassandra-2.0
Commit: 5f635782a8cbe45f1d00ec4f2ed50e1827d3d498
Parents: 0d38b25
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jan 15 15:58:46 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jan 15 15:58:46 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f635782/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 043a1eb..7c8a257 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2172,6 +2172,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
*/
public void takeSnapshot(String tag, String... tableNames) throws IOException
{
+ if (operationMode.equals(Mode.JOINING))
+ throw new IOException("Cannot snapshot until bootstrap completes");
if (tag == null || tag.equals(""))
throw new IOException("You must supply a snapshot name.");
@@ -2207,6 +2209,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
*/
public void takeColumnFamilySnapshot(String tableName, String columnFamilyName, String tag) throws IOException
{
+ if (operationMode.equals(Mode.JOINING))
+ throw new IOException("Cannot snapshot until bootstrap completes");
if (tableName == null)
throw new IOException("You must supply a table name");
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27488a57
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27488a57
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27488a57
Branch: refs/heads/trunk
Commit: 27488a57ca9e0c872fb1e34d2c6e89a0608404b5
Parents: 7514e61 5f63578
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jan 15 16:02:14 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jan 15 16:02:14 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/27488a57/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 1ab97b2,7c8a257..8470078
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2148,13 -2165,15 +2148,15 @@@ public class StorageService extends Not
}
/**
- * Takes the snapshot for the given tables. A snapshot name must be specified.
+ * Takes the snapshot for the given keyspaces. A snapshot name must be specified.
*
* @param tag the tag given to the snapshot; may not be null or empty
- * @param tableNames the name of the tables to snapshot; empty means "all."
+ * @param keyspaceNames the names of the keyspaces to snapshot; empty means "all."
*/
- public void takeSnapshot(String tag, String... tableNames) throws IOException
+ public void takeSnapshot(String tag, String... keyspaceNames) throws IOException
{
+ if (operationMode.equals(Mode.JOINING))
+ throw new IOException("Cannot snapshot until bootstrap completes");
if (tag == null || tag.equals(""))
throw new IOException("You must supply a snapshot name.");
@@@ -2188,10 -2207,12 +2190,12 @@@
* @param columnFamilyName the column family to snapshot
* @param tag the tag given to the snapshot; may not be null or empty
*/
- public void takeColumnFamilySnapshot(String tableName, String columnFamilyName, String tag) throws IOException
+ public void takeColumnFamilySnapshot(String keyspaceName, String columnFamilyName, String tag) throws IOException
{
+ if (keyspaceName == null)
+ throw new IOException("You must supply a keyspace name");
+ if (operationMode.equals(Mode.JOINING))
+ throw new IOException("Cannot snapshot until bootstrap completes");
- if (tableName == null)
- throw new IOException("You must supply a table name");
if (columnFamilyName == null)
throw new IOException("You must supply a column family name");
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@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/6abe16d3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6abe16d3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6abe16d3
Branch: refs/heads/trunk
Commit: 6abe16d36733363709d478a1ab65b9d1ff0cb6a1
Parents: 8b09061 27488a5
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jan 15 16:02:24 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jan 15 16:02:24 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6abe16d3/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------