This is an automated email from the ASF dual-hosted git repository.
bharat 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 67ca42c HDDS-3401. Ozone audit entries could be consistent among
volume creation with quota and update quota (#832)
67ca42c is described below
commit 67ca42cf87007c086024edc47f9a103f9d66eda9
Author: Bharat Viswanadham <[email protected]>
AuthorDate: Thu Apr 16 15:03:13 2020 -0700
HDDS-3401. Ozone audit entries could be consistent among volume creation
with quota and update quota (#832)
---
.../common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java | 1 -
.../src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 2 +-
.../apache/hadoop/ozone/om/request/volume/OMVolumeSetQuotaRequest.java | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
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
index c6589d4..319fc53 100644
--- 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
@@ -239,7 +239,6 @@ public final class OzoneConsts {
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";
public static final String UPDATE_ID = "updateID";
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 f8180d7..67606bf 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
@@ -1699,7 +1699,7 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
}
Map<String, String> auditMap = buildAuditMap(volume);
- auditMap.put(OzoneConsts.QUOTA, String.valueOf(quota));
+ auditMap.put(OzoneConsts.QUOTA_IN_BYTES, String.valueOf(quota));
try {
metrics.incNumVolumeUpdates();
volumeManager.setQuota(volume, quota);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetQuotaRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetQuotaRequest.java
index ff5ecd3..f7ed5c6 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetQuotaRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetQuotaRequest.java
@@ -93,7 +93,7 @@ public class OMVolumeSetQuotaRequest extends OMVolumeRequest {
AuditLogger auditLogger = ozoneManager.getAuditLogger();
OzoneManagerProtocolProtos.UserInfo userInfo =
getOmRequest().getUserInfo();
Map<String, String> auditMap = buildVolumeAuditMap(volume);
- auditMap.put(OzoneConsts.QUOTA,
+ auditMap.put(OzoneConsts.QUOTA_IN_BYTES,
String.valueOf(setVolumePropertyRequest.getQuotaInBytes()));
OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
