cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/8] cassandra git commit: system_distributed should not use gcgs of 0
Date Sun, 05 Feb 2017 17:09:07 GMT
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/1fd4e870
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fd4e870
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fd4e870

Branch: refs/heads/trunk
Commit: 1fd4e870c58931e20a214492aa094e056c6d5714
Parents: edf446c
Author: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Authored: Sat Dec 3 20:50:29 2016 -0800
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sun Feb 5 16:57:15 2017 +0000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fd4e870/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4d77c9a..7d5057a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
 3.11.0
  * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
  * nodetool stopdaemon errors out (CASSANDRA-13030)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 Merged from 3.0:
  * Fix handling of partition with partition-level deletion plus
    live rows in sstabledump (CASSANDRA-13177)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fd4e870/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