Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-11053. AuxService should not use class name as default system classes (#3816) 

Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit 4db27acf06)
This commit is contained in:
Cheng Pan 2021-12-24 10:08:04 +08:00 committed by Akira Ajisaka
parent 6c252cfb44
commit 7b51e6824d
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java
View File

@ -240,7 +240,7 @@ public class AuxServices extends AbstractService
} }
return AuxiliaryServiceWithCustomClassLoader.getInstance(conf, className, 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); + " is using the custom classloader with classpath " + destFiles);
return AuxiliaryServiceWithCustomClassLoader.getInstance(conf, return AuxiliaryServiceWithCustomClassLoader.getInstance(conf,
className, StringUtils.join(File.pathSeparatorChar, destFiles), className, StringUtils.join(File.pathSeparatorChar, destFiles),
getSystemClasses(service, className)); getSystemClasses(service));
} else { } else {
return createAuxServiceFromConfiguration(service); return createAuxServiceFromConfiguration(service);
} }
@ -681,15 +681,12 @@ public class AuxServices extends AbstractService
return serviceConf.getProperty(CLASS_NAME); return serviceConf.getProperty(CLASS_NAME);
} }
private static String[] getSystemClasses(AuxServiceRecord service, String private static String[] getSystemClasses(AuxServiceRecord service) {
className) { AuxServiceConfiguration serviceConf = service.getConfiguration();
AuxServiceConfiguration serviceConf = if (serviceConf == null || serviceConf.getProperty(SYSTEM_CLASSES) == null) {
service.getConfiguration(); return new String[]{};
if (serviceConf == null) {
return new String[]{className};
} }
return StringUtils.split(serviceConf.getProperty(SYSTEM_CLASSES, return StringUtils.split(serviceConf.getProperty(SYSTEM_CLASSES));
className));
} }
/** /**