YARN-4883. Make consistent operation name in AdminService. Contributed by Kai Sasaki.
This commit is contained in:
Akira Ajisaka
parent
38128baff4
commit
c63afdbe14
|
|
@ -399,11 +399,11 @@ public synchronized HAServiceStatus getServiceStatus() throws IOException {
|
|||
@Override
|
||||
public RefreshQueuesResponse refreshQueues(RefreshQueuesRequest request)
|
||||
throws YarnException, StandbyException {
|
||||
String argName = "refreshQueues";
|
||||
final String operation = "refreshQueues";
|
||||
final String msg = "refresh queues.";
|
||||
UserGroupInformation user = checkAcls(argName);
|
||||
UserGroupInformation user = checkAcls(operation);
|
||||
|
||||
checkRMStatus(user.getShortUserName(), argName, msg);
|
||||
checkRMStatus(user.getShortUserName(), operation, msg);
|
||||
|
||||
RefreshQueuesResponse response =
|
||||
recordFactory.newRecordInstance(RefreshQueuesResponse.class);
|
||||
|
|
@ -414,22 +414,22 @@ public RefreshQueuesResponse refreshQueues(RefreshQueuesRequest request)
|
|||
if (rSystem != null) {
|
||||
rSystem.reinitialize(getConfig(), rmContext);
|
||||
}
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), argName,
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), operation,
|
||||
"AdminService");
|
||||
return response;
|
||||
} catch (IOException ioe) {
|
||||
throw logAndWrapException(ioe, user.getShortUserName(), argName, msg);
|
||||
throw logAndWrapException(ioe, user.getShortUserName(), operation, msg);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public RefreshNodesResponse refreshNodes(RefreshNodesRequest request)
|
||||
throws YarnException, StandbyException {
|
||||
String argName = "refreshNodes";
|
||||
final String operation = "refreshNodes";
|
||||
final String msg = "refresh nodes.";
|
||||
UserGroupInformation user = checkAcls("refreshNodes");
|
||||
|
||||
checkRMStatus(user.getShortUserName(), argName, msg);
|
||||
checkRMStatus(user.getShortUserName(), operation, msg);
|
||||
|
||||
try {
|
||||
Configuration conf =
|
||||
|
|
@ -446,11 +446,11 @@ public RefreshNodesResponse refreshNodes(RefreshNodesRequest request)
|
|||
rmContext.getNodesListManager().refreshNodesForcefully();
|
||||
break;
|
||||
}
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), argName,
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), operation,
|
||||
"AdminService");
|
||||
return recordFactory.newRecordInstance(RefreshNodesResponse.class);
|
||||
} catch (IOException ioe) {
|
||||
throw logAndWrapException(ioe, user.getShortUserName(), argName, msg);
|
||||
throw logAndWrapException(ioe, user.getShortUserName(), operation, msg);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -458,10 +458,11 @@ public RefreshNodesResponse refreshNodes(RefreshNodesRequest request)
|
|||
public RefreshSuperUserGroupsConfigurationResponse refreshSuperUserGroupsConfiguration(
|
||||
RefreshSuperUserGroupsConfigurationRequest request)
|
||||
throws YarnException, IOException {
|
||||
String argName = "refreshSuperUserGroupsConfiguration";
|
||||
UserGroupInformation user = checkAcls(argName);
|
||||
final String operation = "refreshSuperUserGroupsConfiguration";
|
||||
UserGroupInformation user = checkAcls(operation);
|
||||
|
||||
checkRMStatus(user.getShortUserName(), argName, "refresh super-user-groups.");
|
||||
checkRMStatus(user.getShortUserName(), operation,
|
||||
"refresh super-user-groups.");
|
||||
|
||||
// Accept hadoop common configs in core-site.xml as well as RM specific
|
||||
// configurations in yarn-site.xml
|
||||
|
|
@ -472,7 +473,7 @@ public RefreshSuperUserGroupsConfigurationResponse refreshSuperUserGroupsConfigu
|
|||
RMServerUtils.processRMProxyUsersConf(conf);
|
||||
ProxyUsers.refreshSuperUserGroupsConfiguration(conf);
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(),
|
||||
argName, "AdminService");
|
||||
operation, "AdminService");
|
||||
|
||||
return recordFactory.newRecordInstance(
|
||||
RefreshSuperUserGroupsConfigurationResponse.class);
|
||||
|
|
@ -482,16 +483,17 @@ public RefreshSuperUserGroupsConfigurationResponse refreshSuperUserGroupsConfigu
|
|||
public RefreshUserToGroupsMappingsResponse refreshUserToGroupsMappings(
|
||||
RefreshUserToGroupsMappingsRequest request)
|
||||
throws YarnException, IOException {
|
||||
String argName = "refreshUserToGroupsMappings";
|
||||
UserGroupInformation user = checkAcls(argName);
|
||||
final String operation = "refreshUserToGroupsMappings";
|
||||
UserGroupInformation user = checkAcls(operation);
|
||||
|
||||
checkRMStatus(user.getShortUserName(), argName, "refresh user-groups.");
|
||||
checkRMStatus(user.getShortUserName(), operation, "refresh user-groups.");
|
||||
|
||||
Groups.getUserToGroupsMappingService(
|
||||
getConfiguration(new Configuration(false),
|
||||
YarnConfiguration.CORE_SITE_CONFIGURATION_FILE)).refresh();
|
||||
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), argName, "AdminService");
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), operation,
|
||||
"AdminService");
|
||||
|
||||
return recordFactory.newRecordInstance(
|
||||
RefreshUserToGroupsMappingsResponse.class);
|
||||
|
|
@ -505,18 +507,18 @@ public RefreshAdminAclsResponse refreshAdminAcls(
|
|||
|
||||
private RefreshAdminAclsResponse refreshAdminAcls(boolean checkRMHAState)
|
||||
throws YarnException, IOException {
|
||||
String argName = "refreshAdminAcls";
|
||||
UserGroupInformation user = checkAcls(argName);
|
||||
final String operation = "refreshAdminAcls";
|
||||
UserGroupInformation user = checkAcls(operation);
|
||||
|
||||
if (checkRMHAState) {
|
||||
checkRMStatus(user.getShortUserName(), argName, "refresh Admin ACLs.");
|
||||
checkRMStatus(user.getShortUserName(), operation, "refresh Admin ACLs.");
|
||||
}
|
||||
Configuration conf =
|
||||
getConfiguration(new Configuration(false),
|
||||
YarnConfiguration.YARN_SITE_CONFIGURATION_FILE);
|
||||
authorizer.setAdmins(getAdminAclList(conf), UserGroupInformation
|
||||
.getCurrentUser());
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), argName,
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), operation,
|
||||
"AdminService");
|
||||
|
||||
return recordFactory.newRecordInstance(RefreshAdminAclsResponse.class);
|
||||
|
|
@ -534,10 +536,10 @@ public RefreshServiceAclsResponse refreshServiceAcls(
|
|||
") not enabled."));
|
||||
}
|
||||
|
||||
String argName = "refreshServiceAcls";
|
||||
UserGroupInformation user = checkAcls(argName);
|
||||
final String operation = "refreshServiceAcls";
|
||||
UserGroupInformation user = checkAcls(operation);
|
||||
|
||||
checkRMStatus(user.getShortUserName(), argName, "refresh Service ACLs.");
|
||||
checkRMStatus(user.getShortUserName(), operation, "refresh Service ACLs.");
|
||||
|
||||
PolicyProvider policyProvider = RMPolicyProvider.getInstance();
|
||||
Configuration conf =
|
||||
|
|
@ -551,7 +553,8 @@ public RefreshServiceAclsResponse refreshServiceAcls(
|
|||
rmContext.getResourceTrackerService().refreshServiceAcls(
|
||||
conf, policyProvider);
|
||||
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), argName, "AdminService");
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), operation,
|
||||
"AdminService");
|
||||
|
||||
return recordFactory.newRecordInstance(RefreshServiceAclsResponse.class);
|
||||
}
|
||||
|
|
@ -571,10 +574,10 @@ public String[] getGroupsForUser(String user) throws IOException {
|
|||
@Override
|
||||
public UpdateNodeResourceResponse updateNodeResource(
|
||||
UpdateNodeResourceRequest request) throws YarnException, IOException {
|
||||
String argName = "updateNodeResource";
|
||||
UserGroupInformation user = checkAcls(argName);
|
||||
final String operation = "updateNodeResource";
|
||||
UserGroupInformation user = checkAcls(operation);
|
||||
|
||||
checkRMStatus(user.getShortUserName(), argName, "update node resource.");
|
||||
checkRMStatus(user.getShortUserName(), operation, "update node resource.");
|
||||
|
||||
Map<NodeId, ResourceOption> nodeResourceMap = request.getNodeResourceMap();
|
||||
Set<NodeId> nodeIds = nodeResourceMap.keySet();
|
||||
|
|
@ -615,7 +618,7 @@ public UpdateNodeResourceResponse updateNodeResource(
|
|||
}
|
||||
}
|
||||
if (allSuccess) {
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), argName,
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), operation,
|
||||
"AdminService");
|
||||
}
|
||||
UpdateNodeResourceResponse response =
|
||||
|
|
@ -627,11 +630,11 @@ public UpdateNodeResourceResponse updateNodeResource(
|
|||
public RefreshNodesResourcesResponse refreshNodesResources(
|
||||
RefreshNodesResourcesRequest request)
|
||||
throws YarnException, StandbyException {
|
||||
String argName = "refreshNodesResources";
|
||||
UserGroupInformation user = checkAcls(argName);
|
||||
final String operation = "refreshNodesResources";
|
||||
UserGroupInformation user = checkAcls(operation);
|
||||
final String msg = "refresh nodes.";
|
||||
|
||||
checkRMStatus(user.getShortUserName(), argName, msg);
|
||||
checkRMStatus(user.getShortUserName(), operation, msg);
|
||||
|
||||
RefreshNodesResourcesResponse response =
|
||||
recordFactory.newRecordInstance(RefreshNodesResourcesResponse.class);
|
||||
|
|
@ -662,11 +665,11 @@ public RefreshNodesResourcesResponse refreshNodesResources(
|
|||
// refresh dynamic resource in ResourceTrackerService
|
||||
this.rmContext.getResourceTrackerService().
|
||||
updateDynamicResourceConfiguration(newConf);
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), argName,
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), operation,
|
||||
"AdminService");
|
||||
return response;
|
||||
} catch (IOException ioe) {
|
||||
throw logAndWrapException(ioe, user.getShortUserName(), argName, msg);
|
||||
throw logAndWrapException(ioe, user.getShortUserName(), operation, msg);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -719,28 +722,28 @@ public Server getServer() {
|
|||
@Override
|
||||
public AddToClusterNodeLabelsResponse addToClusterNodeLabels(AddToClusterNodeLabelsRequest request)
|
||||
throws YarnException, IOException {
|
||||
String argName = "addToClusterNodeLabels";
|
||||
final String operation = "addToClusterNodeLabels";
|
||||
final String msg = "add labels.";
|
||||
UserGroupInformation user = checkAcls(argName);
|
||||
UserGroupInformation user = checkAcls(operation);
|
||||
|
||||
checkRMStatus(user.getShortUserName(), argName, msg);
|
||||
checkRMStatus(user.getShortUserName(), operation, msg);
|
||||
|
||||
AddToClusterNodeLabelsResponse response =
|
||||
recordFactory.newRecordInstance(AddToClusterNodeLabelsResponse.class);
|
||||
try {
|
||||
rmContext.getNodeLabelManager().addToCluserNodeLabels(request.getNodeLabels());
|
||||
RMAuditLogger
|
||||
.logSuccess(user.getShortUserName(), argName, "AdminService");
|
||||
.logSuccess(user.getShortUserName(), operation, "AdminService");
|
||||
return response;
|
||||
} catch (IOException ioe) {
|
||||
throw logAndWrapException(ioe, user.getShortUserName(), argName, msg);
|
||||
throw logAndWrapException(ioe, user.getShortUserName(), operation, msg);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public RemoveFromClusterNodeLabelsResponse removeFromClusterNodeLabels(
|
||||
RemoveFromClusterNodeLabelsRequest request) throws YarnException, IOException {
|
||||
String operation = "removeFromClusterNodeLabels";
|
||||
final String operation = "removeFromClusterNodeLabels";
|
||||
final String msg = "remove labels.";
|
||||
|
||||
UserGroupInformation user = checkAcls(operation);
|
||||
|
|
@ -762,7 +765,7 @@ public RemoveFromClusterNodeLabelsResponse removeFromClusterNodeLabels(
|
|||
@Override
|
||||
public ReplaceLabelsOnNodeResponse replaceLabelsOnNode(
|
||||
ReplaceLabelsOnNodeRequest request) throws YarnException, IOException {
|
||||
String operation = "replaceLabelsOnNode";
|
||||
final String operation = "replaceLabelsOnNode";
|
||||
final String msg = "set node to labels.";
|
||||
|
||||
try {
|
||||
|
|
@ -810,15 +813,16 @@ private YarnException logAndWrapException(Exception exception, String user,
|
|||
public CheckForDecommissioningNodesResponse checkForDecommissioningNodes(
|
||||
CheckForDecommissioningNodesRequest checkForDecommissioningNodesRequest)
|
||||
throws IOException, YarnException {
|
||||
String argName = "checkForDecommissioningNodes";
|
||||
final String operation = "checkForDecommissioningNodes";
|
||||
final String msg = "check for decommissioning nodes.";
|
||||
UserGroupInformation user = checkAcls("checkForDecommissioningNodes");
|
||||
|
||||
checkRMStatus(user.getShortUserName(), argName, msg);
|
||||
checkRMStatus(user.getShortUserName(), operation, msg);
|
||||
|
||||
Set<NodeId> decommissioningNodes = rmContext.getNodesListManager()
|
||||
.checkForDecommissioningNodes();
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), argName, "AdminService");
|
||||
RMAuditLogger.logSuccess(user.getShortUserName(), operation,
|
||||
"AdminService");
|
||||
CheckForDecommissioningNodesResponse response = recordFactory
|
||||
.newRecordInstance(CheckForDecommissioningNodesResponse.class);
|
||||
response.setDecommissioningNodes(decommissioningNodes);
|
||||
|
|
@ -829,11 +833,11 @@ public CheckForDecommissioningNodesResponse checkForDecommissioningNodes(
|
|||
public RefreshClusterMaxPriorityResponse refreshClusterMaxPriority(
|
||||
RefreshClusterMaxPriorityRequest request) throws YarnException,
|
||||
IOException {
|
||||
String argName = "refreshClusterMaxPriority";
|
||||
String msg = "refresh cluster max priority";
|
||||
UserGroupInformation user = checkAcls(argName);
|
||||
final String operation = "refreshClusterMaxPriority";
|
||||
final String msg = "refresh cluster max priority";
|
||||
UserGroupInformation user = checkAcls(operation);
|
||||
|
||||
checkRMStatus(user.getShortUserName(), argName, msg);
|
||||
checkRMStatus(user.getShortUserName(), operation, msg);
|
||||
try {
|
||||
Configuration conf =
|
||||
getConfiguration(new Configuration(false),
|
||||
|
|
@ -842,11 +846,11 @@ public RefreshClusterMaxPriorityResponse refreshClusterMaxPriority(
|
|||
rmContext.getScheduler().setClusterMaxPriority(conf);
|
||||
|
||||
RMAuditLogger
|
||||
.logSuccess(user.getShortUserName(), argName, "AdminService");
|
||||
.logSuccess(user.getShortUserName(), operation, "AdminService");
|
||||
return recordFactory
|
||||
.newRecordInstance(RefreshClusterMaxPriorityResponse.class);
|
||||
} catch (YarnException e) {
|
||||
throw logAndWrapException(e, user.getShortUserName(), argName, msg);
|
||||
throw logAndWrapException(e, user.getShortUserName(), operation, msg);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue