Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't display leveldb replication recovery progress on slave nodes.

This commit is contained in:
Hiram Chirino 2013-10-10 14:52:07 -04:00
parent c643e7f631
commit e90ce1aabb
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala
View File

@ -674,7 +674,7 @@ class LevelDBClient(store: LevelDBStore) {
}
}
def replay_from(from:Long, limit:Long) = {
def replay_from(from:Long, limit:Long, print_progress:Boolean=true) = {
might_fail {
try {
// Update the index /w what was stored on the logs..
@ -684,25 +684,28 @@ class LevelDBClient(store: LevelDBStore) {
var last_reported_pos = 0L
try {
while (pos < limit) {
val now = System.currentTimeMillis();
if( now > last_reported_at+1000 ) {
val at = pos-from
val total = limit-from
val rate = (pos-last_reported_pos)*1000.0 / (now - last_reported_at)
val eta = (total-at)/rate
val remaining = if(eta > 60*60) {
"%.2f hrs".format(eta/(60*60))
} else if(eta > 60) {
"%.2f mins".format(eta/60)
} else {
"%.0f secs".format(eta)
}
System.out.print("Replaying recovery log: %f%% done (%,d/%,d bytes) @ %,.2f kb/s, %s remaining. \r".format(
at*100.0/total, at, total, rate/1024, remaining))
showing_progress = true;
last_reported_at = now
last_reported_pos = pos
if( print_progress ) {
val now = System.currentTimeMillis();
if( now > last_reported_at+1000 ) {
val at = pos-from
val total = limit-from
val rate = (pos-last_reported_pos)*1000.0 / (now - last_reported_at)
val eta = (total-at)/rate
val remaining = if(eta > 60*60) {
"%.2f hrs".format(eta/(60*60))
} else if(eta > 60) {
"%.2f mins".format(eta/60)
} else {
"%.0f secs".format(eta)
}
System.out.print("Replaying recovery log: %f%% done (%,d/%,d bytes) @ %,.2f kb/s, %s remaining. \r".format(
at*100.0/total, at, total, rate/1024, remaining))
showing_progress = true;
last_reported_at = now
last_reported_pos = pos
}
}
@ -774,7 +777,7 @@ class LevelDBClient(store: LevelDBStore) {
case e:Throwable => e.printStackTrace()
}
if(showing_progress) {
System.out.print(" \r");
System.out.println("Replaying recovery log: 100% done ");
}
} catch {

2
activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala
View File

@ -146,7 +146,7 @@ class SlaveLevelDBStore extends LevelDBStore with ReplicatedLevelDBStoreTrait {
val old_replay_from = replay_from
replay_from = ack.position
client.writeExecutor {
client.replay_from(old_replay_from, ack.position)
client.replay_from(old_replay_from, ack.position, false)
}
}
}