From 0d286d1041ed6bec02bb7dbe4aa54165c259c7c3 Mon Sep 17 00:00:00 2001 From: Devaraj K Date: Fri, 8 May 2015 12:14:10 +0530 Subject: [PATCH] YARN-3358. Audit log not present while refreshing Service ACLs. Contributed by Varun Saxena. (cherry picked from commit ef3d66d4624d360e75c016e36824a6782d6a9746) --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop/yarn/server/resourcemanager/AdminService.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0523f4ff4da..063d2bd6a8b 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -358,6 +358,9 @@ Release 2.7.1 - UNRELEASED YARN-3385. Fixed a race-condition in ResourceManager's ZooKeeper based state-store to avoid crashing on duplicate deletes. (Zhihai Xu via vinodkv) + YARN-3358. Audit log not present while refreshing Service ACLs. + (Varun Saxena via devaraj) + Release 2.7.0 - 2015-04-20 INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java index 0ad90c0ed4c..1ee8b3b327a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java @@ -508,7 +508,9 @@ public class AdminService extends CompositeService implements conf, policyProvider); rmContext.getResourceTrackerService().refreshServiceAcls( conf, policyProvider); - + + RMAuditLogger.logSuccess(user.getShortUserName(), argName, "AdminService"); + return recordFactory.newRecordInstance(RefreshServiceAclsResponse.class); }