cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Wed, 15 Jan 2014 22:04:23 GMT
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 <brandonwilliams@apache.org>
Authored: Wed Jan 15 16:02:14 2014 -0600
Committer: Brandon Williams <brandonwilliams@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");


Mime
View raw message