cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Fri, 06 Nov 2015 00:10:31 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/801c50e6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/801c50e6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/801c50e6

Branch: refs/heads/cassandra-2.2
Commit: 801c50e69f13bef3dc7b29a303dc11aad7d83d19
Parents: 0ff13d2 2ca7599
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Nov 6 00:10:09 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Nov 6 00:10:09 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                         |  1 +
 .../apache/cassandra/db/SizeEstimatesRecorder.java  |  5 +++--
 .../org/apache/cassandra/db/SystemKeyspace.java     | 16 ----------------
 .../apache/cassandra/service/StorageService.java    |  5 +----
 4 files changed, 5 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/801c50e6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fedede2,a994ca1..538d5e4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -2.1.12
 +2.2.4
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Do not run SizeEstimatesRecorder if a node is not a member of the ring (CASSANDRA-9912)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err
     (CASSANDRA-9937)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/801c50e6/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/801c50e6/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/SystemKeyspace.java
index 62bf59e,c600652..1807101
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@@ -584,26 -458,10 +584,10 @@@ public final class SystemKeyspac
      {
          assert !tokens.isEmpty() : "removeEndpoint should be used instead";
          String req = "INSERT INTO system.%s (key, tokens) VALUES ('%s', ?)";
 -        executeInternal(String.format(req, LOCAL_CF, LOCAL_KEY), tokensAsSet(tokens));
 -        forceBlockingFlush(LOCAL_CF);
 +        executeInternal(String.format(req, LOCAL, LOCAL), tokensAsSet(tokens));
 +        forceBlockingFlush(LOCAL);
      }
  
-     /**
-      * Convenience method to update the list of tokens in the local system keyspace.
-      *
-      * @param addTokens tokens to add
-      * @param rmTokens tokens to remove
-      * @return the collection of persisted tokens
-      */
-     public static synchronized Collection<Token> updateLocalTokens(Collection<Token>
addTokens, Collection<Token> rmTokens)
-     {
-         Collection<Token> tokens = getSavedTokens();
-         tokens.removeAll(rmTokens);
-         tokens.addAll(addTokens);
-         updateTokens(tokens);
-         return tokens;
-     }
- 
      public static void forceBlockingFlush(String cfname)
      {
          if (!Boolean.getBoolean("cassandra.unsafesystem"))

http://git-wip-us.apache.org/repos/asf/cassandra/blob/801c50e6/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message