You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bd...@apache.org on 2019/10/07 18:08:55 UTC
[cassandra] branch cassandra-3.0 updated: Fix bad merge that
reverted CASSANDRA-14993
This is an automated email from the ASF dual-hosted git repository.
bdeggleston pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
new a4af4aa Fix bad merge that reverted CASSANDRA-14993
a4af4aa is described below
commit a4af4aa60ad0aa6fbb134b44e162970c7a1a20da
Author: Blake Eggleston <bd...@gmail.com>
AuthorDate: Fri Aug 23 10:39:37 2019 -0700
Fix bad merge that reverted CASSANDRA-14993
Patch by Blake Eggleston; Reviewed by Stefan Podkowinski for CASSANDRA-15289
---
CHANGES.txt | 1 +
.../concurrent/AbstractLocalAwareExecutorService.java | 14 ++++++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 3f2b4d0..dd7025e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.19
+ * Fix merge which reverted CASSANDRA-14993 (CASSANDRA-15289)
* Fix LegacyLayout RangeTombstoneList IndexOutOfBoundsException when upgrading and RangeTombstone bounds are asymmetric (CASSANDRA-15172)
* Fix NPE when using allocate_tokens_for_keyspace on new DC/rack (CASSANDRA-14952)
* Filter sstables earlier when running cleanup (CASSANDRA-15100)
diff --git a/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java b/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java
index 6ef12d7..4b1fe05 100644
--- a/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java
+++ b/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java
@@ -29,8 +29,9 @@ import java.util.concurrent.TimeoutException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.cassandra.tracing.TraceState;
-import org.apache.cassandra.tracing.Tracing;
+import org.apache.cassandra.io.FSError;
+import org.apache.cassandra.io.sstable.CorruptSSTableException;
+import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.utils.concurrent.SimpleCondition;
import org.apache.cassandra.utils.JVMStabilityInspector;
@@ -165,10 +166,15 @@ public abstract class AbstractLocalAwareExecutorService implements LocalAwareExe
}
catch (Throwable t)
{
- JVMStabilityInspector.inspectThrowable(t);
- logger.warn("Uncaught exception on thread {}", Thread.currentThread(), t);
+ logger.error("Uncaught exception on thread {}", Thread.currentThread(), t);
result = t;
failure = true;
+ if (t instanceof CorruptSSTableException)
+ FileUtils.handleCorruptSSTable((CorruptSSTableException) t);
+ else if (t instanceof FSError)
+ FileUtils.handleFSError((FSError) t);
+ else
+ JVMStabilityInspector.inspectThrowable(t);
}
finally
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org