Skip to content

Commit 1c8d42a

Browse files
committed
Merge pull request #106 from gluster/hadoop-2.1.0
merge FORKED fixes from hadoop-2.1.0 into master
2 parents 1b72670 + 2670bd2 commit 1c8d42a

File tree

2 files changed

+6
-75
lines changed

2 files changed

+6
-75
lines changed

src/main/java/org/apache/hadoop/fs/glusterfs/GlusterVolume.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,19 @@ public void setConf(Configuration conf){
136136
}
137137

138138
if(sameVolume(mapredSysDirectory) && !exists(mapredSysDirectory) ){
139-
mkdirs(mapredSysDirectory);
139+
// mkdirs(mapredSysDirectory);
140+
log.warn("mapred.system.dir/mapreduce.jobtracker.system.dir does not exist: " + mapredSysDirectory);
140141
}
141142
//Working directory setup
142143

143144
Path workingDirectory = getInitialWorkingDirectory();
144145
if(!sameVolume(workingDirectory)){
145146
workingDirectory = new Path("/");
146147
}else if( !exists(workingDirectory)){
147-
mkdirs(workingDirectory);
148+
// mkdirs(workingDirectory);
149+
log.warn("working directory does not exist: " + workingDirectory);
148150
}
151+
149152
setWorkingDirectory(workingDirectory);
150153

151154

@@ -291,7 +294,7 @@ public FileStatus[] listStatus(Path f) throws IOException {
291294
}
292295

293296
if(localf.isDirectory() && !localf.canRead()){
294-
throw new IOException("Access denied : " + localf.getPath());
297+
throw new IOException("Access denied : " + f.toString());
295298
}
296299

297300
File[] names = localf.listFiles();

src/main/java/org/apache/hadoop/yarn/server/nodemanager/GlusterContainerExecutor.java

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)