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:48:02 UTC
[1/6] git commit: Fix repeated message when there are no hints to
compact
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 83d4762a6 -> e88bcfeb1
refs/heads/cassandra-2.1 827d93e22 -> 25be46497
refs/heads/trunk 156e278ed -> c93cbb295
Fix repeated message when there are no hints to compact
Patch by carlyeks, reviwed 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/e88bcfeb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e88bcfeb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e88bcfeb
Branch: refs/heads/cassandra-2.0
Commit: e88bcfeb15266756c7543beb97aad6c1be74dabe
Parents: 83d4762
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 15:47:02 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 15:47:02 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/e88bcfeb/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 a6b6d4c..c2e4d0d 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -257,6 +257,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();
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.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/25be4649
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25be4649
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25be4649
Branch: refs/heads/cassandra-2.1
Commit: 25be46497a8df46f05ffa102bc645bfd684ea48a
Parents: 827d93e e88bcfe
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 15:47:47 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 15:47:47 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] git commit: Fix repeated message when there are no hints to
compact
Posted by br...@apache.org.
Fix repeated message when there are no hints to compact
Patch by carlyeks, reviwed 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/e88bcfeb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e88bcfeb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e88bcfeb
Branch: refs/heads/cassandra-2.1
Commit: e88bcfeb15266756c7543beb97aad6c1be74dabe
Parents: 83d4762
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 15:47:02 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 15:47:02 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/e88bcfeb/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 a6b6d4c..c2e4d0d 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -257,6 +257,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();
[6/6] 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/c93cbb29
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c93cbb29
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c93cbb29
Branch: refs/heads/trunk
Commit: c93cbb2959ce02d961a2e6c0fd1f103b70600dce
Parents: 156e278 25be464
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 15:47:56 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 15:47:56 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.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/25be4649
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25be4649
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25be4649
Branch: refs/heads/trunk
Commit: 25be46497a8df46f05ffa102bc645bfd684ea48a
Parents: 827d93e e88bcfe
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 15:47:47 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 15:47:47 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] git commit: Fix repeated message when there are no hints to
compact
Posted by br...@apache.org.
Fix repeated message when there are no hints to compact
Patch by carlyeks, reviwed 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/e88bcfeb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e88bcfeb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e88bcfeb
Branch: refs/heads/trunk
Commit: e88bcfeb15266756c7543beb97aad6c1be74dabe
Parents: 83d4762
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 15:47:02 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 15:47:02 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/e88bcfeb/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 a6b6d4c..c2e4d0d 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -257,6 +257,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();