HDDS-5866. Discrepancy in Trash directory in ofs vs o3fs.

[sadanand48]

What changes were proposed in this pull request?

When moving a file/dir to trash, the destination path is different for ofs and o3fs. The change here is to make it same for both.

o3fs -> /<vol>/<buck>/.Trash/<user>/Current/..<dir if any>..
ofs -> /<vol>/<buck>/.Trash/<user>/Current/<vol>/<buck>/..<dir if any>..

Omitting volume and bucket for ofs key since its redundant info as for a particular ozone key already volume and bucket is known.

Most of the code for moveToTrash is duplicated from the hadoop client code and only the below if condition is a modification to the method.
If this part is not duplicated and the path is trimmed of volume and bucket name and passed to super.moveToTrash(path) it will fail as part of getFileStatus call as it would call getFileStatus(ofs://serviceId/key).

 if (fs.getUri().getScheme().equals(OzoneConsts.OZONE_OFS_URI_SCHEME)) {
        OFSPath ofsPath = new OFSPath(path);
        // trimming volume and bucket in order to be compatible with o3fs
        // Also including volume and bucket name in the path is redundant as
        // the key is already in a particular volume and bucket.
        Path trimmedVolumeAndBucket =
            new Path(OzoneConsts.OZONE_URI_DELIMITER
                + ofsPath.getKeyName());
        trashPath = makeTrashRelativePath(trashCurrent, trimmedVolumeAndBucket);
        baseTrashPath = makeTrashRelativePath(trashCurrent,
            trimmedVolumeAndBucket.getParent());
      } else {
        trashPath = makeTrashRelativePath(trashCurrent, path);
        baseTrashPath = makeTrashRelativePath(trashCurrent, path.getParent());
      }

What is the link to the Apache JIRA

https://issues.apache.org/jira/browse/HDDS-5866

How was this patch tested?

unit test

[sadanand48]

This test is flaky as it checks for existence of key in /Current but the checkpoint interval is 1.5 seconds so it might already be in checkpoint directory. This part is already tested in testTrash , hence removing this test.

[DaveTeng0]

thanks for the info!

[neils-dev]

+1
Thanks @sadanand48, re-run the workflow for the integration tests; looks like an unrelated error.