This is an automated email from the ASF dual-hosted git repository.
epayne pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new d345994 YARN-9444. YARN API ResourceUtils's
getRequestedResourcesFromConfig doesn't recognize yarn.io/gpu as a valid
resource. Contributed by Gergely Pollak
d345994 is described below
commit d3459944686137212b78f6864da49446a2380ae8
Author: Szilard Nemeth <[email protected]>
AuthorDate: Tue Nov 26 16:42:33 2019 +0100
YARN-9444. YARN API ResourceUtils's getRequestedResourcesFromConfig doesn't
recognize yarn.io/gpu as a valid resource. Contributed by Gergely Pollak
(cherry picked from commit 52e9ee39a12ce91b3a545603dcf1103518ad2920)
---
.../hadoop/yarn/util/resource/ResourceUtils.java | 4 +-
.../yarn/util/resource/TestResourceUtils.java | 45 ++++++++++++++++++++++
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java
index fd8be24..5061604 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java
@@ -67,6 +67,8 @@ public class ResourceUtils {
"^(((\\p{Alnum}([\\p{Alnum}-]*\\p{Alnum})?\\.)*"
+ "\\p{Alnum}([\\p{Alnum}-]*\\p{Alnum})?)/)?\\p{Alpha}([\\w.-]*)$");
+ public static final String YARN_IO_OPTIONAL = "(yarn\\.io/)?";
+
private static volatile boolean initializedResources = false;
private static final Map<String, Integer> RESOURCE_NAME_TO_INDEX =
new ConcurrentHashMap<String, Integer>();
@@ -664,7 +666,7 @@ public class ResourceUtils {
Configuration configuration, String prefix) {
List<ResourceInformation> result = new ArrayList<>();
Map<String, String> customResourcesMap = configuration
- .getValByRegex("^" + Pattern.quote(prefix) + "[^.]+$");
+ .getValByRegex("^" + Pattern.quote(prefix) + YARN_IO_OPTIONAL +
"[^.]+$");
for (Entry<String, String> resource : customResourcesMap.entrySet()) {
String resourceName = resource.getKey().substring(prefix.length());
Matcher matcher =
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceUtils.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceUtils.java
index 95cf83e..5a6ebf9 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceUtils.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceUtils.java
@@ -37,8 +37,12 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* Test class to verify all resource utility methods.
@@ -204,6 +208,47 @@ public class TestResourceUtils {
}
@Test
+ public void testGetRequestedResourcesFromConfig() {
+ Configuration conf = new Configuration();
+
+ //these resource type configurations should be recognised
+ String propertyPrefix = "mapreduce.mapper.proper.rt.";
+ String[] expectedKeys = {
+ "yarn.io/gpu",
+ "yarn.io/fpga",
+ "yarn.io/anything_without_a_dot",
+ "regular_rt",
+ "regular_rt/with_slash"};
+
+ String[] invalidKeys = {
+ propertyPrefix + "too.many_parts",
+ propertyPrefix + "yarn.notio/gpu",
+ "incorrect.prefix.yarn.io/gpu",
+ propertyPrefix + "yarn.io/",
+ propertyPrefix};
+
+ for (String s : expectedKeys) {
+ //setting the properties which are expected to be in the resource list
+ conf.set(propertyPrefix + s, "42");
+ }
+
+ for (String s : invalidKeys) {
+ //setting the properties which are expected to be in the resource list
+ conf.set(s, "24");
+ }
+
+ List<ResourceInformation> properList =
+ ResourceUtils.getRequestedResourcesFromConfig(conf, propertyPrefix);
+ Set<String> expectedSet =
+ new HashSet<>(Arrays.asList(expectedKeys));
+
+ Assert.assertEquals(properList.size(), expectedKeys.length);
+ properList.forEach(
+ item -> Assert.assertTrue(expectedSet.contains(item.getName())));
+
+ }
+
+ @Test
public void testGetResourceTypesConfigErrors() throws IOException {
Configuration conf = new YarnConfiguration();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
