You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/07/17 08:39:39 UTC
[2/6] cassandra git commit: Fix broken logging for "empty" flushes in
Memtable
Fix broken logging for "empty" flushes in Memtable
patch by Michael McKibben; reviewed by Robert Stupp for CASSANDRA-9837
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1eda7cb5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1eda7cb5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1eda7cb5
Branch: refs/heads/cassandra-2.2
Commit: 1eda7cb55c5876046cbc3f4ace3c7812ca032f69
Parents: 4fcd7d4
Author: Michael McKibben <mi...@gmail.com>
Authored: Fri Jul 17 08:36:00 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Jul 17 08:36:12 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Memtable.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1eda7cb5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e950f3b..49cc850 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.9
+ * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
* Complete CASSANDRA-8448 fix (CASSANDRA-9519)
* Handle corrupt files on startup (CASSANDRA-9686)
* Fix clientutil jar and tests (CASSANDRA-9760)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1eda7cb5/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java
index 9f6cf9b..375195f 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -390,7 +390,7 @@ public class Memtable
}
else
{
- logger.info("Completed flushing %s; nothing needed to be retained. Commitlog position was {}",
+ logger.info("Completed flushing {}; nothing needed to be retained. Commitlog position was {}",
writer.getFilename(), context);
writer.abort();
ssTable = null;