@@ -52,8 +52,8 @@ public class GlusterVolume extends RawLocalFileSystem{
52
52
public static final URI NAME = URI .create ("glusterfs:///" );
53
53
54
54
protected String root =null ;
55
- protected String superUser = null ;
56
- protected AclPathFilter aclFilter = null ;
55
+
56
+
57
57
58
58
protected static GlusterFSXattr attr = null ;
59
59
@@ -93,12 +93,7 @@ public void setConf(Configuration conf){
93
93
if (!exists (mapredSysDirectory )){
94
94
mkdirs (mapredSysDirectory );
95
95
}
96
- //ACL setup
97
- aclFilter = new AclPathFilter (conf );
98
- superUser = conf .get ("gluster.daemon.user" , null );
99
- log .info ("mapreduce/superuser daemon : " + superUser );
100
-
101
- //Working directory setup
96
+ //Working directory setup
102
97
Path workingDirectory = getInitialWorkingDirectory ();
103
98
mkdirs (workingDirectory );
104
99
setWorkingDirectory (workingDirectory );
@@ -228,36 +223,18 @@ public long getBlockSize(Path path) throws IOException{
228
223
229
224
return blkSz ;
230
225
}
231
- /*
232
- * ensures the 'super user' is given read/write access.
233
- * the ACL drops off after a chmod or chown.
234
- */
235
-
236
- private void updateAcl (Path p ){
237
- if (superUser !=null && aclFilter .matches (p ) ){
238
- File f = pathToFile (p );
239
- String path = f .getAbsolutePath ();
240
- String command = "setfacl -m u:" + superUser + ":rwx " + path ;
241
- try {
242
- Runtime .getRuntime ().exec (command );
243
- }catch (IOException ex ){
244
- throw new RuntimeException (ex );
245
- }
246
- }
247
- }
248
226
249
227
public void setOwner (Path p , String username , String groupname )
250
228
throws IOException {
251
229
super .setOwner (p ,username ,groupname );
252
- updateAcl (p );
253
230
254
231
}
255
232
256
233
public void setPermission (Path p , FsPermission permission )
257
234
throws IOException {
258
235
super .setPermission (p ,permission );
259
- updateAcl (p );
260
236
}
237
+
261
238
public BlockLocation [] getFileBlockLocations (FileStatus file ,long start ,long len ) throws IOException {
262
239
File f =pathToFile (file .getPath ());
263
240
BlockLocation [] result =null ;
0 commit comments