Merge branch 'cassandra-3.0' into trunk

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

Branch: refs/heads/trunk
Commit: 703506c3c7f42da49f56421467533471b0c6ddda
Parents: 81fd9c6 82d1600
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Wed Sep 21 18:14:58 2016 -0700
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Wed Sep 21 18:15:48 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                        |  1 +
 src/java/org/apache/cassandra/gms/Gossiper.java    |  4 ++--
 .../apache/cassandra/service/StorageService.java   | 17 ++++++++++++++---
 3 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/703506c3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d6fcab8,0524e49..df3c775
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -82,56 -29,12 +82,57 @@@ Merged from 3.0
   * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
   * Calculate last compacted key on startup (CASSANDRA-6216)
   * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 +Merged from 2.2:
++ * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
 + * Fix authentication problem when invoking clqsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
 +
 +
 +3.8, 3.9
 + * Fix value skipping with counter columns (CASSANDRA-11726)
 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 + * Add Change-Data-Capture (CASSANDRA-8844)
 +Merged from 3.0:
 + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195)
   * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
   * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 - * Backport CASSANDRA-12002 (CASSANDRA-12177)
   * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 - * Fix potential bad messaging service message for paged range reads
 -   within mixed-version 3.x clusters (CASSANDRA-12249)
   * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
   * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
   * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/703506c3/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/703506c3/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 24b10ea,15a0146..4f11800
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -201,9 -192,11 +201,10 @@@ public class StorageService extends Not
      private Collection<Token> bootstrapTokens = null;
  
      // true when keeping strict consistency while bootstrapping
 -    private boolean useStrictConsistency = 
Boolean.parseBoolean(System.getProperty("cassandra.consistent.rangemovement", 
"true"));
 -    private static final boolean allowSimultaneousMoves = 
Boolean.valueOf(System.getProperty("cassandra.consistent.simultaneousmoves.allow","false"));
 +    private static final boolean useStrictConsistency = 
Boolean.parseBoolean(System.getProperty("cassandra.consistent.rangemovement", 
"true"));
 +    private static final boolean allowSimultaneousMoves = 
Boolean.parseBoolean(System.getProperty("cassandra.consistent.simultaneousmoves.allow","false"));
+     private static final boolean joinRing = 
Boolean.parseBoolean(System.getProperty("cassandra.join_ring", "true"));
      private boolean replacing;
 -    private UUID replacingId;
  
      private final StreamStateStore streamStateStore = new StreamStateStore();
  
@@@ -310,13 -303,23 +311,23 @@@
      // should only be called via JMX
      public void startGossiping()
      {
 -        if (!initialized)
 +        if (!gossipActive)
          {
              logger.warn("Starting gossip by operator request");
-             setGossipTokens(getLocalTokens());
+             Collection<Token> tokens = SystemKeyspace.getSavedTokens();
+ 
+             boolean validTokens = tokens != null && !tokens.isEmpty();
+ 
+             // shouldn't be called before these are set if we intend to join 
the ring/are in the process of doing so
+             if (joined || joinRing)
+                 assert validTokens : "Cannot start gossiping for a node 
intended to join without valid tokens";
+ 
+             if (validTokens)
+                 setGossipTokens(tokens);
+ 
              Gossiper.instance.forceNewerGeneration();
              Gossiper.instance.start((int) (System.currentTimeMillis() / 
1000));
 -            initialized = true;
 +            gossipActive = true;
          }
      }
  
@@@ -449,34 -447,32 +460,34 @@@
          daemon.deactivate();
      }
  
 -    public synchronized Collection<Token> prepareReplacementInfo() throws 
ConfigurationException
 +    private synchronized UUID prepareForReplacement() throws 
ConfigurationException
      {
 -        logger.info("Gathering node replacement information for {}", 
DatabaseDescriptor.getReplaceAddress());
 -        if (!MessagingService.instance().isListening())
 -            MessagingService.instance().listen();
 +        if (SystemKeyspace.bootstrapComplete())
 +            throw new RuntimeException("Cannot replace address with a node 
that is already bootstrapped");
 +
-         if (!(Boolean.parseBoolean(System.getProperty("cassandra.join_ring", 
"true"))))
++        if (!joinRing)
 +            throw new ConfigurationException("Cannot set both join_ring=false 
and attempt to replace a node");
  
 -        // make magic happen
 +        if (!DatabaseDescriptor.isAutoBootstrap() && 
!Boolean.getBoolean("cassandra.allow_unsafe_replace"))
 +            throw new RuntimeException("Replacing a node without 
bootstrapping risks invalidating consistency " +
 +                                       "guarantees as the expected data may 
not be present until repair is run. " +
 +                                       "To perform this operation, please 
restart with " +
 +                                       
"-Dcassandra.allow_unsafe_replace=true");
 +
 +        InetAddress replaceAddress = DatabaseDescriptor.getReplaceAddress();
 +        logger.info("Gathering node replacement information for {}", 
replaceAddress);
          Gossiper.instance.doShadowRound();
 +        // as we've completed the shadow round of gossip, we should be able 
to find the node we're replacing
 +        if (Gossiper.instance.getEndpointStateForEndpoint(replaceAddress) == 
null)
 +            throw new RuntimeException(String.format("Cannot replace_address 
%s because it doesn't exist in gossip", replaceAddress));
  
 -        // now that we've gossiped at least once, we should be able to find 
the node we're replacing
 -        if 
(Gossiper.instance.getEndpointStateForEndpoint(DatabaseDescriptor.getReplaceAddress())==
 null)
 -            throw new RuntimeException("Cannot replace_address " + 
DatabaseDescriptor.getReplaceAddress() + " because it doesn't exist in gossip");
 -        replacingId = 
Gossiper.instance.getHostId(DatabaseDescriptor.getReplaceAddress());
          try
          {
 -            VersionedValue tokensVersionedValue = 
Gossiper.instance.getEndpointStateForEndpoint(DatabaseDescriptor.getReplaceAddress()).getApplicationState(ApplicationState.TOKENS);
 +            VersionedValue tokensVersionedValue = 
Gossiper.instance.getEndpointStateForEndpoint(replaceAddress).getApplicationState(ApplicationState.TOKENS);
              if (tokensVersionedValue == null)
 -                throw new RuntimeException("Could not find tokens for " + 
DatabaseDescriptor.getReplaceAddress() + " to replace");
 -            Collection<Token> tokens = 
TokenSerializer.deserialize(tokenMetadata.partitioner, new DataInputStream(new 
ByteArrayInputStream(tokensVersionedValue.toBytes())));
 +                throw new RuntimeException(String.format("Could not find 
tokens for %s to replace", replaceAddress));
  
 -            if (isReplacingSameAddress())
 -            {
 -                SystemKeyspace.setLocalHostId(replacingId); // use the 
replacee's host Id as our own so we receive hints, etc
 -            }
 -            Gossiper.instance.resetEndpointStateMap(); // clean up since we 
have what we need
 -            return tokens;
 +            bootstrapTokens = 
TokenSerializer.deserialize(tokenMetadata.partitioner, new DataInputStream(new 
ByteArrayInputStream(tokensVersionedValue.toBytes())));
          }
          catch (IOException e)
          {

Reply via email to