This is an automated email from the ASF dual-hosted git repository. aleksey pushed a commit to branch 15441-3.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 1db9f2fa9155194f538708c066dcf7c6f440dd9f Author: Aleksey Yeshchenko <[email protected]> AuthorDate: Mon Dec 2 16:08:03 2019 +0000 Bump generations and document changes to system_distributed and system_traces in 3.0, 3.11 patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for CASSANDRA-15441 --- src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java | 6 ++++-- src/java/org/apache/cassandra/tracing/TraceKeyspace.java | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java b/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java index 818b8b0..a922b28 100644 --- a/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java +++ b/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java @@ -59,9 +59,11 @@ public final class SystemDistributedKeyspace * If you make any changes to the tables below, make sure to increment the * generation and document your change here. * - * gen 0: original definition in 3.0 + * gen 0: original definition in 2.2 + * gen 1: (pre-)add options column to parent_repair_history in 3.0, 3.11 + * gen 2: (pre-)add coordinator_port and participants_v2 columns to repair_history in 3.0, 3.11, 4.0 */ - public static final long GENERATION = 0; + public static final long GENERATION = 2; public static final String REPAIR_HISTORY = "repair_history"; diff --git a/src/java/org/apache/cassandra/tracing/TraceKeyspace.java b/src/java/org/apache/cassandra/tracing/TraceKeyspace.java index 73d55d9..fb70451 100644 --- a/src/java/org/apache/cassandra/tracing/TraceKeyspace.java +++ b/src/java/org/apache/cassandra/tracing/TraceKeyspace.java @@ -46,12 +46,13 @@ public final class TraceKeyspace * gen 1577836800000000: (3.0) maps to Jan 1 2020; an arbitrary cut-off date by which we assume no nodes older than 2.0.2 * will ever start; see the note below for why this is necessary; actual change in 3.0: * removed default ttl, reduced bloom filter fp chance from 0.1 to 0.01. + * gen 1577836800000001: (pre-)adds coordinator_port column to sessions and source_port column to events in 3.0, 3.11, 4.0 * * * Until CASSANDRA-6016 (Oct 13, 2.0.2) and in all of 1.2, we used to create system_traces keyspace and * tables in the same way that we created the purely local 'system' keyspace - using current time on node bounce * (+1). For new definitions to take, we need to bump the generation further than that. */ - public static final long GENERATION = 1577836800000000L; + public static final long GENERATION = 1577836800000001L; public static final String SESSIONS = "sessions"; public static final String EVENTS = "events"; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
