This is an automated email from the ASF dual-hosted git repository.
aengineer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new b35ad98 HDDS-2506. Remove keyAllocationInfo and replication info from
the auditLog (#288)
b35ad98 is described below
commit b35ad98ce9258a2766872c910380a41968f69305
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Dec 5 13:41:32 2019 +0100
HDDS-2506. Remove keyAllocationInfo and replication info from the auditLog
(#288)
* HDDS-2506. Remove keyAllocationInfo and replication info from the auditLog
* HDDS-2506. Restore replication info
* trigger new CI check
---
.../org/apache/hadoop/ozone/om/helpers/OmKeyArgs.java | 2 --
.../java/org/apache/hadoop/ozone/om/OzoneManager.java | 19 -------------------
.../hadoop/ozone/om/request/RequestAuditor.java | 3 ---
3 files changed, 24 deletions(-)
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyArgs.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyArgs.java
index 6bca3aa..2a882a4 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyArgs.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyArgs.java
@@ -151,8 +151,6 @@ public final class OmKeyArgs implements Auditable {
(this.type != null) ? this.type.name() : null);
auditMap.put(OzoneConsts.REPLICATION_FACTOR,
(this.factor != null) ? this.factor.name() : null);
- auditMap.put(OzoneConsts.KEY_LOCATION_INFO,
- (this.locationInfoList != null) ? locationInfoList.toString() : null);
return auditMap;
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 17264dc..00ee22d 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -86,8 +86,6 @@ import org.apache.hadoop.ozone.om.ratis.OMRatisSnapshotInfo;
import org.apache.hadoop.ozone.om.snapshot.OzoneManagerSnapshotProvider;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.DBUpdatesRequest;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
- .KeyArgs;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRoleInfo;
import org.apache.hadoop.ozone.protocolPB.ProtocolMessageMetrics;
import org.apache.hadoop.ozone.security.OzoneSecurityException;
@@ -2041,23 +2039,6 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
}
}
- private Map<String, String> toAuditMap(KeyArgs omKeyArgs) {
- Map<String, String> auditMap = new LinkedHashMap<>();
- auditMap.put(OzoneConsts.VOLUME, omKeyArgs.getVolumeName());
- auditMap.put(OzoneConsts.BUCKET, omKeyArgs.getBucketName());
- auditMap.put(OzoneConsts.KEY, omKeyArgs.getKeyName());
- auditMap.put(OzoneConsts.DATA_SIZE,
- String.valueOf(omKeyArgs.getDataSize()));
- auditMap.put(OzoneConsts.REPLICATION_TYPE,
- omKeyArgs.hasType() ? omKeyArgs.getType().name() : null);
- auditMap.put(OzoneConsts.REPLICATION_FACTOR,
- omKeyArgs.hasFactor() ? omKeyArgs.getFactor().name() : null);
- auditMap.put(OzoneConsts.KEY_LOCATION_INFO,
- (omKeyArgs.getKeyLocationsList() != null) ?
- omKeyArgs.getKeyLocationsList().toString() : null);
- return auditMap;
- }
-
@Override
public void commitKey(OmKeyArgs args, long clientID)
throws IOException {
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 9aa8fc4..93b7c92 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
@@ -72,9 +72,6 @@ public interface RequestAuditor {
(keyArgs.getType() != null) ? keyArgs.getType().name() : null);
auditMap.put(OzoneConsts.REPLICATION_FACTOR,
(keyArgs.getFactor() != null) ? keyArgs.getFactor().name() : null);
- auditMap.put(OzoneConsts.KEY_LOCATION_INFO,
- (keyArgs.getKeyLocationsList() != null) ?
- keyArgs.getKeyLocationsList().toString() : null);
return auditMap;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
