You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/05/22 17:59:12 UTC
[1/3] cassandra git commit: Lower sleep time to avoid timeout of
IndexSummaryManagerTest.testCompactionRace
Repository: cassandra
Updated Branches:
refs/heads/trunk d96a02a12 -> 491f7dc27
Lower sleep time to avoid timeout of IndexSummaryManagerTest.testCompactionRace
patch by awiesberg; reviewed by tjake for CASSANDRA-9271
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4362e71e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4362e71e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4362e71e
Branch: refs/heads/trunk
Commit: 4362e71e55295067fd8de3a3206e0ff179bfcaf9
Parents: ae04861
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri May 22 11:48:45 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri May 22 11:48:45 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/compaction/CompactionManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4362e71e/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 47bd2d6..fd28ceb 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -1484,7 +1484,7 @@ public class CompactionManager implements CompactionManagerMBean
while (System.nanoTime() - start < delay)
{
if (CompactionManager.instance.isCompacting(cfss))
- Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
+ Uninterruptibles.sleepUninterruptibly(1, TimeUnit.MILLISECONDS);
else
break;
}
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ab14968
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ab14968
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ab14968
Branch: refs/heads/trunk
Commit: 5ab14968ec3819a94d9c3abdeb93a812c4a45b4a
Parents: e5a76bd 4362e71
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri May 22 11:57:36 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri May 22 11:57:36 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/compaction/CompactionManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ab14968/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/491f7dc2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/491f7dc2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/491f7dc2
Branch: refs/heads/trunk
Commit: 491f7dc274ba5a300ffcbf08bc010afffe18c54a
Parents: d96a02a 5ab1496
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri May 22 11:58:57 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri May 22 11:58:57 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/compaction/CompactionManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------