Skip to content

Commit

Permalink
Fixed root directory resource rename bug (#19793)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gapra-msft
gapra-msft authored Mar 17, 2021
1 parent ae47b04 commit 1f204c4
Show file tree
Hide file tree
Showing 5 changed files with 402 additions and 2 deletions.
1 change: 1 addition & 0 deletions sdk/storage/azure-storage-file-datalake/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Release History

## 12.5.0-beta.2 (Unreleased)
- Fixed a bug where files/directories in root directories could not be renamed.
- Fixed a bug where more data would be buffered in buffered upload than expected due to Reactor's concatMap operator.

## 12.5.0-beta.1 (2021-02-10)
Expand Down
8 changes: 6 additions & 2 deletions ...-datalake/src/main/java/com/azure/storage/file/datalake/DataLakeDirectoryAsyncClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,11 @@ public DataLakeFileAsyncClient getFileAsyncClient(String fileName) {

BlockBlobAsyncClient blockBlobAsyncClient = prepareBuilderAppendPath(fileName).buildBlockBlobAsyncClient();

String pathPrefix = getObjectPath().isEmpty() ? "" : getObjectPath() + "/";

return new DataLakeFileAsyncClient(getHttpPipeline(),
StorageImplUtils.appendToUrlPath(getPathUrl(), Utility.urlEncode(Utility.urlDecode(fileName))).toString(),
getServiceVersion(), getAccountName(), getFileSystemName(), Utility.urlEncode(getObjectPath() + "/"
getServiceVersion(), getAccountName(), getFileSystemName(), Utility.urlEncode(pathPrefix
+ Utility.urlDecode(fileName)), blockBlobAsyncClient);
}

Expand Down Expand Up @@ -324,10 +326,12 @@ public DataLakeDirectoryAsyncClient getSubdirectoryAsyncClient(String subdirecto
BlockBlobAsyncClient blockBlobAsyncClient = prepareBuilderAppendPath(subdirectoryName)
.buildBlockBlobAsyncClient();

String pathPrefix = getObjectPath().isEmpty() ? "" : getObjectPath() + "/";

return new DataLakeDirectoryAsyncClient(getHttpPipeline(),
StorageImplUtils.appendToUrlPath(getPathUrl(), Utility.urlEncode(Utility.urlDecode(subdirectoryName)))
.toString(), getServiceVersion(), getAccountName(), getFileSystemName(),
Utility.urlEncode(getObjectPath() + "/" + Utility.urlDecode(subdirectoryName)), blockBlobAsyncClient);
Utility.urlEncode(pathPrefix + Utility.urlDecode(subdirectoryName)), blockBlobAsyncClient);
}

/**
Expand Down
32 changes: 32 additions & 0 deletions ...orage-file-datalake/src/test/java/com/azure/storage/file/datalake/DirectoryAPITest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3029,4 +3029,36 @@ class DirectoryAPITest extends APISpec {
"" | Utility.urlEncode("%") || _ // Sub resource has special character
Utility.urlEncode("%") | Utility.urlEncode("%") || _
}

def "File in root directory rename"() {
setup:
def oldName = generatePathName()
def renamedName = generatePathName()
dc = fsc.getRootDirectoryClient()
// Create file in root directory
def file = dc.createFile(oldName)

when:
def renamedFile = file.rename(null, renamedName)

then:
renamedFile.getObjectPath() == renamedName
renamedFile.getProperties().getETag() == renamedFile.setAccessControlList(pathAccessControlEntries, group, owner).getETag()
}

def "Directory in root directory rename"() {
setup:
def oldName = generatePathName()
def renamedName = generatePathName()
dc = fsc.getRootDirectoryClient()
// Create dir in root directory
def dir = dc.createSubdirectory(oldName)

when:
def renamedDir = dir.rename(null, renamedName)

then:
renamedDir.getObjectPath() == renamedName
renamedDir.getProperties().getETag() == renamedDir.setAccessControlList(pathAccessControlEntries, group, owner).getETag()
}
}
182 changes: 182 additions & 0 deletions ...ke/src/test/resources/session-records/DirectoryAPITestdirectoryinrootdirectoryrename.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
{
"networkCallRecords" : [ {
"Method" : "PUT",
"Uri" : "https://REDACTED.blob.core.windows.net/jtfsdirectoryinrootdirectoryrename016353afbee5524f4?restype=container",
"Headers" : {
"x-ms-version" : "2020-06-12",
"User-Agent" : "azsdk-java-azure-storage-blob/12.11.0-beta.2 (11.0.7; Windows 10; 10.0)",
"x-ms-client-request-id" : "b18773da-0089-4e6a-ac58-c05095990655"
},
"Response" : {
"x-ms-version" : "2020-06-12",
"Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
"eTag" : "0x8D8E59F8EBC8884",
"Last-Modified" : "Fri, 12 Mar 2021 21:41:13 GMT",
"retry-after" : "0",
"Content-Length" : "0",
"StatusCode" : "201",
"x-ms-request-id" : "3f234f64-101e-0022-3d88-17180b000000",
"x-ms-client-request-id" : "b18773da-0089-4e6a-ac58-c05095990655",
"Date" : "Fri, 12 Mar 2021 21:41:12 GMT"
},
"Exception" : null
}, {
"Method" : "PUT",
"Uri" : "https://REDACTED.dfs.core.windows.net/jtfsdirectoryinrootdirectoryrename016353afbee5524f4/javapathdirectoryinrootdirectoryrename130587a12e8cb40?resource=directory",
"Headers" : {
"x-ms-version" : "2020-06-12",
"User-Agent" : "azsdk-java-azure-storage-file-datalake/12.5.0-beta.2 (11.0.7; Windows 10; 10.0)",
"x-ms-client-request-id" : "255aa058-b8f2-448a-8441-5761940bdfb3"
},
"Response" : {
"x-ms-version" : "2020-06-12",
"Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
"eTag" : "0x8D8E59F8F23E821",
"Last-Modified" : "Fri, 12 Mar 2021 21:41:13 GMT",
"retry-after" : "0",
"Content-Length" : "0",
"StatusCode" : "201",
"x-ms-request-id" : "45d97bc5-001f-0063-6188-1740ef000000",
"x-ms-client-request-id" : "255aa058-b8f2-448a-8441-5761940bdfb3",
"Date" : "Fri, 12 Mar 2021 21:41:13 GMT"
},
"Exception" : null
}, {
"Method" : "PUT",
"Uri" : "https://REDACTED.dfs.core.windows.net/jtfsdirectoryinrootdirectoryrename016353afbee5524f4/javapathdirectoryinrootdirectoryrename2946226c2b0cc90?resource=directory",
"Headers" : {
"x-ms-version" : "2020-06-12",
"User-Agent" : "azsdk-java-azure-storage-file-datalake/12.5.0-beta.2 (11.0.7; Windows 10; 10.0)",
"x-ms-client-request-id" : "6e0a1585-5e12-4d93-8430-bd6254a7c945"
},
"Response" : {
"x-ms-version" : "2020-06-12",
"Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
"eTag" : "0x8D8E59F8F346C0C",
"Last-Modified" : "Fri, 12 Mar 2021 21:41:13 GMT",
"retry-after" : "0",
"Content-Length" : "0",
"StatusCode" : "201",
"x-ms-request-id" : "45d97bc7-001f-0063-6388-1740ef000000",
"x-ms-client-request-id" : "6e0a1585-5e12-4d93-8430-bd6254a7c945",
"Date" : "Fri, 12 Mar 2021 21:41:13 GMT"
},
"Exception" : null
}, {
"Method" : "PUT",
"Uri" : "https://REDACTED.dfs.core.windows.net/jtfsdirectoryinrootdirectoryrename016353afbee5524f4/javapathdirectoryinrootdirectoryrename38042599d0b25f3?mode=legacy",
"Headers" : {
"x-ms-version" : "2020-06-12",
"User-Agent" : "azsdk-java-azure-storage-file-datalake/12.5.0-beta.2 (11.0.7; Windows 10; 10.0)",
"x-ms-client-request-id" : "b170c93a-60ee-4942-b3ad-3f751c478c40"
},
"Response" : {
"x-ms-version" : "2020-06-12",
"Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
"retry-after" : "0",
"Content-Length" : "0",
"StatusCode" : "201",
"x-ms-request-id" : "45d97bc9-001f-0063-6588-1740ef000000",
"x-ms-client-request-id" : "b170c93a-60ee-4942-b3ad-3f751c478c40",
"Date" : "Fri, 12 Mar 2021 21:41:13 GMT"
},
"Exception" : null
}, {
"Method" : "HEAD",
"Uri" : "https://REDACTED.blob.core.windows.net/jtfsdirectoryinrootdirectoryrename016353afbee5524f4/javapathdirectoryinrootdirectoryrename38042599d0b25f3",
"Headers" : {
"x-ms-version" : "2020-06-12",
"User-Agent" : "azsdk-java-azure-storage-file-datalake/12.5.0-beta.2 (11.0.7; Windows 10; 10.0)",
"x-ms-client-request-id" : "b6c98e98-7eeb-4224-a691-00e5a35e79f6"
},
"Response" : {
"x-ms-group" : "$superuser",
"x-ms-version" : "2020-06-12",
"x-ms-lease-status" : "unlocked",
"Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
"x-ms-lease-state" : "available",
"Last-Modified" : "Fri, 12 Mar 2021 21:41:13 GMT",
"retry-after" : "0",
"StatusCode" : "200",
"Date" : "Fri, 12 Mar 2021 21:41:13 GMT",
"x-ms-blob-type" : "BlockBlob",
"Accept-Ranges" : "bytes",
"x-ms-server-encrypted" : "true",
"x-ms-meta-hdi_isfolder" : "true",
"x-ms-access-tier-inferred" : "true",
"x-ms-access-tier" : "Hot",
"x-ms-creation-time" : "Fri, 12 Mar 2021 21:41:13 GMT",
"eTag" : "0x8D8E59F8F346C0C",
"x-ms-permissions" : "rwxr-x---",
"Content-Length" : "0",
"x-ms-request-id" : "3f2350a3-101e-0022-6c88-17180b000000",
"x-ms-client-request-id" : "b6c98e98-7eeb-4224-a691-00e5a35e79f6",
"x-ms-owner" : "$superuser",
"Content-Type" : "application/octet-stream"
},
"Exception" : null
}, {
"Method" : "PATCH",
"Uri" : "https://REDACTED.dfs.core.windows.net/jtfsdirectoryinrootdirectoryrename016353afbee5524f4/javapathdirectoryinrootdirectoryrename38042599d0b25f3?action=setAccessControl",
"Headers" : {
"x-ms-version" : "2020-06-12",
"User-Agent" : "azsdk-java-azure-storage-file-datalake/12.5.0-beta.2 (11.0.7; Windows 10; 10.0)",
"x-ms-client-request-id" : "88815e15-185c-4afe-91d8-e80f52d7f77b"
},
"Response" : {
"x-ms-namespace-enabled" : "true",
"x-ms-version" : "2020-06-12",
"Server" : "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0",
"eTag" : "0x8D8E59F8F346C0C",
"Last-Modified" : "Fri, 12 Mar 2021 21:41:13 GMT",
"retry-after" : "0",
"Content-Length" : "0",
"StatusCode" : "200",
"x-ms-request-id" : "45d97bd2-001f-0063-6d88-1740ef000000",
"x-ms-client-request-id" : "88815e15-185c-4afe-91d8-e80f52d7f77b",
"Date" : "Fri, 12 Mar 2021 21:41:13 GMT"
},
"Exception" : null
}, {
"Method" : "GET",
"Uri" : "https://REDACTED.blob.core.windows.net?prefix=jtfsdirectoryinrootdirectoryrename&comp=list",
"Headers" : {
"x-ms-version" : "2020-06-12",
"User-Agent" : "azsdk-java-azure-storage-blob/12.11.0-beta.2 (11.0.7; Windows 10; 10.0)",
"x-ms-client-request-id" : "c52dd52d-041c-4bb0-9f0e-2d18b66d5f67"
},
"Response" : {
"Transfer-Encoding" : "chunked",
"x-ms-version" : "2020-06-12",
"Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
"retry-after" : "0",
"StatusCode" : "200",
"x-ms-request-id" : "3f235107-101e-0022-4c88-17180b000000",
"Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><EnumerationResults ServiceEndpoint=\"https://gapracontainerrestorehns.blob.core.windows.net/\"><Prefix>jtfsdirectoryinrootdirectoryrename</Prefix><Containers><Container><Name>jtfsdirectoryinrootdirectoryrename016353afbee5524f4</Name><Properties><Last-Modified>Fri, 12 Mar 2021 21:41:13 GMT</Last-Modified><Etag>\"0x8D8E59F8EBC8884\"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><DefaultEncryptionScope>$account-encryption-key</DefaultEncryptionScope><DenyEncryptionScopeOverride>false</DenyEncryptionScopeOverride><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold></Properties></Container></Containers><NextMarker /></EnumerationResults>",
"x-ms-client-request-id" : "c52dd52d-041c-4bb0-9f0e-2d18b66d5f67",
"Date" : "Fri, 12 Mar 2021 21:41:13 GMT",
"Content-Type" : "application/xml"
},
"Exception" : null
}, {
"Method" : "DELETE",
"Uri" : "https://REDACTED.blob.core.windows.net/jtfsdirectoryinrootdirectoryrename016353afbee5524f4?restype=container",
"Headers" : {
"x-ms-version" : "2020-06-12",
"User-Agent" : "azsdk-java-azure-storage-blob/12.11.0-beta.2 (11.0.7; Windows 10; 10.0)",
"x-ms-client-request-id" : "f5ea1762-5505-431e-af31-9b6bc8c6321e"
},
"Response" : {
"x-ms-version" : "2020-06-12",
"Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
"retry-after" : "0",
"Content-Length" : "0",
"StatusCode" : "202",
"x-ms-request-id" : "3f23516d-101e-0022-2d88-17180b000000",
"x-ms-client-request-id" : "f5ea1762-5505-431e-af31-9b6bc8c6321e",
"Date" : "Fri, 12 Mar 2021 21:41:14 GMT"
},
"Exception" : null
} ],
"variables" : [ "jtfsdirectoryinrootdirectoryrename016353afbee5524f4", "javapathdirectoryinrootdirectoryrename130587a12e8cb40", "javapathdirectoryinrootdirectoryrename2946226c2b0cc90", "javapathdirectoryinrootdirectoryrename38042599d0b25f3" ]
}
Loading

0 comments on commit 1f204c4

Please sign in to comment.