YARN-11409. Fix Typo of ResourceManager#webapp moudle. (#5285)

This commit is contained in:
slfan1989 2023-01-13 11:53:13 +08:00 committed by GitHub
parent 4520448327
commit 168fa07801
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 23 deletions

View File

@ -27,7 +27,7 @@
/** /**
* DeSelectFields make the <code>/apps</code> api more flexible. * DeSelectFields make the <code>/apps</code> api more flexible.
* It can be used to strip off more fields if there's such use case in future. * It can be used to strip off more fields if there's such use case in the future.
* You can simply extend it via two steps: * You can simply extend it via two steps:
* <br> 1. add a <code>DeSelectType</code> enum with a string literals * <br> 1. add a <code>DeSelectType</code> enum with a string literals
* <br> 2. write your logical based on * <br> 2. write your logical based on
@ -60,10 +60,10 @@ public void initFields(Set<String> unselectedFields) {
if (type == null) { if (type == null) {
LOG.warn("Invalid deSelects string " + literals.trim()); LOG.warn("Invalid deSelects string " + literals.trim());
DeSelectType[] typeArray = DeSelectType.values(); DeSelectType[] typeArray = DeSelectType.values();
String allSuppportLiterals = Arrays.toString(typeArray); String allSupportLiterals = Arrays.toString(typeArray);
throw new BadRequestException("Invalid deSelects string " throw new BadRequestException("Invalid deSelects string "
+ literals.trim() + " specified. It should be one of " + literals.trim() + " specified. It should be one of "
+ allSuppportLiterals); + allSupportLiterals);
} else { } else {
this.types.add(type); this.types.add(type);
} }
@ -74,7 +74,7 @@ public void initFields(Set<String> unselectedFields) {
} }
/** /**
* Determine the deselect type should be handled or not. * Determine to deselect type should be handled or not.
* @param type deselected type * @param type deselected type
* @return true if the deselect type should be handled * @return true if the deselect type should be handled
*/ */
@ -83,7 +83,7 @@ public boolean contains(DeSelectType type) {
} }
/** /**
* Deselect field type, can be boost in future. * Deselect field type, can be boosted in the future.
*/ */
public enum DeSelectType { public enum DeSelectType {

View File

@ -215,7 +215,7 @@ ActivitiesInfo getActivities(HttpServletRequest hsr, String nodeId,
String groupBy); String groupBy);
/** /**
* This method retrieve the last n activities inside scheduler and it is * This method retrieve the last n activities inside scheduler, and it is
* reachable by using {@link RMWSConsts#SCHEDULER_BULK_ACTIVITIES}. * reachable by using {@link RMWSConsts#SCHEDULER_BULK_ACTIVITIES}.
* *
* @param hsr the servlet request * @param hsr the servlet request
@ -633,7 +633,7 @@ Response updateReservation(ReservationUpdateRequestInfo resContext,
* @throws IOException when a {@link ReservationDeleteRequest} cannot be * @throws IOException when a {@link ReservationDeleteRequest} cannot be
* created from the {@link ReservationDeleteRequestInfo}. This * created from the {@link ReservationDeleteRequestInfo}. This
* exception is also thrown on * exception is also thrown on
* {@code ClientRMService.deleteReservation} invokation failure. * {@code ClientRMService.deleteReservation} invocation failure.
* @throws InterruptedException if doAs action throws an InterruptedException. * @throws InterruptedException if doAs action throws an InterruptedException.
*/ */
Response deleteReservation(ReservationDeleteRequestInfo resContext, Response deleteReservation(ReservationDeleteRequestInfo resContext,
@ -719,7 +719,7 @@ Response updateApplicationTimeout(AppTimeoutInfo appTimeout,
AppAttemptsInfo getAppAttempts(HttpServletRequest hsr, String appId); AppAttemptsInfo getAppAttempts(HttpServletRequest hsr, String appId);
/** /**
* This method verifies if an user has access to a specified queue. * This method verifies if a user has access to a specified queue.
* *
* @return Response containing the status code. * @return Response containing the status code.
* *

View File

@ -323,7 +323,7 @@ private void initForReadableEndpoints() {
* @param doAdminACLsCheck * @param doAdminACLsCheck
* boolean flag to indicate whether ACLs check is needed * boolean flag to indicate whether ACLs check is needed
* @throws AuthorizationException * @throws AuthorizationException
* in case of no access to perfom this op. * in case of no access to perform this op.
*/ */
private void initForWritableEndpoints(UserGroupInformation callerUGI, private void initForWritableEndpoints(UserGroupInformation callerUGI,
boolean doAdminACLsCheck) throws AuthorizationException { boolean doAdminACLsCheck) throws AuthorizationException {
@ -768,7 +768,7 @@ public ActivitiesInfo getActivities(@Context HttpServletRequest hsr,
return activitiesManager.getActivitiesInfo(nodeId, activitiesGroupBy); return activitiesManager.getActivitiesInfo(nodeId, activitiesGroupBy);
} }
// Return a activities info with error message // Return an activities info with error message
return new ActivitiesInfo(errMessage, nodeId); return new ActivitiesInfo(errMessage, nodeId);
} }
@ -965,10 +965,10 @@ private Set<String> getFlatSet(Set<String> set) {
for (String action : actions) { for (String action : actions) {
if (!EnumUtils.isValidEnum(RMWSConsts.AppActivitiesRequiredAction.class, if (!EnumUtils.isValidEnum(RMWSConsts.AppActivitiesRequiredAction.class,
action.toUpperCase())) { action.toUpperCase())) {
String errMesasge = String errMessage =
"Got invalid action: " + action + ", valid actions: " + Arrays "Got invalid action: " + action + ", valid actions: " + Arrays
.asList(RMWSConsts.AppActivitiesRequiredAction.values()); .asList(RMWSConsts.AppActivitiesRequiredAction.values());
throw new IllegalArgumentException(errMesasge); throw new IllegalArgumentException(errMessage);
} }
requiredActions.add(RMWSConsts.AppActivitiesRequiredAction requiredActions.add(RMWSConsts.AppActivitiesRequiredAction
.valueOf(action.toUpperCase())); .valueOf(action.toUpperCase()));
@ -981,10 +981,10 @@ private RMWSConsts.ActivitiesGroupBy parseActivitiesGroupBy(String groupBy) {
if (groupBy != null) { if (groupBy != null) {
if (!EnumUtils.isValidEnum(RMWSConsts.ActivitiesGroupBy.class, if (!EnumUtils.isValidEnum(RMWSConsts.ActivitiesGroupBy.class,
groupBy.toUpperCase())) { groupBy.toUpperCase())) {
String errMesasge = String errMessage =
"Got invalid groupBy: " + groupBy + ", valid groupBy types: " "Got invalid groupBy: " + groupBy + ", valid groupBy types: "
+ Arrays.asList(RMWSConsts.ActivitiesGroupBy.values()); + Arrays.asList(RMWSConsts.ActivitiesGroupBy.values());
throw new IllegalArgumentException(errMesasge); throw new IllegalArgumentException(errMessage);
} }
return RMWSConsts.ActivitiesGroupBy.valueOf(groupBy.toUpperCase()); return RMWSConsts.ActivitiesGroupBy.valueOf(groupBy.toUpperCase());
} }
@ -2328,7 +2328,7 @@ private ReservationUpdateRequest createReservationUpdateRequest(
} }
if (resContext.getReservationId() == null) { if (resContext.getReservationId() == null) {
throw new BadRequestException( throw new BadRequestException(
"Update operations must specify an existing ReservaitonId"); "Update operations must specify an existing ReservationId");
} }
ReservationRequestInterpreter[] values = ReservationRequestInterpreter[] values =
@ -2700,7 +2700,7 @@ public Response formatSchedulerConfiguration(@Context HttpServletRequest hsr)
return Response.status(Status.OK).entity("Configuration under " + return Response.status(Status.OK).entity("Configuration under " +
"store successfully formatted.").build(); "store successfully formatted.").build();
} catch (Exception e) { } catch (Exception e) {
LOG.error("Exception thrown when formating configuration", e); LOG.error("Exception thrown when formatting configuration", e);
return Response.status(Status.BAD_REQUEST).entity(e.getMessage()) return Response.status(Status.BAD_REQUEST).entity(e.getMessage())
.build(); .build();
} }
@ -2906,7 +2906,7 @@ public RMQueueAclInfo checkUserAccessToQueue(
initForReadableEndpoints(); initForReadableEndpoints();
// For the user who invokes this REST call, he/she should have admin access // For the user who invokes this REST call, he/she should have admin access
// to the queue. Otherwise we will reject the call. // to the queue. Otherwise, we will reject the call.
UserGroupInformation callerUGI = getCallerUserGroupInformation(hsr, true); UserGroupInformation callerUGI = getCallerUserGroupInformation(hsr, true);
if (callerUGI != null && !this.rm.getResourceScheduler().checkAccess( if (callerUGI != null && !this.rm.getResourceScheduler().checkAccess(
callerUGI, QueueACL.ADMINISTER_QUEUE, queue)) { callerUGI, QueueACL.ADMINISTER_QUEUE, queue)) {

View File

@ -37,7 +37,7 @@
import com.google.inject.Inject; import com.google.inject.Inject;
// Do NOT rename/refactor this to RMView as it will wreak havoc // Do NOT rename/refactor this to RMView as it will wreak havoc
// on Mac OS HFS as its case-insensitive! // on macOS HFS as its case-insensitive!
public class RmController extends Controller { public class RmController extends Controller {
@Inject @Inject

View File

@ -27,7 +27,7 @@
import static org.apache.hadoop.yarn.webapp.view.JQueryUI.*; import static org.apache.hadoop.yarn.webapp.view.JQueryUI.*;
// Do NOT rename/refactor this to RMView as it will wreak havoc // Do NOT rename/refactor this to RMView as it will wreak havoc
// on Mac OS HFS // on macOS HFS
public class RmView extends TwoColumnLayout { public class RmView extends TwoColumnLayout {
static final int MAX_DISPLAY_ROWS = 100; // direct table rendering static final int MAX_DISPLAY_ROWS = 100; // direct table rendering
static final int MAX_FAST_ROWS = 1000; // inline js array static final int MAX_FAST_ROWS = 1000; // inline js array

View File

@ -61,7 +61,7 @@ public class CapacitySchedulerLeafQueueInfo extends CapacitySchedulerQueueInfo {
protected String orderingPolicyDisplayName; protected String orderingPolicyDisplayName;
CapacitySchedulerLeafQueueInfo() { CapacitySchedulerLeafQueueInfo() {
}; }
CapacitySchedulerLeafQueueInfo(CapacityScheduler cs, AbstractLeafQueue q) { CapacitySchedulerLeafQueueInfo(CapacityScheduler cs, AbstractLeafQueue q) {
super(cs, q); super(cs, q);

View File

@ -96,7 +96,7 @@ public class CapacitySchedulerQueueInfo {
new AutoQueueTemplatePropertiesInfo(); new AutoQueueTemplatePropertiesInfo();
CapacitySchedulerQueueInfo() { CapacitySchedulerQueueInfo() {
}; }
CapacitySchedulerQueueInfo(CapacityScheduler cs, CSQueue q) { CapacitySchedulerQueueInfo(CapacityScheduler cs, CSQueue q) {

View File

@ -49,7 +49,7 @@ public ResourceInfo getResourceAvailable() {
/** /**
* This method will generate a new PartitionInfo object based on two PartitionInfo objects. * This method will generate a new PartitionInfo object based on two PartitionInfo objects.
* The combination process is mainly based on the Resources.add method. * The combination process is mainly based on the Resources. Add method.
* *
* @param left left PartitionInfo Object. * @param left left PartitionInfo Object.
* @param right right PartitionInfo Object. * @param right right PartitionInfo Object.

View File

@ -23,7 +23,7 @@
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
/** /**
* Simple class that represent a reponse to a delete operation. * Simple class that represent a response to a delete operation.
*/ */
@XmlRootElement(name = "reservation-delete-response") @XmlRootElement(name = "reservation-delete-response")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)