HDDS-10472. Audit log should include EC replication config (apache#6338)

myskov · Mar 6, 2024 · 309e459 · 309e459
1 parent 418528a
commit 309e459
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/ECReplicationConfig.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/ECReplicationConfig.java
@@ -154,6 +154,14 @@ public String getReplication() {
         + chunkKB();
   }
 
+  /** Similar to {@link #getReplication()}, but applies to proto structure, without any validation. */
+  public static String toString(HddsProtos.ECReplicationConfig proto) {
+    return proto.getCodec() + EC_REPLICATION_PARAMS_DELIMITER
+        + proto.getData() + EC_REPLICATION_PARAMS_DELIMITER
+        + proto.getParity() + EC_REPLICATION_PARAMS_DELIMITER
+        + proto.getEcChunkSize();
+  }
+
   public HddsProtos.ECReplicationConfig toProto() {
     return HddsProtos.ECReplicationConfig.newBuilder()
         .setData(data)

diff --git a/...-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/RequestAuditor.java b/...-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/RequestAuditor.java
@@ -22,6 +22,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.apache.hadoop.hdds.client.ECReplicationConfig;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.hadoop.ozone.audit.AuditAction;
 import org.apache.hadoop.ozone.audit.AuditMessage;
@@ -68,10 +70,16 @@ default Map<String, String> buildKeyArgsAuditMap(KeyArgs keyArgs) {
       auditMap.put(OzoneConsts.KEY, keyArgs.getKeyName());
       auditMap.put(OzoneConsts.DATA_SIZE,
           String.valueOf(keyArgs.getDataSize()));
-      auditMap.put(OzoneConsts.REPLICATION_TYPE,
-          (keyArgs.getType() != null) ? keyArgs.getType().name() : null);
-      auditMap.put(OzoneConsts.REPLICATION_FACTOR,
-          (keyArgs.getFactor() != null) ? keyArgs.getFactor().name() : null);
+      if (keyArgs.hasType()) {
+        auditMap.put(OzoneConsts.REPLICATION_TYPE, keyArgs.getType().name());
+      }
+      if (keyArgs.hasFactor() && keyArgs.getFactor() != HddsProtos.ReplicationFactor.ZERO) {
+        auditMap.put(OzoneConsts.REPLICATION_FACTOR, keyArgs.getFactor().name());
+      }
+      if (keyArgs.hasEcReplicationConfig()) {
+        auditMap.put(OzoneConsts.REPLICATION_CONFIG,
+            ECReplicationConfig.toString(keyArgs.getEcReplicationConfig()));
+      }
       return auditMap;
     }
   }