Merge branch 'cassandra-2.1' into cassandra-2.2

yuanhui-yang · Feb 22, 2017 · 15e71ba · 15e71ba
2 parents 7841908 + 3c2f876
commit 15e71ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,8 @@
 2.2.10
  * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
  * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
+Merged from 2.1:
+ * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
 
 2.2.9
  * Coalescing strategy sleeps too much (CASSANDRA-13090)

diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -192,7 +192,7 @@ protected void setup()
             public void uncaughtException(Thread t, Throwable e)
             {
                 StorageMetrics.exceptions.inc();
-                logger.error("Exception in thread {}", t, e);
+                logger.error("Exception in thread " + t, e);
                 Tracing.trace("Exception in thread {}", t, e);
                 for (Throwable e2 = e; e2 != null; e2 = e2.getCause())
                 {
@@ -201,7 +201,7 @@ public void uncaughtException(Thread t, Throwable e)
                     if (e2 instanceof FSError)
                     {
                         if (e2 != e) // make sure FSError gets logged exactly once.
-                            logger.error("Exception in thread {}", t, e2);
+                            logger.error("Exception in thread " + t, e2);
                         FileUtils.handleFSError((FSError) e2);
                     }