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

Revert HBASE-3470 since it breaks job submission (HBASE-3517) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1068699 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon 2011-02-09 00:22:38 +00:00
parent ef29cac094
commit b43483b764
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -102,7 +102,6 @@ Release 0.90.1 - Unreleased
HBASE-3483 Memstore lower limit should trigger asynchronous flushes
IMPROVEMENTS
HBASE-3470 Check that hbase-default.xml is loaded from within jar
HBASE-3508 LruBlockCache statistics thread should have a name
HBASE-3511 Allow rolling restart to apply to only RS or only masters
HBASE-3510 Add thread name for IPC reader threads

29
src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
View File

@ -19,7 +19,6 @@
*/
package org.apache.hadoop.hbase;
import java.net.URL;
import java.util.Map.Entry;
import org.apache.commons.logging.Log;
@ -59,35 +58,7 @@ public class HBaseConfiguration extends Configuration {
}
}
/**
* Check that the hbase-defaults.xml file is being loaded from within
* the hbase jar, rather than somewhere else on the classpath.
*/
private static void checkDefaultsInJar(Configuration conf) {
ClassLoader cl = conf.getClassLoader();
URL url = cl.getResource("hbase-default.xml");
if (url == null) {
// This is essentially an assertion failure - we compile this
// into our own jar, so there's something really wacky about
// the classloader context!
throw new AssertionError("hbase-default.xml not on classpath");
}
if (!"jar".equals(url.getProtocol()) &&
!url.getPath().endsWith("target/classes/hbase-default.xml")) {
throw new RuntimeException(
"hbase-defaults.xml is being loaded from " + url + " rather than " +
"the HBase JAR. This is dangerous since you may pick up defaults " +
"from a previously installed version of HBase. Please remove " +
"hbase-default.xml from your configuration directory.");
}
}
public static Configuration addHbaseResources(Configuration conf) {
checkDefaultsInJar(conf);
conf.addResource("hbase-default.xml");
conf.addResource("hbase-site.xml");
return conf;