cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject [1/3] cassandra git commit: system_distributed should not use gcgs of 0
Date Sun, 04 Dec 2016 21:58:07 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.X 49ac80405 -> 36a3ba0d0
  refs/heads/trunk d10d5caa3 -> ce631bdd1


system_distributed should not use gcgs of 0

Patch by Jeff Jirsa; Reviewed by  Aleksey Yeschenko for CASSANDRA-12954


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36a3ba0d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36a3ba0d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36a3ba0d

Branch: refs/heads/cassandra-3.X
Commit: 36a3ba0d0bd58e7fc48896557cb33caa4ae5f73f
Parents: 49ac804
Author: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Authored: Sat Dec 3 20:50:29 2016 -0800
Committer: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Committed: Sun Dec 4 13:54:59 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                      | 2 +-
 .../org/apache/cassandra/repair/SystemDistributedKeyspace.java   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/36a3ba0d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5cc0ebc..b75a1e4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,7 +2,7 @@
  * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
  * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
  * Add support for arithmetic operators (CASSANDRA-11935)
-
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 
 3.10
  * Use correct bounds for all-data range when filtering (CASSANDRA-12666)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/36a3ba0d/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java b/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java
index 552f318..638cf38 100644
--- a/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java
+++ b/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java
@@ -24,6 +24,7 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.concurrent.TimeUnit;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -116,7 +117,8 @@ public final class SystemDistributedKeyspace
     private static CFMetaData compile(String name, String description, String schema)
     {
         return CFMetaData.compile(String.format(schema, name), SchemaConstants.DISTRIBUTED_KEYSPACE_NAME)
-                         .comment(description);
+                         .comment(description)
+                         .gcGraceSeconds((int) TimeUnit.DAYS.toSeconds(10));
     }
 
     public static KeyspaceMetadata metadata()


Mime
View raw message