From ff1dc93989f6df8bdea1b0f31c05067397a0cca1 Mon Sep 17 00:00:00 2001
From: abobrov <abobrov@localhost>
Date: Mon, 28 Jan 2008 12:36:01 +0000
Subject: [PATCH] - [Issue 2358] Add progress information to bin/verify-index command Log total number of records to process along records processed in the progress report.
---
opends/src/messages/messages/jeb.properties | 4 ++--
opends/src/server/org/opends/server/backends/jeb/VerifyJob.java | 11 +++++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/opends/src/messages/messages/jeb.properties b/opends/src/messages/messages/jeb.properties
index 94b88c4..3deac18 100644
--- a/opends/src/messages/messages/jeb.properties
+++ b/opends/src/messages/messages/jeb.properties
@@ -211,8 +211,8 @@
exceeded the entry limit:
INFO_JEB_VERIFY_ENTRY_LIMIT_STATS_ROW_108= File %s has %d such record(s) \
min=%d max=%d median=%d
-INFO_JEB_VERIFY_PROGRESS_REPORT_109=Processed %d records and found %d \
- error(s) (recent rate %.1f/sec)
+INFO_JEB_VERIFY_PROGRESS_REPORT_109=Processed %d out of %d records and found \
+ %d error(s) (recent rate %.1f/sec)
INFO_JEB_VERIFY_CACHE_AND_MEMORY_REPORT_110=Free memory = %d MB, Cache miss \
rate = %.1f/record
MILD_ERR_JEB_INVALID_PAGED_RESULTS_COOKIE_111=The following paged results \
diff --git a/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
index f5a26dd..cdce663 100644
--- a/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -2035,6 +2035,11 @@
class ProgressTask extends TimerTask
{
/**
+ * The total number of records to process.
+ */
+ private long totalCount;
+
+ /**
* The number of records that had been processed at the time of the
* previous progress report.
*/
@@ -2066,6 +2071,8 @@
previousTime = System.currentTimeMillis();
prevEnvStats =
rootContainer.getEnvironmentStats(new StatsConfig());
+ totalCount = rootContainer.getEntryContainer(
+ verifyConfig.getBaseDN()).getEntryCount();
}
/**
@@ -2085,8 +2092,8 @@
float rate = 1000f*deltaCount / deltaTime;
- Message message =
- INFO_JEB_VERIFY_PROGRESS_REPORT.get(latestCount, errorCount, rate);
+ Message message = INFO_JEB_VERIFY_PROGRESS_REPORT.get(
+ latestCount, totalCount, errorCount, rate);
logError(message);
try
--
Gitblit v1.10.0