Author: amareshwari
Date: Thu Aug 12 04:17:27 2010
New Revision: 984642
URL: http://svn.apache.org/viewvc?rev=984642&view=rev
Log:
MAPREDUCE-1920. Merge -r 984640:984641 from trunk
Modified:
hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
hadoop/mapreduce/branches/branch-0.21/src/java/mapred-default.xml
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/CompletedJobStatusStore.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/Job.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred-site.xml
Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=984642&r1=984641&r2=984642&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Thu Aug 12 04:17:27 2010
@@ -1502,3 +1502,7 @@ Release 0.21.0 - 2010-07-01
MAPREDUCE-1926. MapReduce distribution is missing build-utils.xml.
(tomwhite)
+
+ MAPREDUCE-1920. Enables completed jobstatus store by default. (Tom White
+ via amareshwari)
+
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/mapred-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/mapred-default.xml?rev=984642&r1=984641&r2=984642&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/mapred-default.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/mapred-default.xml Thu Aug
12 04:17:27 2010
@@ -755,7 +755,7 @@
<property>
<name>mapreduce.jobtracker.persist.jobstatus.active</name>
- <value>false</value>
+ <value>true</value>
<description>Indicates if persistency of job status information is
active or not.
</description>
@@ -763,7 +763,7 @@
<property>
<name>mapreduce.jobtracker.persist.jobstatus.hours</name>
- <value>0</value>
+ <value>1</value>
<description>The number of hours job status information is persisted in DFS.
The job status information will be available after it drops of the memory
queue and between jobtracker restarts. With a zero value the job status
Modified:
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/CompletedJobStatusStore.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/CompletedJobStatusStore.java?rev=984642&r1=984641&r2=984642&view=diff
==============================================================================
---
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/CompletedJobStatusStore.java
(original)
+++
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/CompletedJobStatusStore.java
Thu Aug 12 04:17:27 2010
@@ -60,11 +60,11 @@ class CompletedJobStatusStore implements
CompletedJobStatusStore(JobACLsManager aclsManager, Configuration conf)
throws IOException {
active =
- conf.getBoolean(JTConfig.JT_PERSIST_JOBSTATUS, false);
+ conf.getBoolean(JTConfig.JT_PERSIST_JOBSTATUS, true);
if (active) {
retainTime =
- conf.getInt(JTConfig.JT_PERSIST_JOBSTATUS_HOURS, 0) * HOUR;
+ conf.getInt(JTConfig.JT_PERSIST_JOBSTATUS_HOURS, 1) * HOUR;
jobInfoDir =
conf.get(JTConfig.JT_PERSIST_JOBSTATUS_DIR, JOB_INFO_STORE_DIR);
Modified:
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/Job.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/Job.java?rev=984642&r1=984641&r2=984642&view=diff
==============================================================================
---
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/Job.java
(original)
+++
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/Job.java
Thu Aug 12 04:17:27 2010
@@ -486,7 +486,8 @@ public class Job extends JobContextImpl
}
/**
- * Gets the counters for this job.
+ * Gets the counters for this job. May return null if the job has been
+ * retired and the job is no longer in the completed job store.
*
* @return the counters for this job.
* @throws IOException
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred-site.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred-site.xml?rev=984642&r1=984641&r2=984642&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred-site.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred-site.xml Thu Aug 12
04:17:27 2010
@@ -40,4 +40,8 @@
<value>false</value>
<description></description>
</property>
+<property>
+ <name>mapreduce.jobtracker.persist.jobstatus.active</name>
+ <value>false</value>
+</property>
</configuration>
