cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [07/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Mon, 24 Jul 2017 20:26:51 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-2.2
Commit: 739cd2bc2565bc1f388c4b1e618623497e7dd43e
Parents: 462fe26 2290c0d
Author: Joel Knighton <jkni@apache.org>
Authored: Mon Jul 24 14:47:01 2017 -0500
Committer: Joel Knighton <jkni@apache.org>
Committed: Mon Jul 24 14:47:01 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt                                           | 2 ++
 src/java/org/apache/cassandra/gms/Gossiper.java       | 5 +++--
 src/java/org/apache/cassandra/gms/HeartBeatState.java | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/739cd2bc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bda510f,4dbd984..36c34a1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,8 +1,36 @@@
 -2.1.19
 +2.2.11
 + * Fix queries with LIMIT and filtering on clustering columns (CASSANDRA-11223)
 + * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
 + * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)
 + * Fix nested Tuples/UDTs validation (CASSANDRA-13646)
 + * Remove unused max_value_size_in_mb config setting from yaml (CASSANDRA-13625
++Merged from 2.1:
+  * Clone HeartBeatState when building gossip messages. Make its generation/version volatile
(CASSANDRA-13700)
  
  
 -2.1.18
 +2.2.10
 + * Nodes started with join_ring=False should be able to serve requests when authentication
is enabled (CASSANDRA-11381)
 + * cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209)
 + * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
 + * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
 + * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
 + * Fix JVM metric paths (CASSANDRA-13103)
 + * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
 + * Discard in-flight shadow round responses (CASSANDRA-12653)
 + * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
 + * Wrong logger name in AnticompactionTask (CASSANDRA-13343)
 + * Fix queries updating multiple time the same list (CASSANDRA-13130)
 + * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 + * Avoid race on receiver by starting streaming sender thread after sending init message
(CASSANDRA-12886)
 + * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
 + * Coalescing strategy sleeps too much (CASSANDRA-13090)
 + * Make sure compaction stats are updated when compaction is interrupted (Backport from
3.0, CASSANDRA-12100)
 + * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
 + * Fix failing COPY TO STDOUT (CASSANDRA-12497)
 + * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
 + * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
 + * Commitlog replay may fail if last mutation is within 4 bytes of end of segment (CASSANDRA-13282)
 +Merged from 2.1:
   * Fix 2ndary indexes on primary key columns to don't create expiring entries (CASSANDRA-13412)
   * Set javac encoding to utf-8 (CASSANDRA-13466)
   * Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/739cd2bc/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index c2eccba,7c37917..020d372
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -859,9 -864,9 +860,9 @@@ public class Gossiper implements IFailu
              int localHbVersion = epState.getHeartBeatState().getHeartBeatVersion();
              if (localHbVersion > version)
              {
-                 reqdEndpointState = new EndpointState(epState.getHeartBeatState());
+                 reqdEndpointState = new EndpointState(new HeartBeatState(localHbGeneration,
localHbVersion));
                  if (logger.isTraceEnabled())
 -                    logger.trace("local heartbeat version " + localHbVersion + " greater
than " + version + " for " + forEndpoint);
 +                    logger.trace("local heartbeat version {} greater than {} for {}", localHbVersion,
version, forEndpoint);
              }
              /* Accumulate all application states whose versions are greater than "version"
variable */
              Map<ApplicationState, VersionedValue> states = new EnumMap<>(ApplicationState.class);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message