Merge branch 'master' of https://github.com/gluster/glusterfs-hadoop into version-defense

Author: jayunit100

pom.xml

@@ -6,7 +6,7 @@
 	<packaging>jar</packaging>
 	<!-- from now, we will update version manually and ignore maven snapshot 
 		features -->
-	<version>2.1.8</version>
+	<version>2.3.2</version>
 	<name>glusterfs-hadoop</name>
 	<url>http://maven.apache.org</url>
 
@@ -19,6 +19,13 @@
 	</distributionManagement>
 
 	<dependencies>
+
+		<dependency>
+                        <groupId>org.apache.hadoop</groupId>
+		        <artifactId>hadoop-yarn-server-nodemanager</artifactId>
+			<version>2.3.0</version>
+		</dependency>
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -28,7 +35,7 @@
 		<dependency>
 			<groupId>org.apache.hadoop</groupId>
 			<artifactId>hadoop-common</artifactId>
-			<version>2.0.5-alpha</version>
+			<version>2.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.hadoop</groupId>
@@ -170,4 +177,4 @@
 
 		</plugins>
 	</build>
-</project>
+</project>

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

@@ -36,6 +36,7 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.FilterFileSystem;
+import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.fs.Path;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -92,6 +93,11 @@ public void copyToLocalFile(boolean delSrc,Path src,Path dst) throws IOException
         FileUtil.copy(srcFs, src, dstFs, dst, delSrc, getConf());
     }
 
+    @Override
+    public boolean mkdirs(Path f) throws IOException {
+        return mkdirs(f, FsPermission.getDirDefault().applyUMask(FsPermission.getUMask(getConf())));
+    }
+
     public String toString(){
         return "Gluster File System, no CRC.";
     }

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

@@ -0,0 +1,72 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.hadoop.yarn.server.nodemanager;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.util.Shell.ExitCodeException;
+import org.apache.hadoop.util.Shell.ShellCommandExecutor;
+import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.yarn.api.ApplicationConstants;
+import org.apache.hadoop.yarn.api.records.ContainerId;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.server.nodemanager.ContainerExecutor.ExitCode;
+import org.apache.hadoop.yarn.server.nodemanager.ContainerExecutor.Signal;
+import org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Container;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.ContainerDiagnosticsUpdateEvent;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.localizer.ContainerLocalizer;
+import org.apache.hadoop.yarn.server.nodemanager.util.DefaultLCEResourcesHandler;
+import org.apache.hadoop.yarn.server.nodemanager.util.LCEResourcesHandler;
+import org.apache.hadoop.yarn.util.ConverterUtils;
+import org.apache.log4j.spi.LoggerFactory;
+import org.slf4j.Logger;
+public class GlusterContainerExecutor extends LinuxContainerExecutor {
+  
+   static Logger log = org.slf4j.LoggerFactory.getLogger(GlusterContainerExecutor.class);
+   /**
+   * We override the YARN-1235 patch here.
+   * @param user
+   * @return
+   */
+  @Override
+  String getRunAsUser(String user) {
+   log.info("Container EXEC overrid: returning user " + user);
+      //return UserGroupInformation.isSecurityEnabled() ? user : nonsecureLocalUser;
+    return user;
+  }
+@Override
+public void deleteAsUser(String arg0,Path arg1,Path...arg2){
+    log.info("DELETE AS USER " + arg0 + " " + arg1 +" " + arg2);
+    super.deleteAsUser(arg0, arg1, arg2);
+}
+}
+

src/test/java/org/apache/hadoop/fs/test/unit/HcfsFileSystemContractBaseTest.java

@@ -45,6 +45,7 @@
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -131,29 +132,6 @@ public void testTextWriteAndRead() throws Exception{
         assertFalse(fs.exists(new Path("test1")));
     }
 
-    @Test
-    public void testGroupOwnership() throws Exception{
-        Path myFile=new Path("filePerm.txt");
-        //Create a file 
-        fs.create(myFile);
-        
-        //Set the initial owner
-        fs.setOwner(myFile, "daemon", "root");
-        String oldOwner = fs.getFileStatus(myFile).getOwner(); 
-        String oldGroup = fs.getFileStatus(myFile).getGroup();
-        Assert.assertEquals("daemon",oldOwner);
-        Assert.assertEquals("root",oldGroup);
-        
-        //Now, change it to "root" "wheel" 
-        fs.setOwner(myFile, "root", "wheel");
-        String newOwner = fs.getFileStatus(myFile).getOwner(); 
-        String newGroup = fs.getFileStatus(myFile).getGroup();
-        Assert.assertEquals("root",newOwner);
-        Assert.assertEquals("wheel",newGroup);
-        
-        fs.delete(myFile,true);
-    }
-    
     @org.junit.Test
     public void testPermissions() throws Exception{
 
@@ -360,5 +338,4 @@ public void testPermissionsChanging() throws Exception{
         fs.delete(new Path("mnt"),true);
 
     }
-
 }

src/test/java/org/apache/hadoop/fs/test/unit/HcfsFileSystemTest.java

@@ -0,0 +1,82 @@
+/**
+ *
+ * Copyright (c) 2014 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of GlusterFS.
+ *
+ * Licensed under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ *
+ */
+
+package org.apache.hadoop.fs.test.unit;
+
+import static org.apache.hadoop.fs.FileSystemTestHelper.getTestRootPath;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+
+import org.apache.hadoop.fs.FSDataInputStream;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.permission.FsAction;
+import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.fs.test.connector.HcfsTestConnectorFactory;
+import org.apache.hadoop.fs.test.connector.HcfsTestConnectorInterface;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Unit test for HCFS classes.
+ * 
+ */
+public class HcfsUmaskTest{
+    
+    static FileSystem fs ; 
+    
+    @BeforeClass
+    public static void setup() throws Exception {
+    	HcfsTestConnectorInterface connector = HcfsTestConnectorFactory.getHcfsTestConnector();
+        fs= connector.create();
+    }
+    
+    @AfterClass
+    public static void after() throws IOException{
+        fs.close();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        fs.delete(getTestRootPath(fs, "test"),true);
+    }
+    
+    @org.junit.Test
+    public void testMkdirsWithUmask() throws Exception {
+        Configuration conf = fs.getConf();
+        String oldUmask = conf.get("fs.permissions.umask-mode");
+        Path dir = new Path("dirUmask022");
+        conf.set("fs.permissions.umask-mode", "022");
+        assertTrue(fs.mkdirs(dir));
+        conf.set("fs.permissions.umask-mode", oldUmask);
+        FileStatus status = fs.getFileStatus(dir);
+        assertTrue(status.isDirectory());
+        assertEquals((short)0755, status.getPermission().toShort());
+
+    } 
+}