You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wa...@apache.org on 2017/08/11 17:31:51 UTC
[11/50] [abbrv] hadoop git commit: HDFS-12306. Add audit log for some
erasure coding operations. Contributed by Huafeng Wang
HDFS-12306. Add audit log for some erasure coding operations. Contributed by Huafeng Wang
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0b674360
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0b674360
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0b674360
Branch: refs/heads/YARN-5881
Commit: 0b67436068899497e99c86f37fd4887ca188fae2
Parents: b0fbf17
Author: Kai Zheng <ka...@intel.com>
Authored: Mon Aug 7 19:30:10 2017 +0800
Committer: Kai Zheng <ka...@intel.com>
Committed: Mon Aug 7 19:30:10 2017 +0800
----------------------------------------------------------------------
.../hdfs/server/namenode/FSNamesystem.java | 48 ++++++++++++--------
.../hdfs/server/namenode/NameNodeRpcServer.java | 2 +-
2 files changed, 29 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0b674360/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index 229de05..b1639b2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -7055,18 +7055,13 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
resultingStat = FSDirErasureCodingOp.setErasureCodingPolicy(this,
srcArg, ecPolicyName, pc, logRetryCache);
success = true;
- } catch (AccessControlException ace) {
- logAuditEvent(success, operationName, srcArg, null,
- resultingStat);
- throw ace;
} finally {
writeUnlock(operationName);
if (success) {
getEditLog().logSync();
}
+ logAuditEvent(success, operationName, srcArg, null, resultingStat);
}
- logAuditEvent(success, operationName, srcArg, null,
- resultingStat);
}
/**
@@ -7074,9 +7069,9 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
* @param policies The policies to add.
* @return The according result of add operation.
*/
- AddECPolicyResponse[] addECPolicies(ErasureCodingPolicy[] policies)
+ AddECPolicyResponse[] addErasureCodingPolicies(ErasureCodingPolicy[] policies)
throws IOException {
- final String operationName = "addECPolicies";
+ final String operationName = "addErasureCodingPolicies";
String addECPolicyName = "";
checkOperation(OperationCategory.WRITE);
List<AddECPolicyResponse> responses = new ArrayList<>();
@@ -7201,18 +7196,13 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
resultingStat = FSDirErasureCodingOp.unsetErasureCodingPolicy(this,
srcArg, pc, logRetryCache);
success = true;
- } catch (AccessControlException ace) {
- logAuditEvent(success, operationName, srcArg, null,
- resultingStat);
- throw ace;
} finally {
writeUnlock(operationName);
if (success) {
getEditLog().logSync();
}
+ logAuditEvent(success, operationName, srcArg, null, resultingStat);
}
- logAuditEvent(success, operationName, srcArg, null,
- resultingStat);
}
/**
@@ -7220,14 +7210,20 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
*/
ErasureCodingPolicy getErasureCodingPolicy(String src)
throws AccessControlException, UnresolvedLinkException, IOException {
+ final String operationName = "getErasureCodingPolicy";
+ boolean success = false;
checkOperation(OperationCategory.READ);
FSPermissionChecker pc = getPermissionChecker();
readLock();
try {
checkOperation(OperationCategory.READ);
- return FSDirErasureCodingOp.getErasureCodingPolicy(this, src, pc);
+ final ErasureCodingPolicy ret =
+ FSDirErasureCodingOp.getErasureCodingPolicy(this, src, pc);
+ success = true;
+ return ret;
} finally {
- readUnlock("getErasureCodingPolicy");
+ readUnlock(operationName);
+ logAuditEvent(success, operationName, null);
}
}
@@ -7235,13 +7231,19 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
* Get available erasure coding polices
*/
ErasureCodingPolicy[] getErasureCodingPolicies() throws IOException {
+ final String operationName = "getErasureCodingPolicies";
+ boolean success = false;
checkOperation(OperationCategory.READ);
readLock();
try {
checkOperation(OperationCategory.READ);
- return FSDirErasureCodingOp.getErasureCodingPolicies(this);
+ final ErasureCodingPolicy[] ret =
+ FSDirErasureCodingOp.getErasureCodingPolicies(this);
+ success = true;
+ return ret;
} finally {
- readUnlock("getErasureCodingPolicies");
+ readUnlock(operationName);
+ logAuditEvent(success, operationName, null);
}
}
@@ -7249,13 +7251,19 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
* Get available erasure coding codecs and corresponding coders.
*/
HashMap<String, String> getErasureCodingCodecs() throws IOException {
+ final String operationName = "getErasureCodingCodecs";
+ boolean success = false;
checkOperation(OperationCategory.READ);
readLock();
try {
checkOperation(OperationCategory.READ);
- return FSDirErasureCodingOp.getErasureCodingCodecs(this);
+ final HashMap<String, String> ret =
+ FSDirErasureCodingOp.getErasureCodingCodecs(this);
+ success = true;
+ return ret;
} finally {
- readUnlock("getErasureCodingCodecs");
+ readUnlock(operationName);
+ logAuditEvent(success, operationName, null);
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0b674360/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
index 52b422c..9265381 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
@@ -2298,7 +2298,7 @@ public class NameNodeRpcServer implements NamenodeProtocols {
ErasureCodingPolicy[] policies) throws IOException {
checkNNStartup();
namesystem.checkSuperuserPrivilege();
- return namesystem.addECPolicies(policies);
+ return namesystem.addErasureCodingPolicies(policies);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org