You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2009/04/17 10:09:14 UTC
svn commit: r765895 - in /hadoop/core/branches/branch-0.20: CHANGES.txt
src/mapred/org/apache/hadoop/mapred/JobTracker.java
Author: sharad
Date: Fri Apr 17 08:09:13 2009
New Revision: 765895
URL: http://svn.apache.org/viewvc?rev=765895&view=rev
Log:
Reverting the last checkin. Branch is frozen, as vote is out for 0.20 release.
Modified:
hadoop/core/branches/branch-0.20/CHANGES.txt
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=765895&r1=765894&r2=765895&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Fri Apr 17 08:09:13 2009
@@ -875,9 +875,6 @@
HADOOP-5655. TestMRServerPorts fails on java.net.BindException. (Devaraj
Das via hairong)
- HADOOP-5533. Recovery duration shown on the jobtracker webpage is
- inaccurate. (Amar Kamat via sharad)
-
Release 0.19.2 - Unreleased
BUG FIXES
Modified: hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=765895&r1=765894&r2=765895&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java (original)
+++ hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java Fri Apr 17 08:09:13 2009
@@ -1194,15 +1194,13 @@
}
public void recover() {
- long recoveryProcessStartTime = System.currentTimeMillis();
if (!shouldRecover()) {
// clean up jobs structure
jobsToRecover.clear();
return;
}
- LOG.info("Starting the recovery process with restart count : "
- + restartCount);
+ LOG.info("Restart count of the jobtracker : " + restartCount);
// I. Init the jobs and cache the recovered job history filenames
Map<JobID, Path> jobHistoryFilenameMap = new HashMap<JobID, Path>();
@@ -1258,11 +1256,6 @@
}
}
- LOG.info("Took a total of "
- + StringUtils.formatTime(System.currentTimeMillis()
- - recoveryProcessStartTime)
- + " for recovering filenames of all the jobs from history.");
-
long recoveryStartTime = System.currentTimeMillis();
// II. Recover each job
@@ -1320,21 +1313,14 @@
}
}
- long recoveryProcessEndTime = System.currentTimeMillis();
- LOG.info("Took a total of "
- + StringUtils.formatTime(recoveryProcessEndTime
- - recoveryStartTime)
- + " for parsing and recovering all the jobs from history.");
-
- recoveryDuration = recoveryProcessEndTime - recoveryProcessStartTime;
- LOG.info("Took a total of " + StringUtils.formatTime(recoveryDuration)
- + " for the whole recovery process.");
+ recoveryDuration = System.currentTimeMillis() - recoveryStartTime;
hasRecovered = true;
// III. Finalize the recovery
synchronized (trackerExpiryQueue) {
// Make sure that the tracker statuses in the expiry-tracker queue
// are updated
+ long now = System.currentTimeMillis();
int size = trackerExpiryQueue.size();
for (int i = 0; i < size ; ++i) {
// Get the first status
@@ -1344,14 +1330,14 @@
trackerExpiryQueue.remove(status);
// Set the new time
- status.setLastSeen(recoveryProcessEndTime);
+ status.setLastSeen(now);
// Add back to get the sorted list
trackerExpiryQueue.add(status);
}
}
- LOG.info("Restoration done. Recovery complete!");
+ LOG.info("Restoration complete");
}
int totalEventsRecovered() {