Author: slebresne
Date: Tue Dec 6 16:30:53 2011
New Revision: 1211000
URL: http://svn.apache.org/viewvc?rev=1211000&view=rev
Log:
fix loader progress bar display when the transfer was lightning fast
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/BulkLoader.java
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/BulkLoader.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/BulkLoader.java?rev=1211000&r1=1210999&r2=1211000&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/BulkLoader.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/BulkLoader.java
Tue Dec 6 16:30:53 2011
@@ -69,12 +69,14 @@ public class BulkLoader
ProgressIndicator indicator = new
ProgressIndicator(future.getPendingFiles());
indicator.start();
System.out.println("");
+ boolean printEnd = false;
while (!future.isDone())
{
if (indicator.printProgress())
{
// We're done with streaming
System.out.println("\nWaiting for targets to rebuild
indexes ...");
+ printEnd = true;
future.get();
assert future.isDone();
}
@@ -83,6 +85,8 @@ public class BulkLoader
try { Thread.sleep(1000L); } catch (Exception e) {}
}
}
+ if (!printEnd)
+ indicator.printProgress();
}
System.exit(0); // We need that to stop non daemonized threads