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 84c0390e1aa..0361059118e 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 static class AuditConstants { 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"; 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 ef6fd068a2c..99440a8a6a2 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 AppState getAppState(@Context HttpServletRequest hsr, 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 AppPriority getAppPriority(@Context HttpServletRequest hsr, 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 Response updateApplicationPriority(AppPriority targetPriority, 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 AppQueue getAppQueue(@Context HttpServletRequest hsr, 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 Response updateAppQueue(AppQueue targetQueue, 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;