You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/11/03 22:07:45 UTC
[1/3] git commit: Fix repeating message when there are no hints to
compact
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 fe8e92f8f -> 827d93e22
refs/heads/trunk 931a51869 -> 156e278ed
Fix repeating message when there are no hints to compact
Patch by carlyeks, reviewed by brandonwilliams for CASSANDRA-8247
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/827d93e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/827d93e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/827d93e2
Branch: refs/heads/cassandra-2.1
Commit: 827d93e22fed93d5701b8b69a4818d0cc955dcce
Parents: fe8e92f
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 15:06:55 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 15:06:55 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/HintedHandOffManager.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/827d93e2/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index a1920ae..0e68a71 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -260,6 +260,9 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean
for (SSTable sstable : hintStore.getDataTracker().getUncompactingSSTables())
descriptors.add(sstable.descriptor);
+ if (descriptors.isEmpty())
+ return;
+
try
{
CompactionManager.instance.submitUserDefined(hintStore, descriptors, (int) (System.currentTimeMillis() / 1000)).get();
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/156e278e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/156e278e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/156e278e
Branch: refs/heads/trunk
Commit: 156e278ed841e5adf5172d3480af6143d844ab2f
Parents: 931a518 827d93e
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 15:07:39 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 15:07:39 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/HintedHandOffManager.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/156e278e/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
[2/3] git commit: Fix repeating message when there are no hints to
compact
Posted by br...@apache.org.
Fix repeating message when there are no hints to compact
Patch by carlyeks, reviewed by brandonwilliams for CASSANDRA-8247
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/827d93e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/827d93e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/827d93e2
Branch: refs/heads/trunk
Commit: 827d93e22fed93d5701b8b69a4818d0cc955dcce
Parents: fe8e92f
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 15:06:55 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 15:06:55 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/HintedHandOffManager.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/827d93e2/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index a1920ae..0e68a71 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -260,6 +260,9 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean
for (SSTable sstable : hintStore.getDataTracker().getUncompactingSSTables())
descriptors.add(sstable.descriptor);
+ if (descriptors.isEmpty())
+ return;
+
try
{
CompactionManager.instance.submitUserDefined(hintStore, descriptors, (int) (System.currentTimeMillis() / 1000)).get();