big-data/hadoop
big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

HDDS-634. OzoneFS: support basic user group and permission for file/dir.

Browse Source 
Contributed by Xiaoyu Yao.
This commit is contained in:
Anu Engineer 2018-10-11 17:19:38 -07:00
parent 50552479c4
commit 604c27c33a
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzoneFileSystem.java
View File

@ -447,6 +447,14 @@ public class OzoneFileSystem extends FileSystem {
return workingDir; return workingDir;
} }
/**
* Get the username of the FS.
* @return the short name of the user who instantiated the FS
*/
public String getUsername() {
return userName;
}
/** /**
* Check whether the path is valid and then create directories. * Check whether the path is valid and then create directories.
* Directory is represented using a key with no value. * Directory is represented using a key with no value.
@ -528,11 +536,15 @@ public class OzoneFileSystem extends FileSystem {
throw new FileNotFoundException(f + ": No such file or directory!"); throw new FileNotFoundException(f + ": No such file or directory!");
} else if (isDirectory(meta)) { } else if (isDirectory(meta)) {
return new FileStatus(0, true, 1, 0, return new FileStatus(0, true, 1, 0,
meta.getModificationTime(), qualifiedPath); meta.getModificationTime(), 0,
FsPermission.getDirDefault(), getUsername(), getUsername(),
qualifiedPath);
} else { } else {
//TODO: Fetch replication count from ratis config //TODO: Fetch replication count from ratis config
return new FileStatus(meta.getDataSize(), false, 1, return new FileStatus(meta.getDataSize(), false, 1,
getDefaultBlockSize(f), meta.getModificationTime(), qualifiedPath); getDefaultBlockSize(f), meta.getModificationTime(), 0,
FsPermission.getFileDefault(), getUsername(), getUsername(),
qualifiedPath);
} }
} }

17
hadoop-ozone/ozonefs/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java
View File

@ -23,6 +23,7 @@ import java.net.URI;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.OzoneConsts;
import org.junit.Before; import org.junit.Before;
@ -167,6 +168,10 @@ public class TestOzoneFileInterfaces {
assertTrue("Modification time has not been recorded: " + status, assertTrue("Modification time has not been recorded: " + status,
status.getModificationTime() > currentTime); status.getModificationTime() > currentTime);
assertEquals(false, status.isDirectory());
assertEquals(FsPermission.getFileDefault(), status.getPermission());
verifyOwnerGroup(status);
try (FSDataInputStream inputStream = fs.open(path)) { try (FSDataInputStream inputStream = fs.open(path)) {
byte[] buffer = new byte[stringLen]; byte[] buffer = new byte[stringLen];
inputStream.readFully(0, buffer); inputStream.readFully(0, buffer);
@ -175,6 +180,12 @@ public class TestOzoneFileInterfaces {
} }
} }
private void verifyOwnerGroup(FileStatus fileStatus) {
String owner = getCurrentUser();
assertEquals(owner, fileStatus.getOwner());
assertEquals(owner, fileStatus.getGroup());
}
@Test @Test
public void testDirectory() throws IOException { public void testDirectory() throws IOException {
@ -186,6 +197,10 @@ public class TestOzoneFileInterfaces {
FileStatus status = fs.getFileStatus(path); FileStatus status = fs.getFileStatus(path);
assertTrue("The created path is not directory.", status.isDirectory()); assertTrue("The created path is not directory.", status.isDirectory());
assertEquals(true, status.isDirectory());
assertEquals(FsPermission.getDirDefault(), status.getPermission());
verifyOwnerGroup(status);
assertEquals(0, status.getLen()); assertEquals(0, status.getLen());
FileStatus[] statusList = fs.listStatus(createPath("/")); FileStatus[] statusList = fs.listStatus(createPath("/"));
@ -195,8 +210,6 @@ public class TestOzoneFileInterfaces {
FileStatus statusRoot = fs.getFileStatus(createPath("/")); FileStatus statusRoot = fs.getFileStatus(createPath("/"));
assertTrue("Root dir (/) is not a directory.", status.isDirectory()); assertTrue("Root dir (/) is not a directory.", status.isDirectory());
assertEquals(0, status.getLen()); assertEquals(0, status.getLen());
} }
@Test @Test