You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/03/31 00:02:33 UTC
[1/6] cassandra git commit: Allow reusing snapshot tags across
different column families.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 102f59c64 -> 0ff9c3cb2
refs/heads/cassandra-2.1 6ee4b0989 -> 5abab57b9
refs/heads/trunk ff5ed7a03 -> a7e6e0f55
Allow reusing snapshot tags across different column families.
patch by Yifu Wang; reviewed by yukim for CASSANDRA-8056
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ff9c3cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ff9c3cb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ff9c3cb
Branch: refs/heads/cassandra-2.0
Commit: 0ff9c3cb222be634e46c378bb357ba0658e0e55b
Parents: 102f59c
Author: Yifu Wang <yi...@gmail.com>
Authored: Sat Nov 29 00:45:27 2014 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Mar 30 16:59:31 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff9c3cb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9494f61..539c4c8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,6 +24,7 @@
* Fix CQLSSTableWriter throwing exception and spawning threads
(CASSANDRA-8808)
* Fix MT mismatch between empty and GC-able data (CASSANDRA-8979)
+ * Fix incorrect validation when snapshotting single table (CASSANDRA-8056)
2.0.13:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff9c3cb/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 d997459..cfd8fe1 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2257,10 +2257,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
throw new IOException("You must supply a snapshot name.");
Keyspace keyspace = getValidKeyspace(keyspaceName);
- if (keyspace.snapshotExists(tag))
+ ColumnFamilyStore columnFamilyStore = keyspace.getColumnFamilyStore(columnFamilyName);
+ if (columnFamilyStore.snapshotExists(tag))
throw new IOException("Snapshot " + tag + " already exists.");
- keyspace.snapshot(tag, columnFamilyName);
+ columnFamilyStore.snapshot(tag);
}
private Keyspace getValidKeyspace(String keyspaceName) throws IOException
[4/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by yu...@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/5abab57b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5abab57b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5abab57b
Branch: refs/heads/trunk
Commit: 5abab57b93817dfac939eb13eac812091d3655c6
Parents: 6ee4b09 0ff9c3c
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Mar 30 17:02:11 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Mar 30 17:02:11 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5abab57b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bd5e277,539c4c8..00b632d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -87,6 -24,10 +87,7 @@@ Merged from 2.0
* Fix CQLSSTableWriter throwing exception and spawning threads
(CASSANDRA-8808)
* Fix MT mismatch between empty and GC-able data (CASSANDRA-8979)
+ * Fix incorrect validation when snapshotting single table (CASSANDRA-8056)
-
-
-2.0.13:
* Add offline tool to relevel sstables (CASSANDRA-8301)
* Preserve stream ID for more protocol errors (CASSANDRA-8848)
* Fix combining token() function with multi-column relations on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5abab57b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by yu...@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/5abab57b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5abab57b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5abab57b
Branch: refs/heads/cassandra-2.1
Commit: 5abab57b93817dfac939eb13eac812091d3655c6
Parents: 6ee4b09 0ff9c3c
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Mar 30 17:02:11 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Mar 30 17:02:11 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5abab57b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bd5e277,539c4c8..00b632d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -87,6 -24,10 +87,7 @@@ Merged from 2.0
* Fix CQLSSTableWriter throwing exception and spawning threads
(CASSANDRA-8808)
* Fix MT mismatch between empty and GC-able data (CASSANDRA-8979)
+ * Fix incorrect validation when snapshotting single table (CASSANDRA-8056)
-
-
-2.0.13:
* Add offline tool to relevel sstables (CASSANDRA-8301)
* Preserve stream ID for more protocol errors (CASSANDRA-8848)
* Fix combining token() function with multi-column relations on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5abab57b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@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/a7e6e0f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7e6e0f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7e6e0f5
Branch: refs/heads/trunk
Commit: a7e6e0f55c1cf6f2a5668cdf00e08b8e963e9269
Parents: ff5ed7a 5abab57
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Mar 30 17:02:16 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Mar 30 17:02:16 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7e6e0f5/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7e6e0f5/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[2/6] cassandra git commit: Allow reusing snapshot tags across
different column families.
Posted by yu...@apache.org.
Allow reusing snapshot tags across different column families.
patch by Yifu Wang; reviewed by yukim for CASSANDRA-8056
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ff9c3cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ff9c3cb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ff9c3cb
Branch: refs/heads/cassandra-2.1
Commit: 0ff9c3cb222be634e46c378bb357ba0658e0e55b
Parents: 102f59c
Author: Yifu Wang <yi...@gmail.com>
Authored: Sat Nov 29 00:45:27 2014 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Mar 30 16:59:31 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff9c3cb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9494f61..539c4c8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,6 +24,7 @@
* Fix CQLSSTableWriter throwing exception and spawning threads
(CASSANDRA-8808)
* Fix MT mismatch between empty and GC-able data (CASSANDRA-8979)
+ * Fix incorrect validation when snapshotting single table (CASSANDRA-8056)
2.0.13:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff9c3cb/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 d997459..cfd8fe1 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2257,10 +2257,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
throw new IOException("You must supply a snapshot name.");
Keyspace keyspace = getValidKeyspace(keyspaceName);
- if (keyspace.snapshotExists(tag))
+ ColumnFamilyStore columnFamilyStore = keyspace.getColumnFamilyStore(columnFamilyName);
+ if (columnFamilyStore.snapshotExists(tag))
throw new IOException("Snapshot " + tag + " already exists.");
- keyspace.snapshot(tag, columnFamilyName);
+ columnFamilyStore.snapshot(tag);
}
private Keyspace getValidKeyspace(String keyspaceName) throws IOException
[3/6] cassandra git commit: Allow reusing snapshot tags across
different column families.
Posted by yu...@apache.org.
Allow reusing snapshot tags across different column families.
patch by Yifu Wang; reviewed by yukim for CASSANDRA-8056
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ff9c3cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ff9c3cb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ff9c3cb
Branch: refs/heads/trunk
Commit: 0ff9c3cb222be634e46c378bb357ba0658e0e55b
Parents: 102f59c
Author: Yifu Wang <yi...@gmail.com>
Authored: Sat Nov 29 00:45:27 2014 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Mar 30 16:59:31 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff9c3cb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9494f61..539c4c8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,6 +24,7 @@
* Fix CQLSSTableWriter throwing exception and spawning threads
(CASSANDRA-8808)
* Fix MT mismatch between empty and GC-able data (CASSANDRA-8979)
+ * Fix incorrect validation when snapshotting single table (CASSANDRA-8056)
2.0.13:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ff9c3cb/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 d997459..cfd8fe1 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2257,10 +2257,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
throw new IOException("You must supply a snapshot name.");
Keyspace keyspace = getValidKeyspace(keyspaceName);
- if (keyspace.snapshotExists(tag))
+ ColumnFamilyStore columnFamilyStore = keyspace.getColumnFamilyStore(columnFamilyName);
+ if (columnFamilyStore.snapshotExists(tag))
throw new IOException("Snapshot " + tag + " already exists.");
- keyspace.snapshot(tag, columnFamilyName);
+ columnFamilyStore.snapshot(tag);
}
private Keyspace getValidKeyspace(String keyspaceName) throws IOException