This is an automated email from the ASF dual-hosted git repository. rakeshr pushed a commit to branch HDDS-2939 in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 1c62dfb6095f6dc711ed9d567118ec6ac2e08f61 Author: Rakesh Radhakrishnan <[email protected]> AuthorDate: Wed Dec 9 13:45:35 2020 +0530 HDDS-4321. Fix compilation errors : merge HDDS-4308 and HDDS-4473 changes into the branch (#1668) --- .../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 19 +++++++++---------- .../ozone/om/request/file/OMFileCreateRequestV1.java | 2 +- .../ozone/om/request/key/OMKeyCommitRequestV1.java | 3 ++- .../ozone/om/request/key/OMKeyDeleteRequestV1.java | 7 ++++--- 4 files changed, 16 insertions(+), 15 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 46ffce8..dc70369 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 @@ -2427,20 +2427,19 @@ public class KeyManagerImpl implements KeyManager { metadataManager.getLock().releaseReadLock(BUCKET_LOCK, volumeName, bucketName); } + List<OmKeyInfo> keyInfoList = new ArrayList<>(fileStatusList.size()); for (OzoneFileStatus fileStatus : fileStatusList) { if (fileStatus.isFile()) { - // refreshPipeline flag check has been removed as part of - // https://issues.apache.org/jira/browse/HDDS-3658. - // Please refer this jira for more details. - refresh(fileStatus.getKeyInfo()); - - // No need to check if a key is deleted or not here, this is handled - // when adding entries to cacheKeyMap from DB. - if (args.getSortDatanodes()) { - sortDatanodes(clientAddress, fileStatus.getKeyInfo()); - } + keyInfoList.add(fileStatus.getKeyInfo()); } } + // refreshPipeline flag check has been removed as part of + // https://issues.apache.org/jira/browse/HDDS-3658. + // Please refer this jira for more details. + refreshPipeline(keyInfoList); + if (args.getSortDatanodes()) { + sortDatanodes(clientAddress, keyInfoList.toArray(new OmKeyInfo[0])); + } fileStatusFinalList.addAll(fileStatusList); return fileStatusFinalList; } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestV1.java index cabd407..606e15b 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestV1.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestV1.java @@ -214,7 +214,7 @@ public class OMFileCreateRequestV1 extends OMFileCreateRequest { .setOpenVersion(openVersion).build()) .setCmdType(Type.CreateFile); omClientResponse = new OMFileCreateResponseV1(omResponse.build(), - omFileInfo, missingParentInfos, clientID, omBucketInfo); + omFileInfo, missingParentInfos, clientID, omBucketInfo.copyObject()); result = Result.SUCCESS; } catch (IOException ex) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestV1.java index 3a7fd6d..8c47f7e 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestV1.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestV1.java @@ -170,7 +170,8 @@ public class OMKeyCommitRequestV1 extends OMKeyCommitRequest { omBucketInfo.incrUsedBytes(correctedSpace); omClientResponse = new OMKeyCommitResponseV1(omResponse.build(), - omKeyInfo, dbFileKey, dbOpenFileKey, omVolumeArgs, omBucketInfo); + omKeyInfo, dbFileKey, dbOpenFileKey, omVolumeArgs, + omBucketInfo.copyObject()); result = Result.SUCCESS; } catch (IOException ex) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestV1.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestV1.java index 93531bc..af3bc82 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestV1.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestV1.java @@ -147,6 +147,7 @@ public class OMKeyDeleteRequestV1 extends OMKeyDeleteRequest { omBucketInfo = getBucketInfo(omMetadataManager, volumeName, bucketName); + // TODO: HDDS-4565: consider all the sub-paths if the path is a dir. long quotaReleased = sumBlockLengths(omKeyInfo); omBucketInfo.incrUsedBytes(-quotaReleased); omBucketInfo.incrUsedNamespace(-1L); @@ -157,9 +158,9 @@ public class OMKeyDeleteRequestV1 extends OMKeyDeleteRequest { // TODO: Revisit if we need it later. omClientResponse = new OMKeyDeleteResponseV1(omResponse - .setDeleteKeyResponse(DeleteKeyResponse.newBuilder()).build(), - omKeyInfo, ozoneManager.isRatisEnabled(), - omBucketInfo, keyStatus.isDirectory()); + .setDeleteKeyResponse(DeleteKeyResponse.newBuilder()).build(), + omKeyInfo, ozoneManager.isRatisEnabled(), + omBucketInfo.copyObject(), keyStatus.isDirectory()); result = Result.SUCCESS; } catch (IOException ex) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
