Repository: hadoop Updated Branches: refs/heads/trunk e17a4970b -> ebf528c44
YARN-5660. Wrong audit constants are used in Get/Put of priority in RMWebService. Contributed by Rohith Sharma K S Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ebf528c4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ebf528c4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ebf528c4 Branch: refs/heads/trunk Commit: ebf528c443f3931c8b0f92ee76615fc203141675 Parents: e17a497 Author: Naganarasimha <naganarasimha...@apache.org> Authored: Tue Sep 27 16:37:34 2016 +0530 Committer: Naganarasimha <naganarasimha...@apache.org> Committed: Tue Sep 27 16:37:59 2016 +0530 ---------------------------------------------------------------------- .../yarn/server/resourcemanager/RMAuditLogger.java | 3 +++ .../resourcemanager/webapp/RMWebServices.java | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ebf528c4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAuditLogger.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAuditLogger.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAuditLogger.java index 84c0390..0361059 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAuditLogger.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAuditLogger.java @@ -51,6 +51,9 @@ public class RMAuditLogger { public static final String KILL_APP_REQUEST = "Kill Application Request"; public static final String SUBMIT_APP_REQUEST = "Submit Application Request"; public static final String MOVE_APP_REQUEST = "Move Application Request"; + public static final String GET_APP_STATE = "Get Application State"; + public static final String GET_APP_PRIORITY = "Get Application Priority"; + public static final String GET_APP_QUEUE = "Get Application Queue"; public static final String FINISH_SUCCESS_APP = "Application Finished - Succeeded"; public static final String FINISH_FAILED_APP = "Application Finished - Failed"; public static final String FINISH_KILLED_APP = "Application Finished - Killed"; http://git-wip-us.apache.org/repos/asf/hadoop/blob/ebf528c4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java index ef6fd06..99440a8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebServices.java @@ -872,7 +872,7 @@ public class RMWebServices extends WebServices { try { app = getRMAppForAppId(appId); } catch (NotFoundException e) { - RMAuditLogger.logFailure(userName, AuditConstants.KILL_APP_REQUEST, + RMAuditLogger.logFailure(userName, AuditConstants.GET_APP_STATE, "UNKNOWN", "RMWebService", "Trying to get state of an absent application " + appId); throw e; @@ -1212,9 +1212,9 @@ public class RMWebServices extends WebServices { try { app = getRMAppForAppId(appId); } catch (NotFoundException e) { - RMAuditLogger.logFailure(userName, AuditConstants.KILL_APP_REQUEST, + RMAuditLogger.logFailure(userName, AuditConstants.GET_APP_PRIORITY, "UNKNOWN", "RMWebService", - "Trying to get state of an absent application " + appId); + "Trying to get priority of an absent application " + appId); throw e; } @@ -1255,9 +1255,9 @@ public class RMWebServices extends WebServices { try { app = getRMAppForAppId(appId); } catch (NotFoundException e) { - RMAuditLogger.logFailure(userName, AuditConstants.KILL_APP_REQUEST, + RMAuditLogger.logFailure(userName, AuditConstants.UPDATE_APP_PRIORITY, "UNKNOWN", "RMWebService", - "Trying to move an absent application " + appId); + "Trying to update priority an absent application " + appId); throw e; } Priority priority = app.getApplicationSubmissionContext().getPriority(); @@ -1326,9 +1326,9 @@ public class RMWebServices extends WebServices { try { app = getRMAppForAppId(appId); } catch (NotFoundException e) { - RMAuditLogger.logFailure(userName, AuditConstants.KILL_APP_REQUEST, + RMAuditLogger.logFailure(userName, AuditConstants.GET_APP_QUEUE, "UNKNOWN", "RMWebService", - "Trying to get state of an absent application " + appId); + "Trying to get queue of an absent application " + appId); throw e; } @@ -1364,7 +1364,7 @@ public class RMWebServices extends WebServices { try { app = getRMAppForAppId(appId); } catch (NotFoundException e) { - RMAuditLogger.logFailure(userName, AuditConstants.KILL_APP_REQUEST, + RMAuditLogger.logFailure(userName, AuditConstants.MOVE_APP_REQUEST, "UNKNOWN", "RMWebService", "Trying to move an absent application " + appId); throw e; --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
