This is an automated email from the ASF dual-hosted git repository.
jeagles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tez.git
The following commit(s) were added to refs/heads/master by this push:
new fd19ce6 TEZ-4123. TestMRRJobsDAGApi flaky timeout - unhealthy node
fd19ce6 is described below
commit fd19ce6c93bc1f899ccca7161b0c0407f850bd77
Author: László Bodor <[email protected]>
AuthorDate: Wed Feb 12 10:09:26 2020 -0600
TEZ-4123. TestMRRJobsDAGApi flaky timeout - unhealthy node
Signed-off-by: Jonathan Eagles <[email protected]>
---
.../java/org/apache/tez/test/MiniTezCluster.java | 9 ++++
.../org/apache/tez/test/TestMiniTezCluster.java | 53 ++++++++++++++++++++++
2 files changed, 62 insertions(+)
diff --git a/tez-tests/src/test/java/org/apache/tez/test/MiniTezCluster.java
b/tez-tests/src/test/java/org/apache/tez/test/MiniTezCluster.java
index bac0e8c..17c6885 100644
--- a/tez-tests/src/test/java/org/apache/tez/test/MiniTezCluster.java
+++ b/tez-tests/src/test/java/org/apache/tez/test/MiniTezCluster.java
@@ -89,6 +89,15 @@ public class MiniTezCluster extends MiniYARNCluster {
}
@Override
+ public void init(Configuration conf) {
+ if (conf.getFloat(YarnConfiguration.NM_MAX_PER_DISK_UTILIZATION_PERCENTAGE,
+ YarnConfiguration.DEFAULT_NM_MAX_PER_DISK_UTILIZATION_PERCENTAGE) ==
YarnConfiguration.DEFAULT_NM_MAX_PER_DISK_UTILIZATION_PERCENTAGE) {
+ conf.setFloat(YarnConfiguration.NM_MAX_PER_DISK_UTILIZATION_PERCENTAGE,
99.0f);
+ }
+ super.init(conf);
+ }
+
+ @Override
public void serviceInit(Configuration conf) throws Exception {
conf.set(MRConfig.FRAMEWORK_NAME, MRConfig.YARN_TEZ_FRAMEWORK_NAME);
// Use libs from cluster since no build is available
diff --git
a/tez-tests/src/test/java/org/apache/tez/test/TestMiniTezCluster.java
b/tez-tests/src/test/java/org/apache/tez/test/TestMiniTezCluster.java
new file mode 100644
index 0000000..4fda977
--- /dev/null
+++ b/tez-tests/src/test/java/org/apache/tez/test/TestMiniTezCluster.java
@@ -0,0 +1,53 @@
+/**
+* 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.tez.test;
+
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestMiniTezCluster {
+
+ @Test
+ public void testOverrideYarnDiskHealthCheck() throws IOException {
+ MiniTezCluster tezMiniCluster = new
MiniTezCluster(TestMiniTezCluster.class.getName(), 1, 1, 1);
+ tezMiniCluster.init(new Configuration());
+ tezMiniCluster.start();
+
+ // overrides if not set
+ Assert.assertEquals(99.0, tezMiniCluster.getConfig()
+ .getFloat(YarnConfiguration.NM_MAX_PER_DISK_UTILIZATION_PERCENTAGE,
-1), 0.00001);
+
+ tezMiniCluster.close();
+
+ tezMiniCluster = new MiniTezCluster(TestMiniTezCluster.class.getName(), 1,
1, 1);
+ Configuration conf = new Configuration();
+ conf.setFloat(YarnConfiguration.NM_MAX_PER_DISK_UTILIZATION_PERCENTAGE,
50);
+ tezMiniCluster.init(conf);
+ tezMiniCluster.start();
+
+ // respects provided non-default value
+ Assert.assertEquals(50.0, tezMiniCluster.getConfig()
+ .getFloat(YarnConfiguration.NM_MAX_PER_DISK_UTILIZATION_PERCENTAGE,
-1), 0.00001);
+
+ tezMiniCluster.close();
+ }
+}
