YARN-6789. Add Client API to get all supported resource types from RM. (Sunil G via wangda)
Change-Id: I366d8db6f6700acd087db5acb7a1be7e41b2b68d
This commit is contained in:
parent
b1fe3a222e
commit
df3855541a
@ -67,6 +67,7 @@
|
||||
import org.apache.hadoop.yarn.api.records.Priority;
|
||||
import org.apache.hadoop.yarn.api.records.QueueUserACLInfo;
|
||||
import org.apache.hadoop.yarn.api.records.Resource;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceTypeInfo;
|
||||
import org.apache.hadoop.yarn.api.records.SignalContainerCommand;
|
||||
import org.apache.hadoop.yarn.api.records.YarnApplicationState;
|
||||
import org.apache.hadoop.yarn.api.records.YarnClusterMetrics;
|
||||
@ -530,4 +531,10 @@ public Resource getResourceProfile(String profile)
|
||||
throws YarnException, IOException {
|
||||
return client.getResourceProfile(profile);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ResourceTypeInfo> getResourceTypeInfo()
|
||||
throws YarnException, IOException {
|
||||
return client.getResourceTypeInfo();
|
||||
}
|
||||
}
|
||||
|
@ -74,6 +74,8 @@
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
|
||||
@ -511,6 +513,13 @@ public GetResourceProfileResponse getResourceProfile(
|
||||
GetResourceProfileRequest request) throws YarnException, IOException {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public GetAllResourceTypeInfoResponse getResourceTypeInfo(
|
||||
GetAllResourceTypeInfoRequest request)
|
||||
throws YarnException, IOException {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
class HistoryService extends AMService implements HSClientProtocol {
|
||||
|
@ -67,6 +67,8 @@
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
|
||||
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
|
||||
@ -625,5 +627,18 @@ GetAllResourceProfilesResponse getResourceProfiles(
|
||||
GetResourceProfileResponse getResourceProfile(
|
||||
GetResourceProfileRequest request) throws YarnException, IOException;
|
||||
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* The interface to get the details for a specific resource profile.
|
||||
* </p>
|
||||
* @param request request to get the details of a resource profile
|
||||
* @return Response containing the details for a particular resource profile
|
||||
* @throws YarnException if resource profiles are not enabled on the RM or
|
||||
* the profile cannot be found
|
||||
* @throws IOException in case of other errors
|
||||
*/
|
||||
@Public
|
||||
@Unstable
|
||||
GetAllResourceTypeInfoResponse getResourceTypeInfo(
|
||||
GetAllResourceTypeInfoRequest request) throws YarnException, IOException;
|
||||
}
|
||||
|
@ -0,0 +1,35 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.hadoop.yarn.api.protocolrecords;
|
||||
|
||||
import org.apache.hadoop.classification.InterfaceAudience;
|
||||
import org.apache.hadoop.classification.InterfaceStability;
|
||||
import org.apache.hadoop.yarn.util.Records;
|
||||
|
||||
/**
|
||||
* Request class for getting all the resource profiles from the RM.
|
||||
*/
|
||||
@InterfaceAudience.Public
|
||||
@InterfaceStability.Unstable
|
||||
public abstract class GetAllResourceTypeInfoRequest {
|
||||
|
||||
public static GetAllResourceTypeInfoRequest newInstance() {
|
||||
return Records.newRecord(GetAllResourceTypeInfoRequest.class);
|
||||
}
|
||||
}
|
@ -0,0 +1,60 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.hadoop.yarn.api.protocolrecords;
|
||||
|
||||
import org.apache.hadoop.classification.InterfaceAudience;
|
||||
import org.apache.hadoop.classification.InterfaceStability;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceTypeInfo;
|
||||
import org.apache.hadoop.yarn.util.Records;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Response class for getting all the resource profiles from the RM.
|
||||
*/
|
||||
@InterfaceAudience.Public
|
||||
@InterfaceStability.Unstable
|
||||
public abstract class GetAllResourceTypeInfoResponse {
|
||||
|
||||
public static GetAllResourceTypeInfoResponse newInstance() {
|
||||
return Records.newRecord(GetAllResourceTypeInfoResponse.class);
|
||||
}
|
||||
|
||||
public abstract void setResourceTypeInfo(List<ResourceTypeInfo> resourceTypes);
|
||||
|
||||
public abstract List<ResourceTypeInfo> getResourceTypeInfo();
|
||||
|
||||
@Override
|
||||
public boolean equals(Object other) {
|
||||
if (this == other) {
|
||||
return true;
|
||||
}
|
||||
if (other == null || !(other instanceof GetAllResourceTypeInfoResponse)) {
|
||||
return false;
|
||||
}
|
||||
return ((GetAllResourceTypeInfoResponse) other).getResourceTypeInfo()
|
||||
.equals(this.getResourceTypeInfo());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return this.getResourceTypeInfo().hashCode();
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,196 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.hadoop.yarn.api.records;
|
||||
|
||||
import org.apache.hadoop.classification.InterfaceAudience;
|
||||
import org.apache.hadoop.classification.InterfaceAudience.Public;
|
||||
import org.apache.hadoop.classification.InterfaceStability;
|
||||
import org.apache.hadoop.classification.InterfaceStability.Evolving;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.ResourceTypes;
|
||||
import org.apache.hadoop.yarn.util.Records;
|
||||
|
||||
/**
|
||||
* Class to encapsulate information about a ResourceType - the name of the
|
||||
* resource, the units(milli, micro, etc), the type(countable).
|
||||
*/
|
||||
public abstract class ResourceTypeInfo implements Comparable<ResourceTypeInfo> {
|
||||
|
||||
/**
|
||||
* Get the name for the resource.
|
||||
*
|
||||
* @return resource name
|
||||
*/
|
||||
public abstract String getName();
|
||||
|
||||
/**
|
||||
* Set the name for the resource.
|
||||
*
|
||||
* @param rName
|
||||
* name for the resource
|
||||
*/
|
||||
public abstract void setName(String rName);
|
||||
|
||||
/**
|
||||
* Get units for the resource.
|
||||
*
|
||||
* @return units for the resource
|
||||
*/
|
||||
public abstract String getDefaultUnit();
|
||||
|
||||
/**
|
||||
* Set the units for the resource.
|
||||
*
|
||||
* @param rUnits
|
||||
* units for the resource
|
||||
*/
|
||||
public abstract void setDefaultUnit(String rUnits);
|
||||
|
||||
/**
|
||||
* Get the resource type.
|
||||
*
|
||||
* @return the resource type
|
||||
*/
|
||||
public abstract ResourceTypes getResourceType();
|
||||
|
||||
/**
|
||||
* Set the resource type.
|
||||
*
|
||||
* @param type
|
||||
* the resource type
|
||||
*/
|
||||
public abstract void setResourceType(ResourceTypes type);
|
||||
|
||||
/**
|
||||
* Create a new instance of ResourceTypeInfo from another object.
|
||||
*
|
||||
* @param other
|
||||
* the object from which the new object should be created
|
||||
* @return the new ResourceTypeInfo object
|
||||
*/
|
||||
@InterfaceAudience.Public
|
||||
@InterfaceStability.Unstable
|
||||
public static ResourceTypeInfo newInstance(ResourceTypeInfo other) {
|
||||
ResourceTypeInfo resourceType = Records.newRecord(ResourceTypeInfo.class);
|
||||
copy(other, resourceType);
|
||||
return resourceType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new instance of ResourceTypeInfo from name, units and type.
|
||||
*
|
||||
* @param name name of resource type
|
||||
* @param units units of resource type
|
||||
* @param type such as countable, etc.
|
||||
* @return the new ResourceTypeInfo object
|
||||
*/
|
||||
@InterfaceAudience.Public
|
||||
@InterfaceStability.Unstable
|
||||
public static ResourceTypeInfo newInstance(String name, String units,
|
||||
ResourceTypes type) {
|
||||
ResourceTypeInfo resourceType = Records.newRecord(ResourceTypeInfo.class);
|
||||
resourceType.setName(name);
|
||||
resourceType.setResourceType(type);
|
||||
resourceType.setDefaultUnit(units);
|
||||
return resourceType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new instance of ResourceTypeInfo from name, units
|
||||
*
|
||||
* @param name name of resource type
|
||||
* @param units units of resource type
|
||||
* @return the new ResourceTypeInfo object
|
||||
*/
|
||||
@InterfaceAudience.Public
|
||||
@InterfaceStability.Unstable
|
||||
public static ResourceTypeInfo newInstance(String name, String units) {
|
||||
return ResourceTypeInfo.newInstance(name, units, ResourceTypes.COUNTABLE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new instance of ResourceTypeInfo from name
|
||||
*
|
||||
* @param name name of resource type
|
||||
* @return the new ResourceTypeInfo object
|
||||
*/
|
||||
@InterfaceAudience.Public
|
||||
@InterfaceStability.Unstable
|
||||
public static ResourceTypeInfo newInstance(String name) {
|
||||
return ResourceTypeInfo.newInstance(name, "");
|
||||
}
|
||||
|
||||
/**
|
||||
* Copies the content of the source ResourceTypeInfo object to the
|
||||
* destination object, overwriting all properties of the destination object.
|
||||
*
|
||||
* @param src
|
||||
* Source ResourceTypeInfo object
|
||||
* @param dst
|
||||
* Destination ResourceTypeInfo object
|
||||
*/
|
||||
|
||||
public static void copy(ResourceTypeInfo src, ResourceTypeInfo dst) {
|
||||
dst.setName(src.getName());
|
||||
dst.setResourceType(src.getResourceType());
|
||||
dst.setDefaultUnit(src.getDefaultUnit());
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "name: " + this.getName() + ", units: " + this.getDefaultUnit()
|
||||
+ ", type: " + getResourceType();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj) {
|
||||
return true;
|
||||
}
|
||||
if (obj == null) {
|
||||
return false;
|
||||
}
|
||||
if (!(obj instanceof ResourceTypeInfo)) {
|
||||
return false;
|
||||
}
|
||||
ResourceTypeInfo r = (ResourceTypeInfo) obj;
|
||||
return this.getName().equals(r.getName())
|
||||
&& this.getResourceType().equals(r.getResourceType())
|
||||
&& this.getDefaultUnit().equals(r.getDefaultUnit());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 47;
|
||||
int result = prime + getName().hashCode();
|
||||
result = prime * result + getResourceType().hashCode();
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int compareTo(ResourceTypeInfo other) {
|
||||
int diff = this.getName().compareTo(other.getName());
|
||||
if (diff == 0) {
|
||||
diff = this.getDefaultUnit().compareTo(other.getDefaultUnit());
|
||||
if (diff == 0) {
|
||||
diff = this.getResourceType().compareTo(other.getResourceType());
|
||||
}
|
||||
}
|
||||
return diff;
|
||||
}
|
||||
}
|
@ -548,4 +548,17 @@ public static Resource getResourceTypesMaximumAllocation() {
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get default unit by given resource type.
|
||||
* @param resourceType resourceType
|
||||
* @return default unit
|
||||
*/
|
||||
public static String getDefaultUnit(String resourceType) {
|
||||
ResourceInformation ri = getResourceTypes().get(resourceType);
|
||||
if (null != ri) {
|
||||
return ri.getUnits();
|
||||
}
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
@ -63,4 +63,5 @@ service ApplicationClientProtocolService {
|
||||
rpc updateApplicationTimeouts (UpdateApplicationTimeoutsRequestProto) returns (UpdateApplicationTimeoutsResponseProto);
|
||||
rpc getResourceProfiles(GetAllResourceProfilesRequestProto) returns (GetAllResourceProfilesResponseProto);
|
||||
rpc getResourceProfile(GetResourceProfileRequestProto) returns (GetResourceProfileResponseProto);
|
||||
rpc getResourceTypeInfo(GetAllResourceTypeInfoRequestProto) returns (GetAllResourceTypeInfoResponseProto);
|
||||
}
|
||||
|
@ -64,6 +64,12 @@ message ResourceInformationProto {
|
||||
optional ResourceTypesProto type = 4;
|
||||
}
|
||||
|
||||
message ResourceTypeInfoProto {
|
||||
required string name = 1;
|
||||
optional string units = 2;
|
||||
optional ResourceTypesProto type = 3;
|
||||
}
|
||||
|
||||
message ResourceProto {
|
||||
optional int64 memory = 1;
|
||||
optional int32 virtual_cores = 2;
|
||||
|
@ -295,6 +295,13 @@ message GetResourceProfileResponseProto {
|
||||
required ResourceProto resources = 1;
|
||||
}
|
||||
|
||||
message GetAllResourceTypeInfoRequestProto {
|
||||
}
|
||||
|
||||
message GetAllResourceTypeInfoResponseProto {
|
||||
repeated ResourceTypeInfoProto resource_type_info = 1;
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////
|
||||
/////// client_NM_Protocol ///////////////////////////
|
||||
//////////////////////////////////////////////////////
|
||||
|
@ -62,6 +62,7 @@
|
||||
import org.apache.hadoop.yarn.api.records.ReservationDefinition;
|
||||
import org.apache.hadoop.yarn.api.records.ReservationId;
|
||||
import org.apache.hadoop.yarn.api.records.Resource;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceTypeInfo;
|
||||
import org.apache.hadoop.yarn.api.records.SignalContainerCommand;
|
||||
import org.apache.hadoop.yarn.api.records.Token;
|
||||
import org.apache.hadoop.yarn.api.records.YarnApplicationState;
|
||||
@ -865,6 +866,8 @@ public UpdateApplicationTimeoutsResponse updateApplicationTimeouts(
|
||||
* @throws YarnException if resource profiles are not enabled
|
||||
* @throws IOException in case of other errors
|
||||
*/
|
||||
@Public
|
||||
@Unstable
|
||||
public abstract Map<String, Resource> getResourceProfiles()
|
||||
throws YarnException, IOException;
|
||||
|
||||
@ -878,6 +881,22 @@ public abstract Map<String, Resource> getResourceProfiles()
|
||||
* cannot be found
|
||||
* @throws IOException in case of other others
|
||||
*/
|
||||
@Public
|
||||
@Unstable
|
||||
public abstract Resource getResourceProfile(String profile)
|
||||
throws YarnException, IOException;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* Get available resource types supported by RM.
|
||||
* </p>
|
||||
* @return list of supported resource types with detailed information
|
||||
* @throws YarnException if resource profiles are not enabled or the profile
|
||||
* cannot be found
|
||||
* @throws IOException in case of other others
|
||||
*/
|
||||
@Public
|
||||
@Unstable
|
||||
public abstract List<ResourceTypeInfo> getResourceTypeInfo()
|
||||
throws YarnException, IOException;
|
||||
}
|
||||
|
@ -44,6 +44,7 @@
|
||||
import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
|
||||
@ -104,6 +105,7 @@
|
||||
import org.apache.hadoop.yarn.api.records.QueueInfo;
|
||||
import org.apache.hadoop.yarn.api.records.QueueUserACLInfo;
|
||||
import org.apache.hadoop.yarn.api.records.Resource;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceTypeInfo;
|
||||
import org.apache.hadoop.yarn.api.records.SignalContainerCommand;
|
||||
import org.apache.hadoop.yarn.api.records.Token;
|
||||
import org.apache.hadoop.yarn.api.records.YarnApplicationState;
|
||||
@ -952,8 +954,16 @@ public Map<String, Resource> getResourceProfiles()
|
||||
@Override
|
||||
public Resource getResourceProfile(String profile)
|
||||
throws YarnException, IOException {
|
||||
GetResourceProfileRequest request =
|
||||
GetResourceProfileRequest.newInstance(profile);
|
||||
GetResourceProfileRequest request = GetResourceProfileRequest
|
||||
.newInstance(profile);
|
||||
return rmClient.getResourceProfile(request).getResource();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ResourceTypeInfo> getResourceTypeInfo()
|
||||
throws YarnException, IOException {
|
||||
GetAllResourceTypeInfoRequest request =
|
||||
GetAllResourceTypeInfoRequest.newInstance();
|
||||
return rmClient.getResourceTypeInfo(request).getResourceTypeInfo();
|
||||
}
|
||||
}
|
||||
|
@ -91,6 +91,8 @@
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.CancelDelegationTokenRequestPBImpl;
|
||||
@ -153,6 +155,8 @@
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.SubmitApplicationResponsePBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetAllResourceProfilesRequestPBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetAllResourceProfilesResponsePBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetAllResourceTypeInfoRequestPBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetAllResourceTypeInfoResponsePBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetResourceProfileRequestPBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetResourceProfileResponsePBImpl;
|
||||
import org.apache.hadoop.yarn.exceptions.YarnException;
|
||||
@ -655,4 +659,18 @@ public GetResourceProfileResponse getResourceProfile(
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public GetAllResourceTypeInfoResponse getResourceTypeInfo(
|
||||
GetAllResourceTypeInfoRequest request) throws YarnException, IOException {
|
||||
YarnServiceProtos.GetAllResourceTypeInfoRequestProto requestProto =
|
||||
((GetAllResourceTypeInfoRequestPBImpl) request).getProto();
|
||||
try {
|
||||
return new GetAllResourceTypeInfoResponsePBImpl(
|
||||
proxy.getResourceTypeInfo(null, requestProto));
|
||||
} catch (ServiceException e) {
|
||||
RPCUtil.unwrapAndThrowException(e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -59,6 +59,7 @@
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.SignalContainerResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.CancelDelegationTokenRequestPBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.CancelDelegationTokenResponsePBImpl;
|
||||
@ -120,6 +121,8 @@
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.SubmitApplicationResponsePBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetAllResourceProfilesRequestPBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetAllResourceProfilesResponsePBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetAllResourceTypeInfoRequestPBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetAllResourceTypeInfoResponsePBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetResourceProfileRequestPBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetResourceProfileResponsePBImpl;
|
||||
import org.apache.hadoop.yarn.exceptions.YarnException;
|
||||
@ -176,6 +179,8 @@
|
||||
import org.apache.hadoop.yarn.proto.YarnServiceProtos.SubmitApplicationRequestProto;
|
||||
import org.apache.hadoop.yarn.proto.YarnServiceProtos.SubmitApplicationResponseProto;
|
||||
import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetAllResourceProfilesResponseProto;
|
||||
import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetAllResourceTypeInfoRequestProto;
|
||||
import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetAllResourceTypeInfoResponseProto;
|
||||
import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetAllResourceProfilesRequestProto;
|
||||
import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetResourceProfileRequestProto;
|
||||
import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetResourceProfileResponseProto;
|
||||
@ -673,4 +678,20 @@ public GetResourceProfileResponseProto getResourceProfile(
|
||||
throw new ServiceException(ie);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public GetAllResourceTypeInfoResponseProto getResourceTypeInfo(
|
||||
RpcController controller, GetAllResourceTypeInfoRequestProto proto)
|
||||
throws ServiceException {
|
||||
GetAllResourceTypeInfoRequestPBImpl req = new GetAllResourceTypeInfoRequestPBImpl(
|
||||
proto);
|
||||
try {
|
||||
GetAllResourceTypeInfoResponse resp = real.getResourceTypeInfo(req);
|
||||
return ((GetAllResourceTypeInfoResponsePBImpl) resp).getProto();
|
||||
} catch (YarnException ye) {
|
||||
throw new ServiceException(ye);
|
||||
} catch (IOException ie) {
|
||||
throw new ServiceException(ie);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,70 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.hadoop.yarn.api.protocolrecords.impl.pb;
|
||||
|
||||
import org.apache.hadoop.classification.InterfaceAudience;
|
||||
import org.apache.hadoop.classification.InterfaceStability;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
|
||||
import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetAllResourceTypeInfoRequestProto;
|
||||
|
||||
/**
|
||||
* Protobuf implementation class for GetAllResourceTypeInfoRequest.
|
||||
*/
|
||||
@InterfaceAudience.Private
|
||||
@InterfaceStability.Unstable
|
||||
public class GetAllResourceTypeInfoRequestPBImpl
|
||||
extends GetAllResourceTypeInfoRequest {
|
||||
|
||||
private GetAllResourceTypeInfoRequestProto proto =
|
||||
GetAllResourceTypeInfoRequestProto.getDefaultInstance();
|
||||
private GetAllResourceTypeInfoRequestProto.Builder builder = null;
|
||||
|
||||
private boolean viaProto = false;
|
||||
|
||||
public GetAllResourceTypeInfoRequestPBImpl() {
|
||||
builder = GetAllResourceTypeInfoRequestProto.newBuilder();
|
||||
}
|
||||
|
||||
public GetAllResourceTypeInfoRequestPBImpl(
|
||||
GetAllResourceTypeInfoRequestProto proto) {
|
||||
this.proto = proto;
|
||||
viaProto = true;
|
||||
}
|
||||
|
||||
public GetAllResourceTypeInfoRequestProto getProto() {
|
||||
proto = viaProto ? proto : builder.build();
|
||||
viaProto = true;
|
||||
return proto;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return getProto().hashCode();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object other) {
|
||||
if (other == null)
|
||||
return false;
|
||||
if (other.getClass().isAssignableFrom(this.getClass())) {
|
||||
return this.getProto().equals(this.getClass().cast(other).getProto());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
@ -0,0 +1,184 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.hadoop.yarn.api.protocolrecords.impl.pb;
|
||||
|
||||
import org.apache.hadoop.classification.InterfaceAudience;
|
||||
import org.apache.hadoop.classification.InterfaceStability;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceTypeInfo;
|
||||
import org.apache.hadoop.yarn.api.records.impl.pb.ResourceTypeInfoPBImpl;
|
||||
import org.apache.hadoop.yarn.proto.YarnProtos.ResourceTypeInfoProto;
|
||||
import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetAllResourceTypeInfoResponseProto;
|
||||
import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetAllResourceTypeInfoResponseProtoOrBuilder;
|
||||
|
||||
import com.google.protobuf.TextFormat;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Protobuf implementation class for the GetAllResourceTypeInfoResponse.
|
||||
*/
|
||||
@InterfaceAudience.Private
|
||||
@InterfaceStability.Unstable
|
||||
public class GetAllResourceTypeInfoResponsePBImpl
|
||||
extends
|
||||
GetAllResourceTypeInfoResponse {
|
||||
|
||||
private GetAllResourceTypeInfoResponseProto proto = GetAllResourceTypeInfoResponseProto
|
||||
.getDefaultInstance();
|
||||
private GetAllResourceTypeInfoResponseProto.Builder builder = null;
|
||||
private boolean viaProto = false;
|
||||
|
||||
private List<ResourceTypeInfo> resourceTypeInfo;
|
||||
|
||||
public GetAllResourceTypeInfoResponsePBImpl() {
|
||||
builder = GetAllResourceTypeInfoResponseProto.newBuilder();
|
||||
}
|
||||
|
||||
public GetAllResourceTypeInfoResponsePBImpl(
|
||||
GetAllResourceTypeInfoResponseProto proto) {
|
||||
this.proto = proto;
|
||||
viaProto = true;
|
||||
}
|
||||
|
||||
public GetAllResourceTypeInfoResponseProto getProto() {
|
||||
mergeLocalToProto();
|
||||
proto = viaProto ? proto : builder.build();
|
||||
viaProto = true;
|
||||
return proto;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return getProto().hashCode();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setResourceTypeInfo(List<ResourceTypeInfo> resourceTypes) {
|
||||
if (resourceTypeInfo == null) {
|
||||
builder.clearResourceTypeInfo();
|
||||
}
|
||||
this.resourceTypeInfo = resourceTypes;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ResourceTypeInfo> getResourceTypeInfo() {
|
||||
initResourceTypeInfosList();
|
||||
return this.resourceTypeInfo;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object other) {
|
||||
if (other == null) {
|
||||
return false;
|
||||
}
|
||||
if (other.getClass().isAssignableFrom(this.getClass())) {
|
||||
return this.getProto().equals(this.getClass().cast(other).getProto());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return TextFormat.shortDebugString(getProto());
|
||||
}
|
||||
|
||||
private void mergeLocalToBuilder() {
|
||||
if (this.resourceTypeInfo != null) {
|
||||
addResourceTypeInfosToProto();
|
||||
}
|
||||
}
|
||||
|
||||
private void mergeLocalToProto() {
|
||||
if (viaProto) {
|
||||
maybeInitBuilder();
|
||||
}
|
||||
mergeLocalToBuilder();
|
||||
proto = builder.build();
|
||||
viaProto = true;
|
||||
}
|
||||
|
||||
private void maybeInitBuilder() {
|
||||
if (viaProto || builder == null) {
|
||||
builder = GetAllResourceTypeInfoResponseProto.newBuilder(proto);
|
||||
}
|
||||
viaProto = false;
|
||||
}
|
||||
|
||||
// Once this is called. containerList will never be null - until a getProto
|
||||
// is called.
|
||||
private void initResourceTypeInfosList() {
|
||||
if (this.resourceTypeInfo != null) {
|
||||
return;
|
||||
}
|
||||
GetAllResourceTypeInfoResponseProtoOrBuilder p = viaProto ? proto : builder;
|
||||
List<ResourceTypeInfoProto> list = p.getResourceTypeInfoList();
|
||||
resourceTypeInfo = new ArrayList<ResourceTypeInfo>();
|
||||
|
||||
for (ResourceTypeInfoProto a : list) {
|
||||
resourceTypeInfo.add(convertFromProtoFormat(a));
|
||||
}
|
||||
}
|
||||
|
||||
private void addResourceTypeInfosToProto() {
|
||||
maybeInitBuilder();
|
||||
builder.clearResourceTypeInfo();
|
||||
if (resourceTypeInfo == null) {
|
||||
return;
|
||||
}
|
||||
Iterable<ResourceTypeInfoProto> iterable = new Iterable<ResourceTypeInfoProto>() {
|
||||
@Override
|
||||
public Iterator<ResourceTypeInfoProto> iterator() {
|
||||
return new Iterator<ResourceTypeInfoProto>() {
|
||||
|
||||
Iterator<ResourceTypeInfo> iter = resourceTypeInfo.iterator();
|
||||
|
||||
@Override
|
||||
public boolean hasNext() {
|
||||
return iter.hasNext();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceTypeInfoProto next() {
|
||||
return convertToProtoFormat(iter.next());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove() {
|
||||
throw new UnsupportedOperationException();
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
};
|
||||
builder.addAllResourceTypeInfo(iterable);
|
||||
}
|
||||
|
||||
private ResourceTypeInfoPBImpl convertFromProtoFormat(
|
||||
ResourceTypeInfoProto p) {
|
||||
return new ResourceTypeInfoPBImpl(p);
|
||||
}
|
||||
|
||||
private ResourceTypeInfoProto convertToProtoFormat(ResourceTypeInfo t) {
|
||||
return ((ResourceTypeInfoPBImpl) t).getProto();
|
||||
}
|
||||
}
|
@ -63,6 +63,7 @@ static ResourceProto getProto(Resource r) {
|
||||
|
||||
public ResourcePBImpl() {
|
||||
builder = ResourceProto.newBuilder();
|
||||
initResources();
|
||||
}
|
||||
|
||||
public ResourcePBImpl(ResourceProto proto) {
|
||||
@ -94,7 +95,6 @@ public int getMemory() {
|
||||
@Override
|
||||
public long getMemorySize() {
|
||||
// memory should always be present
|
||||
initResources();
|
||||
ResourceInformation ri = resources[MandatoryResources.MEMORY.getId()];
|
||||
|
||||
if (ri.getUnits().isEmpty()) {
|
||||
@ -119,7 +119,6 @@ public void setMemorySize(long memory) {
|
||||
@Override
|
||||
public int getVirtualCores() {
|
||||
// vcores should always be present
|
||||
initResources();
|
||||
return (int) resources[MandatoryResources.VCORES.getId()].getValue();
|
||||
}
|
||||
|
||||
@ -140,7 +139,11 @@ private void initResources() {
|
||||
ResourceTypes type =
|
||||
entry.hasType() ? ProtoUtils.convertFromProtoFormat(entry.getType()) :
|
||||
ResourceTypes.COUNTABLE;
|
||||
String units = entry.hasUnits() ? entry.getUnits() : "";
|
||||
|
||||
// When unit not specified in proto, use the default unit.
|
||||
String units =
|
||||
entry.hasUnits() ? entry.getUnits() : ResourceUtils.getDefaultUnit(
|
||||
entry.getKey());
|
||||
long value = entry.hasValue() ? entry.getValue() : 0L;
|
||||
ResourceInformation ri = ResourceInformation
|
||||
.newInstance(entry.getKey(), units, value, type, 0L, Long.MAX_VALUE);
|
||||
@ -185,21 +188,18 @@ public void setResourceValue(String resource, long value)
|
||||
|
||||
@Override
|
||||
public ResourceInformation[] getResources() {
|
||||
initResources();
|
||||
return super.getResources();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceInformation getResourceInformation(String resource)
|
||||
throws ResourceNotFoundException {
|
||||
initResources();
|
||||
return super.getResourceInformation(resource);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getResourceValue(String resource)
|
||||
throws ResourceNotFoundException {
|
||||
initResources();
|
||||
return super.getResourceValue(resource);
|
||||
}
|
||||
|
||||
|
@ -0,0 +1,154 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.hadoop.yarn.api.records.impl.pb;
|
||||
|
||||
import org.apache.hadoop.classification.InterfaceAudience.Private;
|
||||
import org.apache.hadoop.classification.InterfaceStability.Unstable;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.ResourceTypes;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceTypeInfo;
|
||||
import org.apache.hadoop.yarn.proto.YarnProtos;
|
||||
import org.apache.hadoop.yarn.proto.YarnProtos.ResourceTypeInfoProto;
|
||||
import org.apache.hadoop.yarn.proto.YarnProtos.ResourceTypesProto;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
|
||||
/**
|
||||
* {@code ResourceTypeInfoPBImpl} which implements the
|
||||
* {@link ResourceTypeInfo} class which represents different resource types
|
||||
* supported in YARN.
|
||||
*/
|
||||
@Private
|
||||
@Unstable
|
||||
public class ResourceTypeInfoPBImpl extends ResourceTypeInfo {
|
||||
|
||||
ResourceTypeInfoProto proto = ResourceTypeInfoProto.getDefaultInstance();
|
||||
ResourceTypeInfoProto.Builder builder = null;
|
||||
boolean viaProto = false;
|
||||
|
||||
private String name = null;
|
||||
private String defaultUnit = null;
|
||||
private ResourceTypes resourceTypes = null;
|
||||
|
||||
public ResourceTypeInfoPBImpl() {
|
||||
builder = ResourceTypeInfoProto.newBuilder();
|
||||
}
|
||||
|
||||
public ResourceTypeInfoPBImpl(ResourceTypeInfoProto proto) {
|
||||
this.proto = proto;
|
||||
viaProto = true;
|
||||
}
|
||||
|
||||
public ResourceTypeInfoProto getProto() {
|
||||
mergeLocalToProto();
|
||||
return proto;
|
||||
}
|
||||
|
||||
private void mergeLocalToProto() {
|
||||
if (viaProto) {
|
||||
maybeInitBuilder();
|
||||
}
|
||||
mergeLocalToBuilder();
|
||||
proto = builder.build();
|
||||
viaProto = true;
|
||||
}
|
||||
|
||||
private void mergeLocalToBuilder() {
|
||||
if (this.name != null) {
|
||||
builder.setName(this.name);
|
||||
}
|
||||
if (this.defaultUnit != null) {
|
||||
builder.setUnits(this.defaultUnit);
|
||||
}
|
||||
if (this.resourceTypes != null) {
|
||||
builder.setType(convertToProtoFormat(this.resourceTypes));
|
||||
}
|
||||
}
|
||||
|
||||
private void maybeInitBuilder() {
|
||||
if (viaProto || builder == null) {
|
||||
builder = YarnProtos.ResourceTypeInfoProto.newBuilder(proto);
|
||||
}
|
||||
viaProto = false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
if (this.name != null) {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
YarnProtos.ResourceTypeInfoProtoOrBuilder p = viaProto ? proto : builder;
|
||||
return p.getName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setName(String rName) {
|
||||
maybeInitBuilder();
|
||||
if (rName == null) {
|
||||
builder.clearName();
|
||||
}
|
||||
this.name = rName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDefaultUnit() {
|
||||
if (this.defaultUnit != null) {
|
||||
return this.defaultUnit;
|
||||
}
|
||||
|
||||
YarnProtos.ResourceTypeInfoProtoOrBuilder p = viaProto ? proto : builder;
|
||||
return p.getUnits();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDefaultUnit(String rUnits) {
|
||||
maybeInitBuilder();
|
||||
if (rUnits == null) {
|
||||
builder.clearUnits();
|
||||
}
|
||||
this.defaultUnit = rUnits;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceTypes getResourceType() {
|
||||
if (this.resourceTypes != null) {
|
||||
return this.resourceTypes;
|
||||
}
|
||||
|
||||
YarnProtos.ResourceTypeInfoProtoOrBuilder p = viaProto ? proto : builder;
|
||||
return convertFromProtoFormat(p.getType());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setResourceType(ResourceTypes type) {
|
||||
maybeInitBuilder();
|
||||
if (type == null) {
|
||||
builder.clearType();
|
||||
}
|
||||
this.resourceTypes = type;
|
||||
}
|
||||
|
||||
public static ResourceTypesProto convertToProtoFormat(ResourceTypes e) {
|
||||
return ResourceTypesProto.valueOf(e.name());
|
||||
}
|
||||
|
||||
public static ResourceTypes convertFromProtoFormat(ResourceTypesProto e) {
|
||||
return ResourceTypes.valueOf(e.name());
|
||||
}
|
||||
}
|
@ -29,6 +29,8 @@
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.CommitResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.ContainerUpdateRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.ContainerUpdateResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.IncreaseContainersResourceRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.IncreaseContainersResourceResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.ReInitializeContainerRequest;
|
||||
@ -43,6 +45,8 @@
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.FinishApplicationMasterRequestPBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.FinishApplicationMasterResponsePBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetAllResourceProfilesResponsePBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetAllResourceTypeInfoRequestPBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetAllResourceTypeInfoResponsePBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetApplicationAttemptReportRequestPBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetApplicationAttemptReportResponsePBImpl;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetApplicationAttemptsRequestPBImpl;
|
||||
@ -148,6 +152,7 @@
|
||||
import org.apache.hadoop.yarn.api.records.ResourceBlacklistRequest;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceOption;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceRequest;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceTypeInfo;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceUtilization;
|
||||
import org.apache.hadoop.yarn.api.records.SerializedException;
|
||||
import org.apache.hadoop.yarn.api.records.StrictPreemptionContract;
|
||||
@ -187,12 +192,14 @@
|
||||
import org.apache.hadoop.yarn.api.records.impl.pb.ResourceOptionPBImpl;
|
||||
import org.apache.hadoop.yarn.api.records.impl.pb.ResourcePBImpl;
|
||||
import org.apache.hadoop.yarn.api.records.impl.pb.ResourceRequestPBImpl;
|
||||
import org.apache.hadoop.yarn.api.records.impl.pb.ResourceTypeInfoPBImpl;
|
||||
import org.apache.hadoop.yarn.api.records.impl.pb.SerializedExceptionPBImpl;
|
||||
import org.apache.hadoop.yarn.api.records.impl.pb.StrictPreemptionContractPBImpl;
|
||||
import org.apache.hadoop.yarn.api.records.impl.pb.TokenPBImpl;
|
||||
import org.apache.hadoop.yarn.api.records.impl.pb.URLPBImpl;
|
||||
import org.apache.hadoop.yarn.api.records.impl.pb.UpdateContainerRequestPBImpl;
|
||||
import org.apache.hadoop.yarn.api.records.impl.pb.YarnClusterMetricsPBImpl;
|
||||
import org.apache.hadoop.yarn.proto.YarnProtos;
|
||||
import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationAttemptIdProto;
|
||||
import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationAttemptReportProto;
|
||||
import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationIdProto;
|
||||
@ -1195,4 +1202,22 @@ public void testProfileCapabilityPBImpl() throws Exception {
|
||||
validatePBImplRecord(ProfileCapabilityPBImpl.class,
|
||||
ProfileCapabilityProto.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testResourceTypesInfoPBImpl() throws Exception {
|
||||
validatePBImplRecord(ResourceTypeInfoPBImpl.class,
|
||||
YarnProtos.ResourceTypeInfoProto.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetAllResourceTypesInfoRequestPBImpl() throws Exception {
|
||||
validatePBImplRecord(GetAllResourceTypeInfoRequestPBImpl.class,
|
||||
YarnServiceProtos.GetAllResourceTypeInfoRequestProto.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetAllResourceTypesInfoResponsePBImpl() throws Exception {
|
||||
validatePBImplRecord(GetAllResourceTypeInfoResponsePBImpl.class,
|
||||
YarnServiceProtos.GetAllResourceTypeInfoResponseProto.class);
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,61 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.hadoop.yarn.api;
|
||||
|
||||
import org.apache.hadoop.yarn.api.records.Resource;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceInformation;
|
||||
import org.apache.hadoop.yarn.api.records.impl.pb.ResourcePBImpl;
|
||||
import org.apache.hadoop.yarn.proto.YarnProtos;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* Test class to handle various proto related tests for resources.
|
||||
*/
|
||||
public class TestResourcePBImpl {
|
||||
@Test
|
||||
public void testEmptyResourcePBInit() throws Exception {
|
||||
Resource res = new ResourcePBImpl();
|
||||
// Assert to check it sets resource value and unit to default.
|
||||
Assert.assertEquals(0, res.getMemorySize());
|
||||
Assert.assertEquals(ResourceInformation.MEMORY_MB.getUnits(),
|
||||
res.getResourceInformation(ResourceInformation.MEMORY_MB.getName())
|
||||
.getUnits());
|
||||
Assert.assertEquals(ResourceInformation.VCORES.getUnits(),
|
||||
res.getResourceInformation(ResourceInformation.VCORES.getName())
|
||||
.getUnits());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testResourcePBInitFromOldPB() throws Exception {
|
||||
YarnProtos.ResourceProto proto =
|
||||
YarnProtos.ResourceProto.newBuilder().setMemory(1024).setVirtualCores(3)
|
||||
.build();
|
||||
// Assert to check it sets resource value and unit to default.
|
||||
Resource res = new ResourcePBImpl(proto);
|
||||
Assert.assertEquals(1024, res.getMemorySize());
|
||||
Assert.assertEquals(3, res.getVirtualCores());
|
||||
Assert.assertEquals(ResourceInformation.MEMORY_MB.getUnits(),
|
||||
res.getResourceInformation(ResourceInformation.MEMORY_MB.getName())
|
||||
.getUnits());
|
||||
Assert.assertEquals(ResourceInformation.VCORES.getUnits(),
|
||||
res.getResourceInformation(ResourceInformation.VCORES.getName())
|
||||
.getUnits());
|
||||
}
|
||||
}
|
@ -43,6 +43,8 @@
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.FinishApplicationMasterResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
|
||||
@ -868,4 +870,10 @@ public GetResourceProfileResponse getResourceProfile(
|
||||
GetResourceProfileRequest request) throws YarnException, IOException {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public GetAllResourceTypeInfoResponse getResourceTypeInfo(
|
||||
GetAllResourceTypeInfoRequest request) throws YarnException, IOException {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
@ -114,6 +114,8 @@
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
|
||||
import org.apache.hadoop.yarn.api.records.ApplicationAccessType;
|
||||
@ -1794,8 +1796,7 @@ public GetResourceProfileResponse getResourceProfile(
|
||||
}
|
||||
GetResourceProfileResponse response =
|
||||
GetResourceProfileResponse.newInstance();
|
||||
response.setResource(
|
||||
resourceProfilesManager.getProfile(request.getProfileName()));
|
||||
response.setResource(profiles.get(request.getProfileName()));
|
||||
return response;
|
||||
}
|
||||
|
||||
@ -1809,4 +1810,14 @@ private Map<String, Resource> getResourceProfiles() throws YarnException {
|
||||
}
|
||||
return resourceProfilesManager.getResourceProfiles();
|
||||
}
|
||||
|
||||
@Override
|
||||
public GetAllResourceTypeInfoResponse getResourceTypeInfo(
|
||||
GetAllResourceTypeInfoRequest request) throws YarnException, IOException {
|
||||
GetAllResourceTypeInfoResponse response =
|
||||
GetAllResourceTypeInfoResponse.newInstance();
|
||||
response.setResourceTypeInfo(
|
||||
resourceProfilesManager.getAllResourceTypeInfo());
|
||||
return response;
|
||||
}
|
||||
}
|
||||
|
@ -22,8 +22,10 @@
|
||||
import org.apache.hadoop.classification.InterfaceStability.Unstable;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.yarn.api.records.Resource;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceTypeInfo;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
@ -77,4 +79,10 @@ public interface ResourceProfilesManager {
|
||||
* @return resource object which is maximum
|
||||
*/
|
||||
Resource getMaximumProfile();
|
||||
|
||||
/**
|
||||
* List of ResourceTypeInfo objects which carry all resources supported by RM.
|
||||
* @return list of ResourceTypeInfo objects
|
||||
*/
|
||||
List<ResourceTypeInfo> getAllResourceTypeInfo();
|
||||
}
|
||||
|
@ -24,6 +24,7 @@
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.yarn.api.records.Resource;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceInformation;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceTypeInfo;
|
||||
import org.apache.hadoop.yarn.conf.YarnConfiguration;
|
||||
import org.apache.hadoop.yarn.util.resource.ResourceUtils;
|
||||
import org.apache.hadoop.yarn.util.resource.Resources;
|
||||
@ -32,11 +33,15 @@
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.net.URL;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||
|
||||
public class ResourceProfilesManagerImpl implements ResourceProfilesManager {
|
||||
|
||||
@ -44,6 +49,8 @@ public class ResourceProfilesManagerImpl implements ResourceProfilesManager {
|
||||
LogFactory.getLog(ResourceProfilesManagerImpl.class);
|
||||
|
||||
private final Map<String, Resource> profiles = new ConcurrentHashMap<>();
|
||||
private List<ResourceTypeInfo> resourceTypeInfo =
|
||||
new ArrayList<ResourceTypeInfo>();
|
||||
private Configuration conf;
|
||||
|
||||
private static final String MEMORY = ResourceInformation.MEMORY_MB.getName();
|
||||
@ -53,13 +60,41 @@ public class ResourceProfilesManagerImpl implements ResourceProfilesManager {
|
||||
public static final String MINIMUM_PROFILE = "minimum";
|
||||
public static final String MAXIMUM_PROFILE = "maximum";
|
||||
|
||||
protected final ReentrantReadWriteLock.ReadLock readLock;
|
||||
protected final ReentrantReadWriteLock.WriteLock writeLock;
|
||||
|
||||
private static final String[] MANDATORY_PROFILES =
|
||||
{ DEFAULT_PROFILE, MINIMUM_PROFILE, MAXIMUM_PROFILE };
|
||||
|
||||
@Override
|
||||
public ResourceProfilesManagerImpl() {
|
||||
ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
|
||||
readLock = lock.readLock();
|
||||
writeLock = lock.writeLock();
|
||||
}
|
||||
|
||||
public void init(Configuration config) throws IOException {
|
||||
conf = config;
|
||||
loadProfiles();
|
||||
|
||||
// Load resource types, this should be done even if resource profile is
|
||||
// disabled, since we have mandatory resource types like vcores/memory.
|
||||
loadResourceTypes();
|
||||
}
|
||||
|
||||
private void loadResourceTypes() {
|
||||
// Add all resource types
|
||||
try {
|
||||
writeLock.lock();
|
||||
Collection<ResourceInformation> resourcesInfo = ResourceUtils
|
||||
.getResourceTypes().values();
|
||||
for (ResourceInformation resourceInfo : resourcesInfo) {
|
||||
resourceTypeInfo
|
||||
.add(ResourceTypeInfo.newInstance(resourceInfo.getName(),
|
||||
resourceInfo.getUnits(), resourceInfo.getResourceType()));
|
||||
}
|
||||
} finally {
|
||||
writeLock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
private void loadProfiles() throws IOException {
|
||||
@ -185,4 +220,13 @@ private ResourceInformation fromString(String name, String value) {
|
||||
Long.valueOf(value.substring(0, value.length() - units.length()));
|
||||
return ResourceInformation.newInstance(name, units, resourceValue);
|
||||
}
|
||||
|
||||
public List<ResourceTypeInfo> getAllResourceTypeInfo() {
|
||||
try {
|
||||
readLock.lock();
|
||||
return Collections.unmodifiableList(resourceTypeInfo);
|
||||
} finally {
|
||||
readLock.unlock();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -56,6 +56,8 @@
|
||||
import org.apache.hadoop.yarn.MockApps;
|
||||
import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.ApplicationsRequestScope;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
|
||||
@ -116,6 +118,7 @@
|
||||
import org.apache.hadoop.yarn.api.records.ReservationRequest;
|
||||
import org.apache.hadoop.yarn.api.records.ReservationRequests;
|
||||
import org.apache.hadoop.yarn.api.records.Resource;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceInformation;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceRequest;
|
||||
import org.apache.hadoop.yarn.api.records.YarnApplicationState;
|
||||
import org.apache.hadoop.yarn.conf.YarnConfiguration;
|
||||
@ -2061,4 +2064,47 @@ protected ClientRMService createClientRMService() {
|
||||
rpc.stopProxy(client, conf);
|
||||
new File(excludeFile).delete();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetResourceTypesInfoWhenResourceProfileDisabled()
|
||||
throws Exception {
|
||||
YarnConfiguration conf = new YarnConfiguration();
|
||||
MockRM rm = new MockRM(conf) {
|
||||
protected ClientRMService createClientRMService() {
|
||||
return new ClientRMService(this.rmContext, scheduler,
|
||||
this.rmAppManager, this.applicationACLsManager, this.queueACLsManager,
|
||||
this.getRMContext().getRMDelegationTokenSecretManager());
|
||||
}
|
||||
};
|
||||
rm.start();
|
||||
|
||||
YarnRPC rpc = YarnRPC.create(conf);
|
||||
InetSocketAddress rmAddress = rm.getClientRMService().getBindAddress();
|
||||
LOG.info("Connecting to ResourceManager at " + rmAddress);
|
||||
ApplicationClientProtocol client =
|
||||
(ApplicationClientProtocol) rpc
|
||||
.getProxy(ApplicationClientProtocol.class, rmAddress, conf);
|
||||
|
||||
// Make call
|
||||
GetAllResourceTypeInfoRequest request =
|
||||
GetAllResourceTypeInfoRequest.newInstance();
|
||||
GetAllResourceTypeInfoResponse response = client.getResourceTypeInfo(request);
|
||||
|
||||
Assert.assertEquals(2, response.getResourceTypeInfo().size());
|
||||
|
||||
// Check memory
|
||||
Assert.assertEquals(ResourceInformation.MEMORY_MB.getName(),
|
||||
response.getResourceTypeInfo().get(0).getName());
|
||||
Assert.assertEquals(ResourceInformation.MEMORY_MB.getUnits(),
|
||||
response.getResourceTypeInfo().get(0).getDefaultUnit());
|
||||
|
||||
// Check vcores
|
||||
Assert.assertEquals(ResourceInformation.VCORES.getName(),
|
||||
response.getResourceTypeInfo().get(1).getName());
|
||||
Assert.assertEquals(ResourceInformation.VCORES.getUnits(),
|
||||
response.getResourceTypeInfo().get(1).getDefaultUnit());
|
||||
|
||||
rm.stop();
|
||||
rpc.stopProxy(client, conf);
|
||||
}
|
||||
}
|
||||
|
@ -1528,7 +1528,7 @@ public void verifyAppsXML(NodeList nodes, RMApp app, boolean hasResourceReq)
|
||||
public void verifyAppInfo(JSONObject info, RMApp app, boolean hasResourceReqs)
|
||||
throws JSONException, Exception {
|
||||
|
||||
int expectedNumberOfElements = 36 + (hasResourceReqs ? 2 : 0);
|
||||
int expectedNumberOfElements = 38 + (hasResourceReqs ? 2 : 0);
|
||||
String appNodeLabelExpression = null;
|
||||
String amNodeLabelExpression = null;
|
||||
if (app.getApplicationSubmissionContext()
|
||||
|
@ -29,6 +29,8 @@
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
|
||||
@ -319,6 +321,12 @@ public GetResourceProfileResponse getResourceProfile(
|
||||
return clientRMProxy.getResourceProfile(request);
|
||||
}
|
||||
|
||||
@Override
|
||||
public GetAllResourceTypeInfoResponse getResourceTypeInfo(
|
||||
GetAllResourceTypeInfoRequest request) throws YarnException, IOException {
|
||||
return clientRMProxy.getResourceTypeInfo(request);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
public void setRMClient(ApplicationClientProtocol clientRM) {
|
||||
this.clientRMProxy = clientRM;
|
||||
|
@ -34,6 +34,8 @@
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
|
||||
@ -724,4 +726,10 @@ public GetResourceProfileResponse getResourceProfile(
|
||||
GetResourceProfileRequest request) throws YarnException, IOException {
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public GetAllResourceTypeInfoResponse getResourceTypeInfo(
|
||||
GetAllResourceTypeInfoRequest request) throws YarnException, IOException {
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
|
@ -40,6 +40,8 @@
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
|
||||
@ -421,6 +423,13 @@ public GetResourceProfileResponse getResourceProfile(
|
||||
return pipeline.getRootInterceptor().getResourceProfile(request);
|
||||
}
|
||||
|
||||
@Override
|
||||
public GetAllResourceTypeInfoResponse getResourceTypeInfo(
|
||||
GetAllResourceTypeInfoRequest request) throws YarnException, IOException {
|
||||
RequestInterceptorChainWrapper pipeline = getInterceptorChain();
|
||||
return pipeline.getRootInterceptor().getResourceTypeInfo(request);
|
||||
}
|
||||
|
||||
private RequestInterceptorChainWrapper getInterceptorChain()
|
||||
throws IOException {
|
||||
String user = UserGroupInformation.getCurrentUser().getUserName();
|
||||
|
@ -26,6 +26,8 @@
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
|
||||
@ -280,4 +282,10 @@ public GetResourceProfileResponse getResourceProfile(
|
||||
GetResourceProfileRequest request) throws YarnException, IOException {
|
||||
return getNextInterceptor().getResourceProfile(request);
|
||||
}
|
||||
|
||||
@Override
|
||||
public GetAllResourceTypeInfoResponse getResourceTypeInfo(
|
||||
GetAllResourceTypeInfoRequest request) throws YarnException, IOException {
|
||||
return getNextInterceptor().getResourceTypeInfo(request);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user