YARN-7985. Removed duplicate service name validation in Yarn Service.
Contributed by Chandni Singh
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/17f387e3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/17f387e3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/17f387e3
Branch: refs/heads/HDFS-7240
Commit: 17f387e3c2123010a4b2ea5f3db631d15bacab35
Parents: 315f48e
Author: Eric Yang <ey...@apache.org>
Authored: Wed Feb 28 20:48:55 2018 -0500
Committer: Eric Yang <ey...@apache.org>
Committed: Wed Feb 28 20:48:55 2018 -0500
----------------------------------------------------------------------
.../org/apache/hadoop/yarn/service/ServiceClientTest.java | 7 ++++---
.../org/apache/hadoop/yarn/service/client/ServiceClient.java | 1 -
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/17f387e3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/ServiceClientTest.java
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/ServiceClientTest.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/ServiceClientTest.java
index 8e5fd5c..5d959da 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/ServiceClientTest.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/ServiceClientTest.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.service.api.records.Service;
import org.apache.hadoop.yarn.service.client.ServiceClient;
import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
/**
* A mock version of ServiceClient - This class is design
@@ -49,9 +50,9 @@ public class ServiceClientTest extends ServiceClient {
}
@Override
- public ApplicationId actionCreate(Service service) {
- String serviceName = service.getName();
- ServiceApiUtil.validateNameFormat(serviceName, getConfig());
+ public ApplicationId actionCreate(Service service) throws IOException {
+ ServiceApiUtil.validateAndResolveService(service,
+ new SliderFileSystem(conf), getConfig());
return ApplicationId.newInstance(System.currentTimeMillis(), 1);
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/17f387e3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ServiceClient.java
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ServiceClient.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ServiceClient.java
index f5e21ab..5731e11 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ServiceClient.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ServiceClient.java
@@ -210,7 +210,6 @@ public class ServiceClient extends AppAdminClient
implements SliderExitCodes,
public ApplicationId actionCreate(Service service)
throws IOException, YarnException {
String serviceName = service.getName();
- ServiceApiUtil.validateNameFormat(serviceName, getConfig());
ServiceApiUtil.validateAndResolveService(service, fs, getConfig());
verifyNoLiveAppInRM(serviceName, "create");
Path appDir = checkAppNotExistOnHdfs(service);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
