You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sn...@apache.org on 2019/10/09 11:16:15 UTC
[hadoop] branch branch-3.1 updated: YARN-9356. Add more tests to
ratio method in TestResourceCalculator. Contributed by Zoltan Siegl
This is an automated email from the ASF dual-hosted git repository.
snemeth pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new d1415b6 YARN-9356. Add more tests to ratio method in TestResourceCalculator. Contributed by Zoltan Siegl
d1415b6 is described below
commit d1415b66b71b0f3668a455221292829ebc47aee7
Author: Szilard Nemeth <sn...@apache.org>
AuthorDate: Wed Oct 9 13:09:09 2019 +0200
YARN-9356. Add more tests to ratio method in TestResourceCalculator. Contributed by Zoltan Siegl
(cherry picked from commit 35f093f5b3f310af49a8bb476e62173862f5af51)
(cherry picked from commit 0ddb48a3038d9c5132efd9f48110f9d23c53ac67)
---
.../yarn/util/resource/TestResourceCalculator.java | 47 ++++++++++++++++++++--
1 file changed, 44 insertions(+), 3 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceCalculator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceCalculator.java
index 58f40be..1a7599f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceCalculator.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceCalculator.java
@@ -34,6 +34,8 @@ import static org.junit.Assert.assertEquals;
@RunWith(Parameterized.class)
public class TestResourceCalculator {
+ private static final String EXTRA_RESOURCE_NAME = "test";
+
private final ResourceCalculator resourceCalculator;
@Parameterized.Parameters
@@ -53,7 +55,7 @@ public class TestResourceCalculator {
private static void setupExtraResource() {
Configuration conf = new Configuration();
- conf.set(YarnConfiguration.RESOURCE_TYPES, "test");
+ conf.set(YarnConfiguration.RESOURCE_TYPES, EXTRA_RESOURCE_NAME);
ResourceUtils.resetResourceTypes(conf);
}
@@ -95,10 +97,10 @@ public class TestResourceCalculator {
return res;
}
- private Resource newResource(long memory, int cpu, int test) {
+ private Resource newResource(long memory, int cpu, int extraResource) {
Resource res = newResource(memory, cpu);
- res.setResourceValue("test", test);
+ res.setResourceValue(EXTRA_RESOURCE_NAME, extraResource);
return res;
}
@@ -415,4 +417,43 @@ public class TestResourceCalculator {
assertEquals(2, result.getVirtualCores());
}
}
+
+ @Test
+ public void testRatioWithNoExtraResource() {
+ //setup
+ Resource resource1 = newResource(1, 1);
+ Resource resource2 = newResource(2, 1);
+
+ //act
+ float ratio = resourceCalculator.ratio(resource1, resource2);
+
+ //assert
+ if (resourceCalculator instanceof DefaultResourceCalculator) {
+ double ratioOfMemories = 0.5;
+ assertEquals(ratioOfMemories, ratio, 0.00001);
+ } else if (resourceCalculator instanceof DominantResourceCalculator) {
+ double ratioOfCPUs = 1.0;
+ assertEquals(ratioOfCPUs, ratio, 0.00001);
+ }
+ }
+
+ @Test
+ public void testRatioWithExtraResource() {
+ //setup
+ setupExtraResource();
+ Resource resource1 = newResource(1, 1, 2);
+ Resource resource2 = newResource(2, 1, 1);
+
+ //act
+ float ratio = resourceCalculator.ratio(resource1, resource2);
+
+ //assert
+ if (resourceCalculator instanceof DefaultResourceCalculator) {
+ double ratioOfMemories = 0.5;
+ assertEquals(ratioOfMemories, ratio, 0.00001);
+ } else if (resourceCalculator instanceof DominantResourceCalculator) {
+ double ratioOfExtraResources = 2.0;
+ assertEquals(ratioOfExtraResources, ratio, 0.00001);
+ }
+ }
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org