diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml index f8ed4d5..7c8cc2e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml @@ -153,7 +153,7 @@ definitions: properties: name: type: string - description: A unique application name. + description: A unique application name. If Registry DNS is enabled, the max length is 63 characters. id: type: string description: A unique application id. @@ -255,7 +255,7 @@ definitions: properties: name: type: string - description: Name of the application component (mandatory). + description: Name of the application component (mandatory). If Registry DNS is enabled, the max length is 63 characters. If unique component support is enabled, the max length is lowered to 44 characters. dependencies: type: array items: diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/SliderClient.java index a3ba8c0..e261a8d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -637,7 +637,8 @@ private Application getApplicationFromArgs(String clusterName, public int actionBuild(Application application) throws YarnException, IOException { Path appDir = checkAppNotExistOnHdfs(application); - ServiceApiUtil.validateAndResolveApplication(application, sliderFileSystem); + ServiceApiUtil.validateAndResolveApplication(application, + sliderFileSystem, getConfig()); persistApp(appDir, application); deployedClusterName = application.getName(); return EXIT_SUCCESS; @@ -647,7 +648,8 @@ public ApplicationId actionCreate(Application application) throws IOException, YarnException { String appName = application.getName(); validateClusterName(appName); - ServiceApiUtil.validateAndResolveApplication(application, sliderFileSystem); + ServiceApiUtil.validateAndResolveApplication(application, + sliderFileSystem, getConfig()); verifyNoLiveApp(appName, "Create"); Path appDir = checkAppNotExistOnHdfs(application); @@ -1778,7 +1780,8 @@ public int actionStart(String appName, ActionThawArgs thaw) Path appDir = checkAppExistOnHdfs(appName); Application application = ServiceApiUtil.loadApplication(sliderFileSystem, appName); - ServiceApiUtil.validateAndResolveApplication(application, sliderFileSystem); + ServiceApiUtil.validateAndResolveApplication(application, + sliderFileSystem, getConfig()); // see if it is actually running and bail out; verifyNoLiveApp(appName, "Thaw"); ApplicationId appId = submitApp(application); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java index 6dc51ec..2e1236d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java @@ -33,6 +33,7 @@ import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.io.nativeio.NativeIO; import org.apache.hadoop.net.NetUtils; +import org.apache.hadoop.registry.client.api.RegistryConstants; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.ExitUtil; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/util/RestApiErrorMessages.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/util/RestApiErrorMessages.java index 676db82..b4655cc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/util/RestApiErrorMessages.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/util/RestApiErrorMessages.java @@ -21,8 +21,13 @@ String ERROR_APPLICATION_NAME_INVALID = "Application name is either empty or not provided"; String ERROR_APPLICATION_NAME_INVALID_FORMAT = - "Application name %s is not valid - only lower case letters, digits," - + " underscore and hyphen are allowed"; + "Application name %s is not valid - only lower case letters, digits, " + + "underscore and hyphen are allowed, and the name must be no more " + + "than 63 characters"; + String ERROR_COMPONENT_NAME_INVALID = + "Component name must be no more than %s characters: %s"; + String ERROR_USER_NAME_INVALID = + "User name must be no more than 63 characters"; String ERROR_APPLICATION_NOT_RUNNING = "Application not running"; String ERROR_APPLICATION_DOES_NOT_EXIST = "Application not found"; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/util/ServiceApiUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/util/ServiceApiUtil.java index 80a31c0..ea5b77f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/util/ServiceApiUtil.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/util/ServiceApiUtil.java @@ -22,6 +22,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.registry.client.api.RegistryConstants; +import org.apache.hadoop.registry.client.binding.RegistryUtils; import org.apache.slider.api.resource.Application; import org.apache.slider.api.resource.Artifact; import org.apache.slider.api.resource.Component; @@ -56,12 +58,22 @@ public static void setJsonSerDeser(JsonSerDeser jsd) { @VisibleForTesting public static void validateAndResolveApplication(Application application, - SliderFileSystem fs) throws IOException { + SliderFileSystem fs, org.apache.hadoop.conf.Configuration conf) throws + IOException { + boolean dnsEnabled = conf.getBoolean(RegistryConstants.KEY_DNS_ENABLED, + RegistryConstants.DEFAULT_DNS_ENABLED); + if (dnsEnabled && RegistryUtils.currentUser().length() > RegistryConstants + .MAX_FQDN_LABEL_LENGTH) { + throw new IllegalArgumentException(RestApiErrorMessages + .ERROR_USER_NAME_INVALID); + } if (StringUtils.isEmpty(application.getName())) { throw new IllegalArgumentException( RestApiErrorMessages.ERROR_APPLICATION_NAME_INVALID); } - if (!SliderUtils.isClusternameValid(application.getName())) { + if (!SliderUtils.isClusternameValid(application.getName()) || (dnsEnabled + && application.getName().length() > RegistryConstants + .MAX_FQDN_LABEL_LENGTH)) { throw new IllegalArgumentException(String.format( RestApiErrorMessages.ERROR_APPLICATION_NAME_INVALID_FORMAT, application.getName())); @@ -104,6 +116,14 @@ public static void validateAndResolveApplication(Application application, List componentsToRemove = new ArrayList<>(); List componentsToAdd = new ArrayList<>(); for (Component comp : application.getComponents()) { + int maxCompLength = RegistryConstants.MAX_FQDN_LABEL_LENGTH; + if (comp.getUniqueComponentSupport()) { + maxCompLength = maxCompLength - Long.toString(Long.MAX_VALUE).length(); + } + if (dnsEnabled && comp.getName().length() > maxCompLength) { + throw new IllegalArgumentException(String.format(RestApiErrorMessages + .ERROR_COMPONENT_NAME_INVALID, maxCompLength, comp.getName())); + } if (componentNames.contains(comp.getName())) { throw new IllegalArgumentException("Component name collision: " + comp.getName()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/core/conf/TestConfigurationResolve.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/core/conf/TestConfigurationResolve.java index 5f5df70..78dd669 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/core/conf/TestConfigurationResolve.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/core/conf/TestConfigurationResolve.java @@ -20,6 +20,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.slider.api.resource.Application; import org.apache.slider.api.resource.ConfigFile; import org.apache.slider.api.resource.ConfigFile.TypeEnum; @@ -95,7 +96,8 @@ public void testOverride() throws Throwable { expect(sfs.buildClusterDirPath(anyObject())).andReturn( new Path("cluster_dir_path")).anyTimes(); replay(sfs, mockFs); - ServiceApiUtil.validateAndResolveApplication(orig, sfs); + ServiceApiUtil.validateAndResolveApplication(orig, sfs, new + YarnConfiguration()); global = orig.getConfiguration(); LOG.info("global = {}", global); @@ -179,7 +181,8 @@ public void testOverrideExternalConfiguration() throws IOException { new Path("cluster_dir_path")).anyTimes(); replay(sfs, mockFs); Application ext = ExampleAppJson.loadResource(APP_JSON); - ServiceApiUtil.validateAndResolveApplication(ext, sfs); + ServiceApiUtil.validateAndResolveApplication(ext, sfs, new + YarnConfiguration()); reset(sfs, mockFs); // perform the resolution on original application @@ -192,7 +195,8 @@ public void testOverrideExternalConfiguration() throws IOException { .anyTimes(); replay(sfs, mockFs, jsonSerDeser); ServiceApiUtil.setJsonSerDeser(jsonSerDeser); - ServiceApiUtil.validateAndResolveApplication(orig, sfs); + ServiceApiUtil.validateAndResolveApplication(orig, sfs, new + YarnConfiguration()); global = orig.getConfiguration(); assertEquals(0, global.getProperties().size()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/core/conf/TestExampleAppJson.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/core/conf/TestExampleAppJson.java index 09096d0..9aeefee 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/core/conf/TestExampleAppJson.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/core/conf/TestExampleAppJson.java @@ -20,6 +20,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.slider.api.resource.Application; import org.apache.slider.common.tools.SliderFileSystem; import org.apache.slider.util.ServiceApiUtil; @@ -71,7 +72,8 @@ public void testLoadResource() throws Throwable { new Path("cluster_dir_path")).anyTimes(); replay(sfs, mockFs); - ServiceApiUtil.validateAndResolveApplication(application, sfs); + ServiceApiUtil.validateAndResolveApplication(application, sfs, + new YarnConfiguration()); } catch (Exception e) { throw new Exception("exception loading " + resource + ":" + e.toString()); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/model/mock/BaseMockAppStateTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/model/mock/BaseMockAppStateTest.java index 5af87f9..db32c79 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/model/mock/BaseMockAppStateTest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/model/mock/BaseMockAppStateTest.java @@ -133,7 +133,7 @@ protected AppStateBindingInfo buildBindingInfo() throws IOException { AppStateBindingInfo binding = new AppStateBindingInfo(); binding.application = buildApplication(); ServiceApiUtil.validateAndResolveApplication(binding.application, - sliderFileSystem); + sliderFileSystem, SliderUtils.createConfiguration()); //binding.roles = new ArrayList<>(factory.ROLES); binding.fs = fs; binding.historyPath = historyPath; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/utils/TestServiceApiUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/utils/TestServiceApiUtil.java index 9ca3242..d17453a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/utils/TestServiceApiUtil.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/utils/TestServiceApiUtil.java @@ -19,6 +19,8 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.registry.client.api.RegistryConstants; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.slider.api.resource.Application; import org.apache.slider.api.resource.Artifact; import org.apache.slider.api.resource.Component; @@ -29,6 +31,7 @@ import org.apache.slider.util.RestApiErrorMessages; import org.apache.slider.util.ServiceApiUtil; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,26 +61,42 @@ private static final String NO_EXCEPTION_PREFIX = "Should not have thrown " + "exception: "; + private static final String LEN_64_STR = + "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01"; + + private static final YarnConfiguration CONF_DEFAULT_DNS = new + YarnConfiguration(); + private static final YarnConfiguration CONF_DNS_ENABLED = new + YarnConfiguration(); + + @BeforeClass + public static void init() { + CONF_DNS_ENABLED.setBoolean(RegistryConstants.KEY_DNS_ENABLED, true); + } + @Test(timeout = 90000) public void testResourceValidation() throws Exception { + assertEquals(RegistryConstants.MAX_FQDN_LABEL_LENGTH + 1, LEN_64_STR + .length()); + SliderFileSystem sfs = initMock(null); Application app = new Application(); // no name try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail(EXCEPTION_PREFIX + "application with no name"); } catch (IllegalArgumentException e) { assertEquals(ERROR_APPLICATION_NAME_INVALID, e.getMessage()); } // bad format name - String[] badNames = {"4finance", "Finance", "finance@home"}; + String[] badNames = {"4finance", "Finance", "finance@home", LEN_64_STR}; for (String badName : badNames) { app.setName(badName); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail(EXCEPTION_PREFIX + "application with bad name " + badName); } catch (IllegalArgumentException e) { assertEquals(String.format( @@ -86,9 +105,20 @@ public void testResourceValidation() throws Exception { } // launch command not specified - app.setName("finance_home"); + app.setName(LEN_64_STR); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DEFAULT_DNS); + Assert.fail(EXCEPTION_PREFIX + "application with no launch command"); + } catch (IllegalArgumentException e) { + assertEquals(RestApiErrorMessages.ERROR_ABSENT_LAUNCH_COMMAND, + e.getMessage()); + } + + // launch command not specified + app.setName(LEN_64_STR.substring(0, RegistryConstants + .MAX_FQDN_LABEL_LENGTH)); + try { + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail(EXCEPTION_PREFIX + "application with no launch command"); } catch (IllegalArgumentException e) { assertEquals(RestApiErrorMessages.ERROR_ABSENT_LAUNCH_COMMAND, @@ -98,7 +128,7 @@ public void testResourceValidation() throws Exception { // resource not specified app.setLaunchCommand("sleep 3600"); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail(EXCEPTION_PREFIX + "application with no resource"); } catch (IllegalArgumentException e) { assertEquals(String.format( @@ -110,7 +140,7 @@ public void testResourceValidation() throws Exception { Resource res = new Resource(); app.setResource(res); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail(EXCEPTION_PREFIX + "application with no memory"); } catch (IllegalArgumentException e) { assertEquals(String.format( @@ -122,7 +152,7 @@ public void testResourceValidation() throws Exception { res.setMemory("100mb"); res.setCpus(-2); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail( EXCEPTION_PREFIX + "application with invalid no of cpus"); } catch (IllegalArgumentException e) { @@ -134,7 +164,7 @@ public void testResourceValidation() throws Exception { // number of containers not specified res.setCpus(2); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail(EXCEPTION_PREFIX + "application with no container count"); } catch (IllegalArgumentException e) { Assert.assertTrue(e.getMessage() @@ -144,7 +174,7 @@ public void testResourceValidation() throws Exception { // specifying profile along with cpus/memory raises exception res.setProfile("hbase_finance_large"); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail(EXCEPTION_PREFIX + "application with resource profile along with cpus/memory"); } catch (IllegalArgumentException e) { @@ -159,7 +189,7 @@ public void testResourceValidation() throws Exception { res.setCpus(null); res.setMemory(null); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail(EXCEPTION_PREFIX + "application with resource profile only"); } catch (IllegalArgumentException e) { assertEquals(ERROR_RESOURCE_PROFILE_NOT_SUPPORTED_YET, @@ -173,7 +203,7 @@ public void testResourceValidation() throws Exception { // null number of containers try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail(EXCEPTION_PREFIX + "null number of containers"); } catch (IllegalArgumentException e) { Assert.assertTrue(e.getMessage() @@ -183,7 +213,7 @@ public void testResourceValidation() throws Exception { // negative number of containers app.setNumberOfContainers(-1L); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail(EXCEPTION_PREFIX + "negative number of containers"); } catch (IllegalArgumentException e) { Assert.assertTrue(e.getMessage() @@ -193,7 +223,7 @@ public void testResourceValidation() throws Exception { // everything valid here app.setNumberOfContainers(5L); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); } catch (IllegalArgumentException e) { LOG.error("application attributes specified should be valid here", e); Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage()); @@ -215,7 +245,7 @@ public void testArtifacts() throws IOException { Artifact artifact = new Artifact(); app.setArtifact(artifact); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail(EXCEPTION_PREFIX + "application with no artifact id"); } catch (IllegalArgumentException e) { assertEquals(ERROR_ARTIFACT_ID_INVALID, e.getMessage()); @@ -224,7 +254,7 @@ public void testArtifacts() throws IOException { // no artifact id fails with APPLICATION type artifact.setType(Artifact.TypeEnum.APPLICATION); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail(EXCEPTION_PREFIX + "application with no artifact id"); } catch (IllegalArgumentException e) { assertEquals(ERROR_ARTIFACT_ID_INVALID, e.getMessage()); @@ -233,7 +263,7 @@ public void testArtifacts() throws IOException { // no artifact id fails with TARBALL type artifact.setType(Artifact.TypeEnum.TARBALL); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail(EXCEPTION_PREFIX + "application with no artifact id"); } catch (IllegalArgumentException e) { assertEquals(ERROR_ARTIFACT_ID_INVALID, e.getMessage()); @@ -243,7 +273,7 @@ public void testArtifacts() throws IOException { artifact.setType(Artifact.TypeEnum.DOCKER); artifact.setId("docker.io/centos:centos7"); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); } catch (IllegalArgumentException e) { LOG.error("application attributes specified should be valid here", e); Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage()); @@ -311,7 +341,7 @@ public void testExternalApplication() throws IOException { app.setArtifact(artifact); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); } catch (IllegalArgumentException e) { Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage()); } @@ -330,7 +360,7 @@ public void testDuplicateComponents() throws IOException { // duplicate component name fails try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); Assert.fail(EXCEPTION_PREFIX + "application with component collision"); } catch (IllegalArgumentException e) { assertEquals("Component name collision: " + compName, e.getMessage()); @@ -350,7 +380,7 @@ public void testExternalDuplicateComponent() throws IOException { // duplicate component name okay in the case of APPLICATION component try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); } catch (IllegalArgumentException e) { Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage()); } @@ -368,7 +398,7 @@ public void testExternalComponent() throws IOException { app.setArtifact(artifact); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); } catch (IllegalArgumentException e) { Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage()); } @@ -381,7 +411,7 @@ public void testExternalComponent() throws IOException { app.getComponent("comp2").setArtifact(artifact); try { - ServiceApiUtil.validateAndResolveApplication(app, sfs); + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); } catch (IllegalArgumentException e) { Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage()); } @@ -390,4 +420,52 @@ public void testExternalComponent() throws IOException { // original component replaced by external component assertNotNull(app.getComponent("comp1")); } + + @Test + public void testInvalidComponent() throws IOException { + SliderFileSystem sfs = initMock(null); + testComponent(sfs, false); + testComponent(sfs, true); + } + + private static void testComponent(SliderFileSystem sfs, boolean unique) + throws IOException { + int maxLen = RegistryConstants.MAX_FQDN_LABEL_LENGTH; + if (unique) { + assertEquals(19, Long.toString(Long.MAX_VALUE).length()); + maxLen = maxLen - Long.toString(Long.MAX_VALUE).length(); + } + String compName = LEN_64_STR.substring(0, maxLen + 1); + Application app = createValidApplication(null); + app.addComponent(createValidComponent(compName).uniqueComponentSupport( + unique)); + + // invalid component name fails if dns is enabled + try { + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); + Assert.fail(EXCEPTION_PREFIX + "application with invalid component name"); + } catch (IllegalArgumentException e) { + assertEquals(String.format(RestApiErrorMessages + .ERROR_COMPONENT_NAME_INVALID, maxLen, compName), e.getMessage()); + } + + // does not fail if dns is disabled + try { + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DEFAULT_DNS); + } catch (IllegalArgumentException e) { + Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage()); + } + + compName = LEN_64_STR.substring(0, maxLen); + app = createValidApplication(null); + app.addComponent(createValidComponent(compName).uniqueComponentSupport( + unique)); + + // does not fail + try { + ServiceApiUtil.validateAndResolveApplication(app, sfs, CONF_DNS_ENABLED); + } catch (IllegalArgumentException e) { + Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage()); + } + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/api/RegistryConstants.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/api/RegistryConstants.java index f4fecfd..e66a761 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/api/RegistryConstants.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/api/RegistryConstants.java @@ -78,6 +78,11 @@ String KEY_DNS_DOMAIN = DNS_PREFIX + "domain-name"; /** + * Max length of a label (node delimited by a dot in the FQDN). + */ + int MAX_FQDN_LABEL_LENGTH = 63; + + /** * DNS bind address. */ String KEY_DNS_BIND_ADDRESS = DNS_PREFIX + "bind-address";