Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 2 commits into from
Mar 6, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3889a92
HDDS-10472. Audit log should include EC replication config
adoroszlai Mar 6, 2024
ac083da
use same format for proto as getReplication()
adoroszlai Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/ECReplicationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 12 additions & 4 deletions ...-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/RequestAuditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
Expand Down