steveloughran commented on a change in pull request #2971:
URL: https://github.com/apache/hadoop/pull/2971#discussion_r826828511
##########
File path:
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java
##########
@@ -438,24 +459,88 @@ public boolean rename(final Path src, final Path dst)
throws IOException {
qualifiedDstPath = makeQualified(adjustedDst);
- abfsStore.rename(qualifiedSrcPath, qualifiedDstPath, tracingContext);
+ abfsStore.rename(qualifiedSrcPath, qualifiedDstPath, tracingContext,
null);
return true;
- } catch(AzureBlobFileSystemException ex) {
+ } catch (AzureBlobFileSystemException ex) {
LOG.debug("Rename operation failed. ", ex);
checkException(
- src,
- ex,
- AzureServiceErrorCode.PATH_ALREADY_EXISTS,
- AzureServiceErrorCode.INVALID_RENAME_SOURCE_PATH,
- AzureServiceErrorCode.SOURCE_PATH_NOT_FOUND,
-
AzureServiceErrorCode.INVALID_SOURCE_OR_DESTINATION_RESOURCE_TYPE,
- AzureServiceErrorCode.RENAME_DESTINATION_PARENT_PATH_NOT_FOUND,
- AzureServiceErrorCode.INTERNAL_OPERATION_ABORT);
+ src,
+ ex,
+ AzureServiceErrorCode.PATH_ALREADY_EXISTS,
+ AzureServiceErrorCode.INVALID_RENAME_SOURCE_PATH,
+ AzureServiceErrorCode.SOURCE_PATH_NOT_FOUND,
+ AzureServiceErrorCode.INVALID_SOURCE_OR_DESTINATION_RESOURCE_TYPE,
+ AzureServiceErrorCode.RENAME_DESTINATION_PARENT_PATH_NOT_FOUND,
+ AzureServiceErrorCode.INTERNAL_OPERATION_ABORT);
return false;
}
}
+ /**
+ * Private method to create resilient commit support.
+ * @return a new instance
+ * @param path destination path
+ * @throws IOException problem probing store capabilities
+ * @throws UnsupportedOperationException if the store lacks this support
+ */
+ @InterfaceAudience.Private
+ public ResilientCommitByRename createResilientCommitSupport(final Path path)
+ throws IOException {
+
+ if (!hasPathCapability(path,
+ CommonPathCapabilities.ETAGS_PRESERVED_IN_RENAME)) {
+ throw new UnsupportedOperationException(
+ "Resilient commit support not available for " + path);
+ }
+ return new ResilientCommitByRenameImpl();
+ }
+
+ /**
+ * Resilient commit support.
+ * Provided as a nested class to avoid contaminating the
+ * FS instance with too many private methods which end up
+ * being used widely (as has happened to the S3A FS)
+ */
+ public class ResilientCommitByRenameImpl implements ResilientCommitByRename {
+ public Pair<Boolean, Duration> commitSingleFileByRename(
+ final Path source,
+ final Path dest,
+ @Nullable final String sourceEtag) throws IOException {
+
+ LOG.debug("renameFileWithEtag source: {} dest: {} etag {}", source,
dest, sourceEtag);
+ statIncrement(CALL_RENAME);
+
+ trailingPeriodCheck(dest);
+ Path qualifiedSrcPath = makeQualified(source);
+ Path qualifiedDstPath = makeQualified(dest);
+
+ TracingContext tracingContext = new TracingContext(clientCorrelationId,
+ fileSystemId, FSOperationType.RENAME, true, tracingHeaderFormat,
+ listener);
+
+ if (qualifiedSrcPath.equals(qualifiedDstPath)) {
+ // rename to itself is forbidden
+ throw new PathIOException(qualifiedSrcPath.toString(), "cannot rename
object onto self");
+ }
+
+ // acquire one IO permit
+ final Duration waitTime = rateLimiting.acquire(1);
Review comment:
for now; didn't want to add it everywhere. the property name is there
for all. when we do add it it might be better in the abfsclient class
--
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: common-issues-unsubscr...@hadoop.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org
