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 aa...@apache.org on 2021/12/24 02:08:50 UTC
[hadoop] branch trunk updated: YARN-11053. AuxService should not use class name as default system classes (#3816)
This is an automated email from the ASF dual-hosted git repository.
aajisaka 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 4db27ac YARN-11053. AuxService should not use class name as default system classes (#3816)
4db27ac is described below
commit 4db27acf06cb8526e3aa84a18904baa7ddd2c7c8
Author: Cheng Pan <37...@qq.com>
AuthorDate: Fri Dec 24 10:08:04 2021 +0800
YARN-11053. AuxService should not use class name as default system classes (#3816)
Signed-off-by: Akira Ajisaka <aa...@apache.org>
---
.../nodemanager/containermanager/AuxServices.java | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java
index 5697c8f..794ef9d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java
@@ -240,7 +240,7 @@ public class AuxServices extends AbstractService
}
return AuxiliaryServiceWithCustomClassLoader.getInstance(conf, className,
- appLocalClassPath, getSystemClasses(service, className));
+ appLocalClassPath, getSystemClasses(service));
}
/**
@@ -292,7 +292,7 @@ public class AuxServices extends AbstractService
+ " is using the custom classloader with classpath " + destFiles);
return AuxiliaryServiceWithCustomClassLoader.getInstance(conf,
className, StringUtils.join(File.pathSeparatorChar, destFiles),
- getSystemClasses(service, className));
+ getSystemClasses(service));
} else {
return createAuxServiceFromConfiguration(service);
}
@@ -681,15 +681,12 @@ public class AuxServices extends AbstractService
return serviceConf.getProperty(CLASS_NAME);
}
- private static String[] getSystemClasses(AuxServiceRecord service, String
- className) {
- AuxServiceConfiguration serviceConf =
- service.getConfiguration();
- if (serviceConf == null) {
- return new String[]{className};
+ private static String[] getSystemClasses(AuxServiceRecord service) {
+ AuxServiceConfiguration serviceConf = service.getConfiguration();
+ if (serviceConf == null || serviceConf.getProperty(SYSTEM_CLASSES) == null) {
+ return new String[]{};
}
- return StringUtils.split(serviceConf.getProperty(SYSTEM_CLASSES,
- className));
+ return StringUtils.split(serviceConf.getProperty(SYSTEM_CLASSES));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org