Skip to content

Commit f4d3468

Browse files
slfan1989slfan1989
committed
YARN-11483. Fix CheckStyle.
1 parent ea90937 commit f4d3468

File tree

12 files changed

+211
-36
lines changed

12 files changed

+211
-36
lines changed

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/server/api/ResourceManagerAdministrationProtocol.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@
6464
import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesResponse;
6565
import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesRequest;
6666
import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesResponse;
67+
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationRequest;
68+
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationResponse;
6769

6870
@Private
6971
public interface ResourceManagerAdministrationProtocol extends GetUserMappingsProtocol {
@@ -218,4 +220,17 @@ BatchSaveFederationQueuePoliciesResponse batchSaveFederationQueuePolicies(
218220
@Idempotent
219221
QueryFederationQueuePoliciesResponse listFederationQueuePolicies(
220222
QueryFederationQueuePoliciesRequest request) throws YarnException, IOException;
223+
224+
/**
225+
* In YARN-Federation mode, this method provides a way to delete federation application.
226+
*
227+
* @param request DeleteFederationApplicationRequest Request.
228+
* @return Response from deleteFederationApplication.
229+
* @throws YarnException exceptions from yarn servers.
230+
* @throws IOException if an IO error occurred.
231+
*/
232+
@Private
233+
@Idempotent
234+
DeleteFederationApplicationResponse deleteFederationApplication(
235+
DeleteFederationApplicationRequest request) throws YarnException, IOException;
221236
}

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/server/resourcemanager_administration_protocol.proto‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,5 @@ service ResourceManagerAdministrationProtocolService {
5151
rpc saveFederationQueuePolicy(SaveFederationQueuePolicyRequestProto) returns (SaveFederationQueuePolicyResponseProto);
5252
rpc batchSaveFederationQueuePolicies(BatchSaveFederationQueuePoliciesRequestProto) returns (BatchSaveFederationQueuePoliciesResponseProto);
5353
rpc listFederationQueuePolicies(QueryFederationQueuePoliciesRequestProto) returns (QueryFederationQueuePoliciesResponseProto);
54+
rpc deleteFederationApplication(DeleteFederationApplicationRequestProto) returns (DeleteFederationApplicationResponseProto);
5455
}

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/client/ResourceManagerAdministrationProtocolPBClientImpl.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.SaveFederationQueuePolicyRequestProto;
4949
import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.BatchSaveFederationQueuePoliciesRequestProto;
5050
import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.QueryFederationQueuePoliciesRequestProto;
51+
import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.DeleteFederationApplicationRequestProto;
5152
import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
5253
import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocolPB;
5354
import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsRequest;
@@ -86,6 +87,8 @@
8687
import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesResponse;
8788
import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesRequest;
8889
import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesResponse;
90+
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationRequest;
91+
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationResponse;
8992
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.AddToClusterNodeLabelsRequestPBImpl;
9093
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.AddToClusterNodeLabelsResponsePBImpl;
9194
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.CheckForDecommissioningNodesRequestPBImpl;
@@ -122,6 +125,8 @@
122125
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.BatchSaveFederationQueuePoliciesResponsePBImpl;
123126
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.QueryFederationQueuePoliciesRequestPBImpl;
124127
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.QueryFederationQueuePoliciesResponsePBImpl;
128+
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.DeleteFederationApplicationRequestPBImpl;
129+
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.DeleteFederationApplicationResponsePBImpl;
125130

126131
import org.apache.hadoop.thirdparty.protobuf.ServiceException;
127132

@@ -420,4 +425,18 @@ public QueryFederationQueuePoliciesResponse listFederationQueuePolicies(
420425
}
421426
return null;
422427
}
428+
429+
@Override
430+
public DeleteFederationApplicationResponse deleteFederationApplication(
431+
DeleteFederationApplicationRequest request) throws YarnException, IOException {
432+
DeleteFederationApplicationRequestProto requestProto =
433+
((DeleteFederationApplicationRequestPBImpl) request).getProto();
434+
try {
435+
return new DeleteFederationApplicationResponsePBImpl(
436+
proxy.deleteFederationApplication(null, requestProto));
437+
} catch (ServiceException e) {
438+
RPCUtil.unwrapAndThrowException(e);
439+
}
440+
return null;
441+
}
423442
}

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/api/impl/pb/service/ResourceManagerAdministrationProtocolPBServiceImpl.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.DeregisterSubClusterResponseProto;
6161
import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.SaveFederationQueuePolicyRequestProto;
6262
import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.SaveFederationQueuePolicyResponseProto;
63+
import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.DeleteFederationApplicationResponseProto;
64+
import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.DeleteFederationApplicationRequestProto;
6365
import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
6466
import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocolPB;
6567
import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsResponse;
@@ -87,6 +89,8 @@
8789
import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesResponse;
8890
import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesRequest;
8991
import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesResponse;
92+
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationRequest;
93+
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationResponse;
9094
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.AddToClusterNodeLabelsRequestPBImpl;
9195
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.AddToClusterNodeLabelsResponsePBImpl;
9296
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.CheckForDecommissioningNodesRequestPBImpl;
@@ -123,6 +127,8 @@
123127
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.BatchSaveFederationQueuePoliciesResponsePBImpl;
124128
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.QueryFederationQueuePoliciesRequestPBImpl;
125129
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.QueryFederationQueuePoliciesResponsePBImpl;
130+
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.DeleteFederationApplicationRequestPBImpl;
131+
import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.DeleteFederationApplicationResponsePBImpl;
126132

127133
import org.apache.hadoop.thirdparty.protobuf.RpcController;
128134
import org.apache.hadoop.thirdparty.protobuf.ServiceException;
@@ -445,4 +451,19 @@ public QueryFederationQueuePoliciesResponseProto listFederationQueuePolicies(
445451
throw new ServiceException(e);
446452
}
447453
}
454+
455+
@Override
456+
public DeleteFederationApplicationResponseProto deleteFederationApplication(RpcController controller,
457+
DeleteFederationApplicationRequestProto proto) throws ServiceException {
458+
DeleteFederationApplicationRequest request =
459+
new DeleteFederationApplicationRequestPBImpl(proto);
460+
try {
461+
DeleteFederationApplicationResponse response = real.deleteFederationApplication(request);
462+
return ((DeleteFederationApplicationResponsePBImpl) response).getProto();
463+
} catch (YarnException e) {
464+
throw new ServiceException(e);
465+
} catch (IOException e) {
466+
throw new ServiceException(e);
467+
}
468+
}
448469
}

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/DeleteFederationApplicationRequestPBImpl.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.apache.commons.lang3.builder.EqualsBuilder;
2121
import org.apache.hadoop.classification.InterfaceAudience.Private;
2222
import org.apache.hadoop.classification.InterfaceStability.Unstable;
23+
import org.apache.hadoop.thirdparty.protobuf.TextFormat;
2324
import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.DeleteFederationApplicationRequestProto;
2425
import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.DeleteFederationApplicationRequestProtoOrBuilder;
2526
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationRequest;
@@ -88,4 +89,9 @@ public void setApplication(String application) {
8889
}
8990
builder.setApplication(application);
9091
}
92+
93+
@Override
94+
public String toString() {
95+
return TextFormat.shortDebugString(getProto());
96+
}
9197
}

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/api/protocolrecords/impl/pb/DeleteFederationApplicationResponsePBImpl.java‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
/**
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
package org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb;
19+
20+
import org.apache.commons.lang3.builder.EqualsBuilder;
21+
import org.apache.hadoop.classification.InterfaceAudience.Private;
22+
import org.apache.hadoop.classification.InterfaceStability.Unstable;
23+
import org.apache.hadoop.thirdparty.protobuf.TextFormat;
24+
import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.DeleteFederationApplicationResponseProto;
25+
import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.DeleteFederationApplicationResponseProtoOrBuilder;
26+
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationRequest;
27+
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationResponse;
28+
29+
@Private
30+
@Unstable
31+
public class DeleteFederationApplicationResponsePBImpl extends DeleteFederationApplicationResponse {
32+
33+
private DeleteFederationApplicationResponseProto proto =
34+
DeleteFederationApplicationResponseProto.getDefaultInstance();
35+
private DeleteFederationApplicationResponseProto.Builder builder = null;
36+
private boolean viaProto = false;
37+
38+
public DeleteFederationApplicationResponsePBImpl() {
39+
builder = DeleteFederationApplicationResponseProto.newBuilder();
40+
}
41+
42+
public DeleteFederationApplicationResponsePBImpl(DeleteFederationApplicationResponseProto proto) {
43+
this.proto = proto;
44+
viaProto = true;
45+
}
46+
47+
public DeleteFederationApplicationResponseProto getProto() {
48+
proto = viaProto ? proto : builder.build();
49+
viaProto = true;
50+
return proto;
51+
}
52+
53+
@Override
54+
public int hashCode() {
55+
return getProto().hashCode();
56+
}
57+
58+
@Override
59+
public boolean equals(Object other) {
60+
if (!(other instanceof DeleteFederationApplicationRequest)) {
61+
return false;
62+
}
63+
DeleteFederationApplicationResponsePBImpl otherImpl = this.getClass().cast(other);
64+
return new EqualsBuilder().append(this.getProto(), otherImpl.getProto()).isEquals();
65+
}
66+
67+
@Override
68+
public String toString() {
69+
return TextFormat.shortDebugString(getProto());
70+
}
71+
72+
@Override
73+
public String getMessage() {
74+
DeleteFederationApplicationResponseProtoOrBuilder p = viaProto ? proto : builder;
75+
boolean hasMessage = p.hasMessage();
76+
if (hasMessage) {
77+
return p.getMessage();
78+
}
79+
return null;
80+
}
81+
82+
private synchronized void maybeInitBuilder() {
83+
if (viaProto || builder == null) {
84+
builder = DeleteFederationApplicationResponseProto.newBuilder(proto);
85+
}
86+
viaProto = false;
87+
}
88+
89+
@Override
90+
public void setMessage(String msg) {
91+
maybeInitBuilder();
92+
if (msg == null) {
93+
builder.clearMessage();
94+
return;
95+
}
96+
builder.setMessage(msg);
97+
}
98+
}

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/MockResourceManagerFacade.java‎

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -141,46 +141,11 @@
141141
import org.apache.hadoop.yarn.exceptions.YarnException;
142142
import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
143143
import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
144-
import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsRequest;
145-
import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsResponse;
146-
import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesRequest;
147-
import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesResponse;
148-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsRequest;
149-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsResponse;
150-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshClusterMaxPriorityRequest;
151-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshClusterMaxPriorityResponse;
152-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesRequest;
153-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesRequest;
154-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesResponse;
155-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResponse;
156-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesRequest;
157-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesResponse;
158-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsRequest;
159-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsResponse;
160-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationRequest;
161-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationResponse;
162-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsRequest;
163-
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsResponse;
164-
import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsRequest;
165-
import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsResponse;
166-
import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeRequest;
167-
import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeResponse;
168-
import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceRequest;
169-
import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceResponse;
144+
import org.apache.hadoop.yarn.server.api.protocolrecords.*;
170145
import org.apache.hadoop.yarn.util.Records;
171146
import org.junit.Assert;
172147
import org.slf4j.Logger;
173148
import org.slf4j.LoggerFactory;
174-
import org.apache.hadoop.yarn.server.api.protocolrecords.NodesToAttributesMappingRequest;
175-
import org.apache.hadoop.yarn.server.api.protocolrecords.NodesToAttributesMappingResponse;
176-
import org.apache.hadoop.yarn.server.api.protocolrecords.DeregisterSubClusterRequest;
177-
import org.apache.hadoop.yarn.server.api.protocolrecords.DeregisterSubClusterResponse;
178-
import org.apache.hadoop.yarn.server.api.protocolrecords.SaveFederationQueuePolicyRequest;
179-
import org.apache.hadoop.yarn.server.api.protocolrecords.SaveFederationQueuePolicyResponse;
180-
import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesRequest;
181-
import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesResponse;
182-
import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesRequest;
183-
import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesResponse;
184149
import org.apache.hadoop.thirdparty.com.google.common.base.Strings;
185150

186151
/**
@@ -988,6 +953,12 @@ public QueryFederationQueuePoliciesResponse listFederationQueuePolicies(
988953
return null;
989954
}
990955

956+
@Override
957+
public DeleteFederationApplicationResponse deleteFederationApplication(
958+
DeleteFederationApplicationRequest request) throws YarnException, IOException {
959+
return null;
960+
}
961+
991962
@VisibleForTesting
992963
public HashMap<ApplicationId, List<ContainerId>> getApplicationContainerIdMap() {
993964
return applicationContainerIdMap;

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@
103103
import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesResponse;
104104
import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesRequest;
105105
import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesResponse;
106+
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationRequest;
107+
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationResponse;
106108
import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.NodeLabelsUtils;
107109
import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationSystem;
108110
import org.apache.hadoop.yarn.server.resourcemanager.resource.DynamicResourceConfiguration;
@@ -1105,6 +1107,14 @@ public QueryFederationQueuePoliciesResponse listFederationQueuePolicies(
11051107
" Please call Router's listFederationQueuePolicies to list Policies.");
11061108
}
11071109

1110+
@Override
1111+
public DeleteFederationApplicationResponse deleteFederationApplication(
1112+
DeleteFederationApplicationRequest request) throws YarnException, IOException {
1113+
throw new YarnException("It is not allowed to call the RM's " +
1114+
" deleteFederationApplication. " +
1115+
" Please call Router's deleteFederationApplication to delete Application.");
1116+
}
1117+
11081118
private void validateAttributesExists(
11091119
List<NodeToAttributes> nodesToAttributes) throws IOException {
11101120
NodeAttributesManager nodeAttributesManager =

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/DefaultRMAdminRequestInterceptor.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@
6464
import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesResponse;
6565
import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesRequest;
6666
import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesResponse;
67+
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationRequest;
68+
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationResponse;
6769
import org.slf4j.Logger;
6870
import org.slf4j.LoggerFactory;
6971

@@ -233,4 +235,11 @@ public QueryFederationQueuePoliciesResponse listFederationQueuePolicies(
233235
QueryFederationQueuePoliciesRequest request) throws YarnException, IOException {
234236
return rmAdminProxy.listFederationQueuePolicies(request);
235237
}
238+
239+
@Override
240+
public DeleteFederationApplicationResponse deleteFederationApplication(
241+
DeleteFederationApplicationRequest request)
242+
throws YarnException, IOException {
243+
return rmAdminProxy.deleteFederationApplication(request);
244+
}
236245
}

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/FederationRMAdminInterceptor.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@
7171
import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesResponse;
7272
import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesRequest;
7373
import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesResponse;
74+
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationRequest;
75+
import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationResponse;
7476
import org.apache.hadoop.yarn.server.federation.failover.FederationProxyProviderUtil;
7577
import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
7678
import org.apache.hadoop.yarn.server.federation.store.records.SubClusterIdInfo;
@@ -1088,6 +1090,12 @@ public QueryFederationQueuePoliciesResponse listFederationQueuePolicies(
10881090
throw new YarnException("Unable to listFederationQueuePolicies.");
10891091
}
10901092

1093+
@Override
1094+
public DeleteFederationApplicationResponse deleteFederationApplication(
1095+
DeleteFederationApplicationRequest request) throws YarnException, IOException {
1096+
return null;
1097+
}
1098+
10911099
/**
10921100
* According to the configuration information of the queue filtering queue,
10931101
* this part should only return 1 result.

0 commit comments

Comments
 (0)