You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/07/29 18:31:33 UTC
[1/3] git commit: Switch liveRatio-related log messages to DEBUG
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 2236afb7a -> db9623904
Switch liveRatio-related log messages to DEBUG
ninja-patch by Aleksey Yeschenko for CASSANDRA-7467
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a5cc16d1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5cc16d1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5cc16d1
Branch: refs/heads/cassandra-2.1
Commit: a5cc16d18c0478fd37a33f68502632261f1d54d1
Parents: f5e634c
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Jul 29 19:24:47 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Jul 29 19:24:47 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Memtable.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5cc16d1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index aeb4b9d..26d94f7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.10
+ * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
* (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
* Always merge ranges owned by a single node (CASSANDRA-6930)
* Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5cc16d1/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 bcef0ec..20adeb7 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -467,7 +467,7 @@ public class Memtable
}
if (newRatio > MAX_SANE_LIVE_RATIO)
{
- logger.warn("setting live ratio to maximum of {} instead of {}", MAX_SANE_LIVE_RATIO, newRatio);
+ logger.debug("setting live ratio to maximum of {} instead of {}", MAX_SANE_LIVE_RATIO, newRatio);
newRatio = MAX_SANE_LIVE_RATIO;
}
@@ -478,8 +478,8 @@ public class Memtable
else
memtable.liveRatio = (memtable.liveRatio + newRatio) / 2.0;
- logger.info("{} liveRatio is {} (just-counted was {}). calculation took {}ms for {} cells",
- cfs, memtable.liveRatio, newRatio, TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start), objects);
+ logger.debug("{} liveRatio is {} (just-counted was {}). calculation took {}ms for {} cells",
+ cfs, memtable.liveRatio, newRatio, TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start), objects);
}
finally
{
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/Memtable.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65a4f5dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65a4f5dc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65a4f5dc
Branch: refs/heads/cassandra-2.1
Commit: 65a4f5dc728f2785256ab1a94e9428a662eff145
Parents: ee62ae1 a5cc16d
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Jul 29 19:27:33 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Jul 29 19:27:33 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db962390
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db962390
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db962390
Branch: refs/heads/cassandra-2.1
Commit: db962390482f8763d794ec0ba7582e470f5b0201
Parents: 2236afb 65a4f5d
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Jul 29 19:31:22 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Jul 29 19:31:22 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------