You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2020/08/24 07:30:01 UTC

[cassandra] branch trunk updated (dfd0aeb -> 6de09a6)

This is an automated email from the ASF dual-hosted git repository.

marcuse pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from dfd0aeb  Don't allow repair to overrun compaction
     new acbaeb1  Fix gossip shutdown order
     new 63cdfc9  Merge branch 'cassandra-3.0' into cassandra-3.11
     new 6de09a6  Merge branch 'cassandra-3.11' into trunk

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt                                              |  1 +
 .../org/apache/cassandra/service/StorageService.java     | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)


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


[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 6de09a622d80785a7baa084a400229680f7e8130
Merge: dfd0aeb 63cdfc9
Author: Marcus Eriksson <ma...@apache.org>
AuthorDate: Mon Aug 24 09:27:29 2020 +0200

    Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt                                              |  1 +
 .../org/apache/cassandra/service/StorageService.java     | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --cc CHANGES.txt
index 77a0652,714b104..415f699
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,8 +1,26 @@@
 -3.11.8
 +4.0-beta2
 + * Prevent repair from overrunning compaction (CASSANDRA-15817)
 + * fix cqlsh COPY functions in Python 3.8 on Mac (CASSANDRA-16053)
 + * Strip comment blocks from cqlsh input before processing statements (CASSANDRA-15802)
 + * Fix unicode chars error input (CASSANDRA-15990)
 + * Improved testability for CacheMetrics and ChunkCacheMetrics (CASSANDRA-15788)
 + * Handle errors in StreamSession#prepare (CASSANDRA-15852)
 + * FQL replay should have options to ignore DDL statements (CASSANDRA-16039)
 + * Remove COMPACT STORAGE internals (CASSANDRA-13994)
 + * Make TimestampSerializer accept fractional seconds of varying precision (CASSANDRA-15976)
 + * Improve cassandra-stress logging when using a profile file that doesn't exist (CASSANDRA-14425)
 + * Improve logging for socket connection/disconnection (CASSANDRA-15980)
 + * Throw FSWriteError upon write failures in order to apply DiskFailurePolicy (CASSANDRA-15928)
 + * Forbid altering UDTs used in partition keys (CASSANDRA-15933)
 + * Fix version parsing logic when upgrading from 3.0 (CASSANDRA-15973)
 + * Optimize NoSpamLogger use in hot paths (CASSANDRA-15766)
 + * Verify sstable components on startup (CASSANDRA-15945)
 +Merged from 3.11:
   * Fix short read protection for GROUP BY queries (CASSANDRA-15459)
 + * stop_paranoid disk failure policy is ignored on CorruptSSTableException after node is up (CASSANDRA-15191)
   * Frozen RawTuple is not annotated with frozen in the toString method (CASSANDRA-15857)
  Merged from 3.0:
+  * Fix gossip shutdown order (CASSANDRA-15816)
   * Remove broken 'defrag-on-read' optimization (CASSANDRA-15432)
   * Check for endpoint collision with hibernating nodes (CASSANDRA-14599)
   * Operational improvements and hardening for replica filtering protection (CASSANDRA-15907)
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 0d10418,ab30bfc..6c8d729
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -397,11 -467,11 +403,6 @@@ public class StorageService extends Not
  
      public void stopTransports()
      {
-         if (isGossipActive())
 -        if (isRPCServerRunning())
--        {
-             logger.error("Stopping gossiper");
-             stopGossiping();
 -            logger.error("Stopping RPC server");
 -            stopRPCServer();
--        }
          if (isNativeTransportRunning())
          {
              logger.error("Stopping native transport");


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