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

HDFS-9795. OIV Delimited should show which files are ACL-enabled (lei)

Browse Source
This commit is contained in:
Lei Xu 2016-02-11 20:33:51 -08:00
parent 8fdef0bd9d
commit c7fcec24b8
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -223,6 +223,8 @@ Trunk (Unreleased)
HDFS-9260. Improve the performance and GC friendliness of NameNode startup HDFS-9260. Improve the performance and GC friendliness of NameNode startup
and full block reports (Staffan Friberg via cmccabe) and full block reports (Staffan Friberg via cmccabe)
HDFS-9795. OIV Delimited should show which files are ACL-enabled (lei)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageDelimitedTextWriter.java
View File

@ -85,11 +85,13 @@ public String getEntry(String parent, INode inode) {
buffer.append(path.toString()); buffer.append(path.toString());
PermissionStatus p = null; PermissionStatus p = null;
boolean isDir = false; boolean isDir = false;
boolean hasAcl = false;
switch (inode.getType()) { switch (inode.getType()) {
case FILE: case FILE:
INodeFile file = inode.getFile(); INodeFile file = inode.getFile();
p = getPermission(file.getPermission()); p = getPermission(file.getPermission());
hasAcl = file.hasAcl() && file.getAcl().getEntriesCount() > 0;
append(buffer, file.getReplication()); append(buffer, file.getReplication());
append(buffer, formatDate(file.getModificationTime())); append(buffer, formatDate(file.getModificationTime()));
append(buffer, formatDate(file.getAccessTime())); append(buffer, formatDate(file.getAccessTime()));
@ -102,6 +104,7 @@ public String getEntry(String parent, INode inode) {
case DIRECTORY: case DIRECTORY:
INodeDirectory dir = inode.getDirectory(); INodeDirectory dir = inode.getDirectory();
p = getPermission(dir.getPermission()); p = getPermission(dir.getPermission());
hasAcl = dir.hasAcl() && dir.getAcl().getEntriesCount() > 0;
append(buffer, 0); // Replication append(buffer, 0); // Replication
append(buffer, formatDate(dir.getModificationTime())); append(buffer, formatDate(dir.getModificationTime()));
append(buffer, formatDate(0)); // Access time. append(buffer, formatDate(0)); // Access time.
@ -129,7 +132,8 @@ public String getEntry(String parent, INode inode) {
} }
assert p != null; assert p != null;
String dirString = isDir ? "d" : "-"; String dirString = isDir ? "d" : "-";
append(buffer, dirString + p.getPermission().toString()); String aclString = hasAcl ? "+" : "";
append(buffer, dirString + p.getPermission().toString() + aclString);
append(buffer, p.getUserName()); append(buffer, p.getUserName());
append(buffer, p.getGroupName()); append(buffer, p.getGroupName());
return buffer.toString(); return buffer.toString();

36
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewerForAcl.java
View File

@ -17,10 +17,13 @@
*/ */
package org.apache.hadoop.hdfs.tools.offlineImageViewer; package org.apache.hadoop.hdfs.tools.offlineImageViewer;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintStream; import java.io.PrintStream;
import java.io.RandomAccessFile; import java.io.RandomAccessFile;
import java.io.StringReader; import java.io.StringReader;
@ -226,4 +229,37 @@ public void testPBImageXmlWriterForAcl() throws Exception{
final String xml = output.toString(); final String xml = output.toString();
parser.parse(new InputSource(new StringReader(xml)), new DefaultHandler()); parser.parse(new InputSource(new StringReader(xml)), new DefaultHandler());
} }
@Test
public void testPBDelimitedWriterForAcl() throws Exception {
final String DELIMITER = "\t";
ByteArrayOutputStream output = new ByteArrayOutputStream();
try (PrintStream o = new PrintStream(output)) {
PBImageDelimitedTextWriter v =
new PBImageDelimitedTextWriter(o, DELIMITER, ""); // run in memory.
v.visit(new RandomAccessFile(originalFsimage, "r"));
}
try (
ByteArrayInputStream input =
new ByteArrayInputStream(output.toByteArray());
BufferedReader reader =
new BufferedReader(new InputStreamReader(input))) {
String line;
boolean header = true;
while ((line = reader.readLine()) != null) {
String[] fields = line.split(DELIMITER);
if (!header) {
String filePath = fields[0];
String permission = fields[9];
if (!filePath.equals("/")) {
boolean hasAcl = !filePath.toLowerCase().contains("noacl");
assertEquals(hasAcl, permission.endsWith("+"));
}
}
header = false;
}
}
}
} }