HDDS-2946. Rename audit log should contain both srcKey and dstKey not…

… just key Closes #535
apache · Feb 10, 2020 · fb90756 · fb90756
1 parent 295d030
commit fb90756
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java
@@ -237,6 +237,8 @@ private OzoneConsts() {
   public static final String VOLUME = "volume";
   public static final String BUCKET = "bucket";
   public static final String KEY = "key";
+  public static final String SRC_KEY = "srcKey";
+  public static final String DST_KEY = "dstKey";
   public static final String QUOTA = "quota";
   public static final String QUOTA_IN_BYTES = "quotaInBytes";
   public static final String OBJECT_ID = "objectID";

diff --git a/...zone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java b/...zone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
@@ -23,6 +23,7 @@
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
+import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
 import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
 import org.apache.hadoop.ozone.security.acl.OzoneObj;
@@ -111,7 +112,8 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
 
     AuditLogger auditLogger = ozoneManager.getAuditLogger();
 
-    Map<String, String> auditMap = buildKeyArgsAuditMap(renameKeyArgs);
+    Map<String, String> auditMap =
+        buildAuditMap(renameKeyArgs, renameKeyRequest);
 
     OzoneManagerProtocolProtos.OMResponse.Builder omResponse =
         OzoneManagerProtocolProtos.OMResponse.newBuilder().setCmdType(
@@ -284,4 +286,13 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
     }
     return omClientResponse;
   }
+
+  private Map<String, String> buildAuditMap(
+      KeyArgs keyArgs, RenameKeyRequest renameKeyRequest) {
+    Map<String, String> auditMap = buildKeyArgsAuditMap(keyArgs);
+    auditMap.remove(OzoneConsts.KEY);
+    auditMap.put(OzoneConsts.SRC_KEY, keyArgs.getKeyName());
+    auditMap.put(OzoneConsts.DST_KEY, renameKeyRequest.getToKeyName());
+    return auditMap;
+  }
 }