natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
T Jake Luciani 2014-12-01 16:06:53 -05:00
parent a109441996 9c0f5753f3
commit 25314c2046
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/stress/src/org/apache/cassandra/stress/util/Timing.java
View File

@ -80,7 +80,7 @@ public class Timing
// TODO fail gracefully after timeout if a thread is stuck
if (!ready.await(5L, TimeUnit.MINUTES))
throw new RuntimeException("Timed out waiting for a timer thread - seems one got stuck");
throw new RuntimeException("Timed out waiting for a timer thread - seems one got stuck. Check GC/Heap size");
boolean done = true;
// reports have been filled in by timer threadCount, so merge