This is an automated email from the ASF dual-hosted git repository.
eyang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new c34ceb5 YARN-9568. Fixed NPE in MiniYarnCluster during
FileSystemNodeAttributeStore.recover. Contributed by Steve Loughran
c34ceb5 is described below
commit c34ceb5fde9f6d3d692640eb2a27d97990f17350
Author: Eric Yang <ey...@apache.org>
AuthorDate: Thu Jul 18 12:30:53 2019 -0400
YARN-9568. Fixed NPE in MiniYarnCluster during
FileSystemNodeAttributeStore.recover.
Contributed by Steve Loughran
---
.../test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
index 5edd3ca..68d97ee 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
@@ -313,7 +313,13 @@ public class MiniYARNCluster extends CompositeService {
YarnConfiguration.DEFAULT_TIMELINE_SERVICE_ENABLED) || enableAHS) {
addService(new ApplicationHistoryServerWrapper());
}
-
+ // to ensure that any FileSystemNodeAttributeStore started by the RM always
+ // uses a unique path, if unset, force it under the test dir.
+ if (conf.get(YarnConfiguration.FS_NODE_ATTRIBUTE_STORE_ROOT_DIR) == null) {
+ File nodeAttrDir = new File(getTestWorkDir(), "nodeattributes");
+ conf.set(YarnConfiguration.FS_NODE_ATTRIBUTE_STORE_ROOT_DIR,
+ nodeAttrDir.getCanonicalPath());
+ }
super.serviceInit(
conf instanceof YarnConfiguration ? conf : new
YarnConfiguration(conf));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
