You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@ozone.apache.org by "sumitagrawl (via GitHub)" <gi...@apache.org> on 2023/04/06 11:46:27 UTC

[GitHub] [ozone] sumitagrawl commented on pull request #4478: HDDS-8242. Rename operation not working with FSO bucket destination

sumitagrawl commented on PR #4478:
URL: https://github.com/apache/ozone/pull/4478#issuecomment-1498936301

   @fapifta @dombizita I have tried below changes, and its working, other changes seems not required,
   --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
   +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
   @@ -97,8 +97,10 @@ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
        if (getBucketLayout().isFileSystemOptimized()) {
          srcKey = validateAndNormalizeKey(ozoneManager.getEnableFileSystemPaths(),
              srcKey, getBucketLayout());
   -      dstKey = validateAndNormalizeKey(ozoneManager.getEnableFileSystemPaths(),
   -          dstKey, getBucketLayout());
   +      if (!dstKey.isEmpty()) {
   +        dstKey = validateAndNormalizeKey(ozoneManager.getEnableFileSystemPaths(),
   +            dstKey, getBucketLayout());
   +      }
        }
    
        // Set modification time & srcKeyName.
   diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
   index 0220d1bf0..6b480773d 100644
   --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
   +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
   @@ -100,7 +100,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
        OmKeyInfo fromKeyValue;
        Result result;
        try {
   -      if (toKeyName.length() == 0 || fromKeyName.length() == 0) {
   +      if (fromKeyName.length() == 0) {
            throw new OMException("Key name is empty",
                    OMException.ResultCodes.INVALID_KEY_NAME);
          }
   @@ -199,10 +199,18 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
            // destination path.
            OmKeyInfo toKeyParent = OMFileRequest.getKeyParentDir(volumeName,
                    bucketName, toKeyName, omMetadataManager);
   -
   -        omClientResponse = renameKey(toKeyParent, toKeyName, fromKeyValue,
   -            fromKeyName, isRenameDirectory, keyArgs.getModificationTime(),
   -            ozoneManager, omResponse, trxnLogIndex);
   +        if (null == toKeyParent) {
   +          String fromFileName = OzoneFSUtils.getFileName(fromKeyName);
   +          String newToKeyName = OzoneFSUtils.appendFileNameToKeyPath(toKeyName,
   +              fromFileName);
   +          omClientResponse = renameKey(toKeyParent, newToKeyName, fromKeyValue,
   +              fromKeyName, isRenameDirectory, keyArgs.getModificationTime(),
   +              ozoneManager, omResponse, trxnLogIndex);
   +        } else {
   +          omClientResponse = renameKey(toKeyParent, toKeyName, fromKeyValue,
   +              fromKeyName, isRenameDirectory, keyArgs.getModificationTime(),
   +              ozoneManager, omResponse, trxnLogIndex);
   +        }
    
            result = Result.SUCCESS;
          }
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@ozone.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@ozone.apache.org
For additional commands, e-mail: issues-help@ozone.apache.org