This is an automated email from the ASF dual-hosted git repository.
aengineer pushed a commit to branch ozone-0.4.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 9108efa8afbee80420c76c625237af22dd4fab84
Author: Bharat Viswanadham <bha...@apache.org>
AuthorDate: Mon Jul 22 15:11:10 2019 -0700
HDDS-1686. Remove check to get from openKeyTable in acl implementatio…
(#966)
(cherry picked from commit 2ea71d953b46221f90b38d75a2999056f044471f)
---
.../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 43 ++++------------------
1 file changed, 8 insertions(+), 35 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index 9b4eac3..ce55210 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -1398,17 +1398,10 @@ public class KeyManagerImpl implements KeyManager {
validateBucket(volume, bucket);
String objectKey = metadataManager.getOzoneKey(volume, bucket, keyName);
OmKeyInfo keyInfo = metadataManager.getKeyTable().get(objectKey);
- Table keyTable;
if (keyInfo == null) {
- keyInfo = metadataManager.getOpenKeyTable().get(objectKey);
- if (keyInfo == null) {
- throw new OMException("Key not found. Key:" +
- objectKey, KEY_NOT_FOUND);
- }
- keyTable = metadataManager.getOpenKeyTable();
- } else {
- keyTable = metadataManager.getKeyTable();
+ throw new OMException("Key not found. Key:" + objectKey,
KEY_NOT_FOUND);
}
+
List<OzoneAclInfo> newAcls = new ArrayList<>(keyInfo.getAcls());
OzoneAclInfo newAcl = null;
for(OzoneAclInfo a: keyInfo.getAcls()) {
@@ -1444,7 +1437,7 @@ public class KeyManagerImpl implements KeyManager {
.setDataSize(keyInfo.getDataSize())
.setFileEncryptionInfo(keyInfo.getFileEncryptionInfo())
.build();
- keyTable.put(objectKey, newObj);
+ metadataManager.getKeyTable().put(objectKey, newObj);
} catch (IOException ex) {
if (!(ex instanceof OMException)) {
LOG.error("Add acl operation failed for key:{}/{}/{}", volume,
@@ -1477,16 +1470,8 @@ public class KeyManagerImpl implements KeyManager {
validateBucket(volume, bucket);
String objectKey = metadataManager.getOzoneKey(volume, bucket, keyName);
OmKeyInfo keyInfo = metadataManager.getKeyTable().get(objectKey);
- Table keyTable;
if (keyInfo == null) {
- keyInfo = metadataManager.getOpenKeyTable().get(objectKey);
- if (keyInfo == null) {
- throw new OMException("Key not found. Key:" +
- objectKey, KEY_NOT_FOUND);
- }
- keyTable = metadataManager.getOpenKeyTable();
- } else {
- keyTable = metadataManager.getKeyTable();
+ throw new OMException("Key not found. Key:" + objectKey,
KEY_NOT_FOUND);
}
List<OzoneAclInfo> newAcls = new ArrayList<>(keyInfo.getAcls());
@@ -1531,7 +1516,7 @@ public class KeyManagerImpl implements KeyManager {
.setFileEncryptionInfo(keyInfo.getFileEncryptionInfo())
.build();
- keyTable.put(objectKey, newObj);
+ metadataManager.getKeyTable().put(objectKey, newObj);
} catch (IOException ex) {
if (!(ex instanceof OMException)) {
LOG.error("Remove acl operation failed for key:{}/{}/{}", volume,
@@ -1564,16 +1549,8 @@ public class KeyManagerImpl implements KeyManager {
validateBucket(volume, bucket);
String objectKey = metadataManager.getOzoneKey(volume, bucket, keyName);
OmKeyInfo keyInfo = metadataManager.getKeyTable().get(objectKey);
- Table keyTable;
if (keyInfo == null) {
- keyInfo = metadataManager.getOpenKeyTable().get(objectKey);
- if (keyInfo == null) {
- throw new OMException("Key not found. Key:" +
- objectKey, KEY_NOT_FOUND);
- }
- keyTable = metadataManager.getOpenKeyTable();
- } else {
- keyTable = metadataManager.getKeyTable();
+ throw new OMException("Key not found. Key:" + objectKey,
KEY_NOT_FOUND);
}
List<OzoneAclInfo> newAcls = new ArrayList<>();
@@ -1594,7 +1571,7 @@ public class KeyManagerImpl implements KeyManager {
.setFileEncryptionInfo(keyInfo.getFileEncryptionInfo())
.build();
- keyTable.put(objectKey, newObj);
+ metadataManager.getKeyTable().put(objectKey, newObj);
} catch (IOException ex) {
if (!(ex instanceof OMException)) {
LOG.error("Set acl operation failed for key:{}/{}/{}", volume,
@@ -1626,11 +1603,7 @@ public class KeyManagerImpl implements KeyManager {
String objectKey = metadataManager.getOzoneKey(volume, bucket, keyName);
OmKeyInfo keyInfo = metadataManager.getKeyTable().get(objectKey);
if (keyInfo == null) {
- keyInfo = metadataManager.getOpenKeyTable().get(objectKey);
- if (keyInfo == null) {
- throw new OMException("Key not found. Key:" +
- objectKey, KEY_NOT_FOUND);
- }
+ throw new OMException("Key not found. Key:" + objectKey,
KEY_NOT_FOUND);
}
List<OzoneAcl> acls = new ArrayList<>();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
