Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1454 from optimizely/hao/hadoop-fixes 

A couple of hdfs related fixes
This commit is contained in:
Charles Allen 2015-06-23 13:40:25 -07:00
parent 726ed432a1 1931491c9f
commit 8795792dba
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsStorageDruidModule.java
View File

@ -81,6 +81,10 @@ public class HdfsStorageDruidModule implements DruidModule
Binders.dataSegmentKillerBinder(binder).addBinding(SCHEME).to(HdfsDataSegmentKiller.class).in(LazySingleton.class); Binders.dataSegmentKillerBinder(binder).addBinding(SCHEME).to(HdfsDataSegmentKiller.class).in(LazySingleton.class);
final Configuration conf = new Configuration(); final Configuration conf = new Configuration();
// Set explicit CL. Otherwise it'll try to use thread context CL, which may not have all of our dependencies.
conf.setClassLoader(getClass().getClassLoader());
if (props != null) { if (props != null) {
for (String propName : System.getProperties().stringPropertyNames()) { for (String propName : System.getProperties().stringPropertyNames()) {
if (propName.startsWith("hadoop.")) { if (propName.startsWith("hadoop.")) {

2
indexing-hadoop/src/main/java/io/druid/indexer/JobHelper.java
View File

@ -518,7 +518,7 @@ public class JobHelper
public static Path prependFSIfNullScheme(FileSystem fs, Path path) public static Path prependFSIfNullScheme(FileSystem fs, Path path)
{ {
if (path.toUri().getScheme() == null) { if (path.toUri().getScheme() == null) {
path = new Path(fs.getUri().toString(), String.format("./%s", path)); path = fs.makeQualified(path);
} }
return path; return path;
} }