You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2021/08/23 15:00:08 UTC

[cassandra] branch cassandra-4.0 updated: Avoid logging full stack trace when index summary redistribution is cancelled

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

jmckenzie pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
     new ddcf3e6  Avoid logging full stack trace when index summary redistribution is cancelled
ddcf3e6 is described below

commit ddcf3e6aba206abca965c94e549480264c8b98c1
Author: Josh McKenzie <jm...@apache.org>
AuthorDate: Mon Aug 16 10:53:44 2021 -0400

    Avoid logging full stack trace when index summary redistribution is cancelled
    
    patch by jmckenzie; reviewed by blerer for CASSANDRA-16865
---
 .../apache/cassandra/io/sstable/IndexSummaryManager.java    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/java/org/apache/cassandra/io/sstable/IndexSummaryManager.java b/src/java/org/apache/cassandra/io/sstable/IndexSummaryManager.java
index a85d855..4147ce5 100644
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummaryManager.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummaryManager.java
@@ -51,9 +51,6 @@ import org.apache.cassandra.utils.MBeanWrapper;
 import org.apache.cassandra.utils.Pair;
 import org.apache.cassandra.utils.WrappedRunnable;
 
-import static org.apache.cassandra.utils.ExecutorUtils.awaitTermination;
-import static org.apache.cassandra.utils.ExecutorUtils.shutdown;
-
 /**
  * Manages the fixed-size memory pool for index summaries, periodically resizing them
  * in order to give more memory to hot sstables and less memory to cold sstables.
@@ -241,9 +238,15 @@ public class IndexSummaryManager implements IndexSummaryManagerMBean
         }
         catch (Exception e)
         {
-            if (!(e instanceof CompactionInterruptedException))
+            if (e instanceof CompactionInterruptedException)
+            {
+                logger.info("Index summary interrupted: {}", e.getMessage());
+            }
+            else
+            {
                 logger.error("Got exception during index summary redistribution", e);
-            throw e;
+                throw e;
+            }
         }
         finally
         {

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