This is an automated email from the ASF dual-hosted git repository.
xyao 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 1b7f617 HDDS-3388. Add bucket encryption key info to bucket create
audit log. (#820)
1b7f617 is described below
commit 1b7f6172d8869465980525497f2f778bc91c5b31
Author: Xiaoyu Yao <[email protected]>
AuthorDate: Tue Apr 21 16:44:17 2020 -0700
HDDS-3388. Add bucket encryption key info to bucket create audit log. (#820)
---
.../common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java | 1 +
.../src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java | 2 ++
2 files changed, 3 insertions(+)
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 319fc53..a058d76 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
@@ -274,6 +274,7 @@ public final class OzoneConsts {
public static final String S3_GETSECRET_USER = "S3GetSecretUser";
public static final String MULTIPART_UPLOAD_PART_NUMBER = "partNumber";
public static final String MULTIPART_UPLOAD_PART_NAME = "partName";
+ public static final String BUCKET_ENCRYPTION_KEY = "bucketEncryptionKey";
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
index 5dec9c6..f8c4d7a 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
@@ -215,6 +215,8 @@ public final class OmBucketInfo extends WithObjectID
implements Auditable {
auditMap.put(OzoneConsts.STORAGE_TYPE,
(this.storageType != null) ? this.storageType.name() : null);
auditMap.put(OzoneConsts.CREATION_TIME, String.valueOf(this.creationTime));
+ auditMap.put(OzoneConsts.BUCKET_ENCRYPTION_KEY,
+ (bekInfo != null) ? bekInfo.getKeyName() : null);
return auditMap;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
