big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-8574. Allow dot in attribute values. Contributed by Bibin A Chundatt.

Browse Source
This commit is contained in:
Naganarasimha 2018-07-29 13:52:52 +08:00 committed by Sunil G
parent eb08543c7a
commit 8c947398ab
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NodeLabelUtil.java
View File

@ -38,6 +38,8 @@ private NodeLabelUtil() {
Pattern.compile("^[0-9a-zA-Z][0-9a-zA-Z-_]*"); Pattern.compile("^[0-9a-zA-Z][0-9a-zA-Z-_]*");
private static final Pattern PREFIX_PATTERN = private static final Pattern PREFIX_PATTERN =
Pattern.compile("^[0-9a-zA-Z][0-9a-zA-Z-_\\.]*"); Pattern.compile("^[0-9a-zA-Z][0-9a-zA-Z-_\\.]*");
private static final Pattern ATTRIBUTE_VALUE_PATTERN =
Pattern.compile("^[0-9a-zA-Z][0-9a-zA-Z-_.]*");
public static void checkAndThrowLabelName(String label) throws IOException { public static void checkAndThrowLabelName(String label) throws IOException {
if (label == null || label.isEmpty() || label.length() > MAX_LABEL_LENGTH) { if (label == null || label.isEmpty() || label.length() > MAX_LABEL_LENGTH) {
@ -69,7 +71,7 @@ public static void checkAndThrowAttributeValue(String value)
return; return;
} }
boolean match = LABEL_OR_VALUE_PATTERN.matcher(value).matches(); boolean match = ATTRIBUTE_VALUE_PATTERN.matcher(value).matches();
if (!match) { if (!match) {
throw new IOException("attribute value should only contains " throw new IOException("attribute value should only contains "

47
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestNodeLabelUtil.java Normal file
View File

@ -0,0 +1,47 @@
/**
* 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.nodelabels;
import static org.junit.Assert.fail;
import org.junit.Test;
public class TestNodeLabelUtil {
@Test
public void testAttributeValueAddition() {
String[] values =
new String[] {"1_8", "1.8", "ABZ", "ABZ", "az", "a-z","a_z", "123456789"};
for (String val : values) {
try {
NodeLabelUtil.checkAndThrowAttributeValue(val);
} catch (Exception e) {
fail("Valid values for NodeAttributeValue :" + val);
}
}
String[] invalidVals = new String[] {"_18","1,8","1/5",".15","1\\5"};
for (String val : invalidVals) {
try {
NodeLabelUtil.checkAndThrowAttributeValue(val);
fail("Valid values for NodeAttributeValue :" + val);
} catch (Exception e) {
// IGNORE
}
}
}
}