HADOOP-11211. mapreduce.job.classloader.system.classes semantics should be order-independent. (Yitong Zhou via gera)

This commit is contained in:
Gera Shegalov 2014-12-11 12:25:25 -08:00
parent b9f6d0c956
commit 0bcea111e5
4 changed files with 46 additions and 11 deletions

View File

@ -572,6 +572,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11386. Replace \n by %n in format hadoop-common format strings.
(Li Lu via wheat9)
HADOOP-11211. mapreduce.job.classloader.system.classes semantics should be
be order-independent. (Yitong Zhou via gera)
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES

View File

@ -216,28 +216,43 @@ protected synchronized Class<?> loadClass(String name, boolean resolve)
return c;
}
/**
* Checks if a class should be included as a system class.
*
* A class is a system class if and only if it matches one of the positive
* patterns and none of the negative ones.
*
* @param name the class name to check
* @param systemClasses a list of system class configurations.
* @return true if the class is a system class
*/
public static boolean isSystemClass(String name, List<String> systemClasses) {
boolean result = false;
if (systemClasses != null) {
String canonicalName = name.replace('/', '.');
while (canonicalName.startsWith(".")) {
canonicalName=canonicalName.substring(1);
}
for (String c : systemClasses) {
boolean result = true;
boolean shouldInclude = true;
if (c.startsWith("-")) {
c = c.substring(1);
result = false;
shouldInclude = false;
}
if (canonicalName.startsWith(c)) {
if ( c.endsWith(".") // package
|| canonicalName.length() == c.length() // class
|| canonicalName.length() > c.length() // nested
&& canonicalName.charAt(c.length()) == '$' ) {
return result;
}
}
}
}
if (shouldInclude) {
result = true;
} else {
return false;
}
}
}
}
}
return result;
}
}

View File

@ -112,6 +112,10 @@ private void testIsSystemClassInternal(String nestedClass) {
classes("-org.example.Foo,org.example.")));
assertTrue(isSystemClass("org.example.Bar" + nestedClass,
classes("-org.example.Foo.,org.example.")));
assertFalse(isSystemClass("org.example.Foo" + nestedClass,
classes("org.example.,-org.example.Foo")));
assertFalse(isSystemClass("org.example.Foo" + nestedClass,
classes("org.example.Foo,-org.example.Foo")));
}
private List<String> classes(String classes) {

View File

@ -1363,10 +1363,23 @@
<value></value>
<description>Used to override the default definition of the system classes for
the job classloader. The system classes are a comma-separated list of
classes that should be loaded from the system classpath, not the
user-supplied JARs, when mapreduce.job.classloader is enabled. Names ending
in '.' (period) are treated as package names, and names starting with a '-'
are treated as negative matches.
patterns that indicate whether to load a class from the system classpath,
instead from the user-supplied JARs, when mapreduce.job.classloader is
enabled.
A positive pattern is defined as:
1. A single class name 'C' that matches 'C' and transitively all nested
classes 'C$*' defined in C;
2. A package name ending with a '.' (e.g., "com.example.") that matches
all classes from that package.
A negative pattern is defined by a '-' in front of a positive pattern
(e.g., "-com.example.").
A class is considered a system class if and only if it matches one of the
positive patterns and none of the negative ones. More formally:
A class is a member of the inclusion set I if it matches one of the positive
patterns. A class is a member of the exclusion set E if it matches one of
the negative patterns. The set of system classes S = I \ E.
</description>
</property>