cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject cassandra git commit: Fix trivial log format error
Date Tue, 12 Dec 2017 01:40:35 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 8547f7471 -> e18a49a23


Fix trivial log format error

Patch by Jay Zhuang; reviewed by Jeff Jirsa for CASSANDRA-14105


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

Branch: refs/heads/trunk
Commit: e18a49a2399a3fe667c3c08d7350b7528614f0a6
Parents: 8547f74
Author: Jay Zhuang <jay.zhuang@yahoo.com>
Authored: Mon Dec 11 10:25:58 2017 -0800
Committer: Jeff Jirsa <jjirsa@apple.com>
Committed: Mon Dec 11 17:39:31 2017 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java  | 2 +-
 .../org/apache/cassandra/db/marshal/DynamicCompositeType.java  | 6 ++----
 src/java/org/apache/cassandra/service/StorageProxy.java        | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e18a49a2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2017aff..acd4996 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0
+ * Fix trivial log format error (CASSANDRA-14015)
  * Allow sstabledump to do a json object per partition (CASSANDRA-13848)
  * Add option to optimise merkle tree comparison across replicas (CASSANDRA-3200)
  * Remove unused and deprecated methods from AbstractCompactionStrategy (CASSANDRA-14081)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e18a49a2/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index c57b37a..cc4d078 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -348,7 +348,7 @@ public class CompactionManager implements CompactionManagerMBean
         {
             Throwable fail = Throwables.close(null, transactions);
             if (fail != null)
-                logger.error("Failed to cleanup lifecycle transactions {}", fail);
+                logger.error("Failed to cleanup lifecycle transactions", fail);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e18a49a2/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java b/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
index c6eeecf..6fa7e87 100644
--- a/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
@@ -203,15 +203,13 @@ public class DynamicCompositeType extends AbstractCompositeType
             {
                 // ByteBufferUtil.string failed.
                 // Log it here and we'll further throw an exception below since comparator
== null
-                logger.error("Failed with [{}] when decoding the byte buffer in ByteBufferUtil.string()",
-                   ce);
+                logger.error("Failed when decoding the byte buffer in ByteBufferUtil.string()",
ce);
             }
             catch (Exception e)
             {
                 // parse failed.
                 // Log it here and we'll further throw an exception below since comparator
== null
-                logger.error("Failed to parse value string \"{}\" with exception: [{}]",
-                   valueStr, e);
+                logger.error("Failed to parse value string \"{}\" with exception:", valueStr,
e);
             }
         }
         else

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e18a49a2/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index aa5d0cc..be0cf0f 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -525,7 +525,7 @@ public class StorageProxy implements StorageProxyMBean
                         }
                         catch (Exception ex)
                         {
-                            logger.error("Failed paxos prepare locally : {}", ex);
+                            logger.error("Failed paxos prepare locally", ex);
                         }
                     }
                 });
@@ -563,7 +563,7 @@ public class StorageProxy implements StorageProxyMBean
                         }
                         catch (Exception ex)
                         {
-                            logger.error("Failed paxos propose locally : {}", ex);
+                            logger.error("Failed paxos propose locally", ex);
                         }
                     }
                 });


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


Mime
View raw message