This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 309e45996c HDDS-10472. Audit log should include EC replication config
(#6338)
309e45996c is described below
commit 309e45996ce549f03cb2a3c7f62c7c24f4c773e4
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Mar 6 20:13:47 2024 +0100
HDDS-10472. Audit log should include EC replication config (#6338)
---
.../apache/hadoop/hdds/client/ECReplicationConfig.java | 8 ++++++++
.../apache/hadoop/ozone/om/request/RequestAuditor.java | 16 ++++++++++++----
2 files changed, 20 insertions(+), 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
index 25ea315af2..9469fee7e2 100644
---
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 class ECReplicationConfig implements
ReplicationConfig {
+ 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/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/RequestAuditor.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/RequestAuditor.java
index 93b7c92902..c0872db0fd 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/RequestAuditor.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/RequestAuditor.java
@@ -22,6 +22,8 @@ import java.util.HashMap;
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 @@ public interface RequestAuditor {
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;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
