From ce34626d7a59a01a7d5d0caeb340b271a40e1a36 Mon Sep 17 00:00:00 2001
From: Steven Rand <srand@palantir.com>
Date: Sun, 21 Mar 2021 12:26:27 +0100
Subject: [PATCH] manually apply patch for YARN-2985

---
 .../applicationhistoryservice/ApplicationHistoryServer.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
index 4e3a1e603a38c..1bb5e138276aa 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
@@ -41,6 +41,7 @@
 import org.apache.hadoop.yarn.YarnUncaughtExceptionHandler;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+import org.apache.hadoop.yarn.logaggregation.AggregatedLogDeletionService;
 import org.apache.hadoop.yarn.server.applicationhistoryservice.webapp.AHSWebApp;
 import org.apache.hadoop.yarn.server.security.ApplicationACLsManager;
 import org.apache.hadoop.yarn.server.timeline.LeveldbTimelineStore;
@@ -70,6 +71,7 @@ public class ApplicationHistoryServer extends CompositeService {
   private static final Logger LOG = LoggerFactory
       .getLogger(ApplicationHistoryServer.class);
 
+  private AggregatedLogDeletionService aggregatedLogDeletionService;
   private ApplicationHistoryClientService ahsClientService;
   private ApplicationACLsManager aclsManager;
   private ApplicationHistoryManager historyManager;
@@ -99,6 +101,8 @@ protected void serviceInit(Configuration conf) throws Exception {
     addService(secretManagerService);
     timelineDataManager = createTimelineDataManager(conf);
     addService(timelineDataManager);
+    aggregatedLogDeletionService = new AggregatedLogDeletionService();
+    addService(aggregatedLogDeletionService);
 
     // init generic history service afterwards
     aclsManager = createApplicationACLsManager(conf);