Author: tgraves Date: Fri Aug 17 20:32:42 2012 New Revision: 1374427 URL: http://svn.apache.org/viewvc?rev=1374427&view=rev Log: merge -r 1374423:1374424 from trunk. FIXES: YARN-25
Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistoryServer.java Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistoryServer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistoryServer.java?rev=1374427&r1=1374426&r2=1374427&view=diff ============================================================================== --- hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistoryServer.java (original) +++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistoryServer.java Fri Aug 17 20:32:42 2012 @@ -34,6 +34,7 @@ import org.apache.hadoop.yarn.YarnExcept import org.apache.hadoop.yarn.YarnUncaughtExceptionHandler; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.event.Dispatcher; +import org.apache.hadoop.yarn.logaggregation.AggregatedLogDeletionService; import org.apache.hadoop.yarn.service.CompositeService; /****************************************************************** @@ -53,6 +54,7 @@ public class JobHistoryServer extends Co private HistoryClientService clientService; private JobHistory jobHistoryService; private JHSDelegationTokenSecretManager jhsDTSecretManager; + private AggregatedLogDeletionService aggLogDelService; public JobHistoryServer() { super(JobHistoryServer.class.getName()); @@ -74,8 +76,10 @@ public class JobHistoryServer extends Co this.jhsDTSecretManager = createJHSSecretManager(conf); clientService = new HistoryClientService(historyContext, this.jhsDTSecretManager); + aggLogDelService = new AggregatedLogDeletionService(); addService(jobHistoryService); addService(clientService); + addService(aggLogDelService); super.init(config); }