Skip to content

HADOOP-19580. [ABFS][BugFix][Bakport 3.4.2] IsNonEmptyDirectory Check should loop on listing using updated continuation token #7717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 30, 2025
Merged

HADOOP-19580. [ABFS][BugFix][Bakport 3.4.2] IsNonEmptyDirectory Check should loop on listing using updated continuation token #7717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f81ae49
HADOOP-19580. [ABFS][BugFix] IsNonEmptyDirectory Check should loop on…
anujmodi2021 May 28, 2025
284896c
Rerun Yetus
anujmodi2021 May 29, 2025
95779ca
Rerun Yetus
anujmodi2021 May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ols/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsBlobClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2037,7 +2037,7 @@ public boolean isNonEmptyDirectory(String path,
List<FileStatus> fileStatusList = new ArrayList<>();
// We need to loop on continuation token until we get an entry or continuation token becomes null.
do {
ListResponseData listResponseData = listPath(path, false, 1, null, tracingContext, null);
ListResponseData listResponseData = listPath(path, false, 1, continuationToken, tracingContext, null);
fileStatusList.addAll(listResponseData.getFileStatusList());
continuationToken = listResponseData.getContinuationToken();
} while (StringUtils.isNotEmpty(continuationToken) && fileStatusList.isEmpty());
Expand Down
44 changes: 37 additions & 7 deletions ...azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemListStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,9 +391,9 @@ public void testEmptyListingInSubsequentCall() throws IOException {
true, 2, 0);
testEmptyListingInSubsequentCallInternal(TEST_CONTINUATION_TOKEN, true, EMPTY_STRING,
false, 2, 1);
testEmptyListingInSubsequentCallInternal(TEST_CONTINUATION_TOKEN, true, TEST_CONTINUATION_TOKEN,
testEmptyListingInSubsequentCallInternal(TEST_CONTINUATION_TOKEN + 1, true, TEST_CONTINUATION_TOKEN + 2,
true, 3, 0);
testEmptyListingInSubsequentCallInternal(TEST_CONTINUATION_TOKEN, true, TEST_CONTINUATION_TOKEN,
testEmptyListingInSubsequentCallInternal(TEST_CONTINUATION_TOKEN + 1, true, TEST_CONTINUATION_TOKEN + 2,
false, 3, 1);

testEmptyListingInSubsequentCallInternal(EMPTY_STRING, false, EMPTY_STRING,
Expand All @@ -409,9 +409,9 @@ public void testEmptyListingInSubsequentCall() throws IOException {
true, 2, 1);
testEmptyListingInSubsequentCallInternal(TEST_CONTINUATION_TOKEN, false, EMPTY_STRING,
false, 2, 2);
testEmptyListingInSubsequentCallInternal(TEST_CONTINUATION_TOKEN, false, TEST_CONTINUATION_TOKEN,
testEmptyListingInSubsequentCallInternal(TEST_CONTINUATION_TOKEN + 1, false, TEST_CONTINUATION_TOKEN + 2,
true, 3, 1);
testEmptyListingInSubsequentCallInternal(TEST_CONTINUATION_TOKEN, false, TEST_CONTINUATION_TOKEN,
testEmptyListingInSubsequentCallInternal(TEST_CONTINUATION_TOKEN + 1, false, TEST_CONTINUATION_TOKEN + 2,
false, 3, 2);
}

Expand Down Expand Up @@ -453,9 +453,23 @@ private void testEmptyListingInSubsequentCallInternal(String firstCT,
listResponseData3.setFileStatusList(new ArrayList<>());
listResponseData3.setOp(Mockito.mock(AbfsRestOperation.class));

Mockito.doReturn(listResponseData1).doReturn(listResponseData2).doReturn(listResponseData3)
.when(spiedClient).listPath(eq("/testPath"), eq(false), eq(1),
any(), any(), any());
final int[] itr = new int[1];
final String[] continuationTokenUsed = new String[3];

Mockito.doAnswer(invocationOnMock -> {
if (itr[0] == 0) {
itr[0]++;
continuationTokenUsed[0] = invocationOnMock.getArgument(3);
return listResponseData1;
} else if (itr[0] == 1) {
itr[0]++;
continuationTokenUsed[1] = invocationOnMock.getArgument(3);
return listResponseData2;
}
continuationTokenUsed[2] = invocationOnMock.getArgument(3);
return listResponseData3;
}).when(spiedClient).listPath(eq("/testPath"), eq(false),
eq(1), any(), any(TracingContext.class), any());

FileStatus[] list = spiedFs.listStatus(new Path("/testPath"));

Expand All @@ -473,6 +487,22 @@ private void testEmptyListingInSubsequentCallInternal(String firstCT,
Mockito.verify(spiedClient, times(0))
.getPathStatus(eq("/testPath"), any(), eq(null), eq(false));
}

Assertions.assertThat(continuationTokenUsed[0])
.describedAs("First continuation token used is not as expected")
.isNull();

if (expectedInvocations > 1) {
Assertions.assertThat(continuationTokenUsed[1])
.describedAs("Second continuation token used is not as expected")
.isEqualTo(firstCT);
}

if (expectedInvocations > 2) {
Assertions.assertThat(continuationTokenUsed[2])
.describedAs("Third continuation token used is not as expected")
.isEqualTo(secondCT);
}
}

/**
Expand Down
42 changes: 38 additions & 4 deletions ...ls/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/ITestAbfsClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,18 +745,18 @@ public void testIsNonEmptyDirectory() throws IOException {
true, 2, false);
testIsNonEmptyDirectoryInternal(TEST_CONTINUATION_TOKEN, true, EMPTY_STRING,
false, 2, true);
testIsNonEmptyDirectoryInternal(TEST_CONTINUATION_TOKEN, true, TEST_CONTINUATION_TOKEN,
testIsNonEmptyDirectoryInternal(TEST_CONTINUATION_TOKEN + 1, true, TEST_CONTINUATION_TOKEN + 2,
true, 3, false);
testIsNonEmptyDirectoryInternal(TEST_CONTINUATION_TOKEN, true, TEST_CONTINUATION_TOKEN,
testIsNonEmptyDirectoryInternal(TEST_CONTINUATION_TOKEN + 1, true, TEST_CONTINUATION_TOKEN + 2,
false, 2, true);

testIsNonEmptyDirectoryInternal(TEST_CONTINUATION_TOKEN, false, EMPTY_STRING,
true, 1, true);
testIsNonEmptyDirectoryInternal(TEST_CONTINUATION_TOKEN, false, EMPTY_STRING,
false, 1, true);
testIsNonEmptyDirectoryInternal(TEST_CONTINUATION_TOKEN, false, TEST_CONTINUATION_TOKEN,
testIsNonEmptyDirectoryInternal(TEST_CONTINUATION_TOKEN + 1, false, TEST_CONTINUATION_TOKEN + 2,
true, 1, true);
testIsNonEmptyDirectoryInternal(TEST_CONTINUATION_TOKEN, false, TEST_CONTINUATION_TOKEN,
testIsNonEmptyDirectoryInternal(TEST_CONTINUATION_TOKEN + 1, false, TEST_CONTINUATION_TOKEN + 2,
false, 1, true);
}

Expand Down Expand Up @@ -801,11 +801,45 @@ private void testIsNonEmptyDirectoryInternal(String firstCT,
.when(spiedClient).listPath(eq("/testPath"), eq(false), eq(1),
any(), any(), any());

final int[] itr = new int[1];
final String[] continuationTokenUsed = new String[3];

Mockito.doAnswer(invocationOnMock -> {
if (itr[0] == 0) {
itr[0]++;
continuationTokenUsed[0] = invocationOnMock.getArgument(3);
return listResponseData1;
} else if (itr[0] == 1) {
itr[0]++;
continuationTokenUsed[1] = invocationOnMock.getArgument(3);
return listResponseData2;
}
continuationTokenUsed[2] = invocationOnMock.getArgument(3);
return listResponseData3;
}).when(spiedClient).listPath(eq("/testPath"), eq(false), eq(1),
any(), any(TracingContext.class), any());

Assertions.assertThat(spiedClient.isNonEmptyDirectory("/testPath",
Mockito.mock(TracingContext.class)))
.describedAs("isNonEmptyDirectory in client giving unexpected results")
.isEqualTo(isNonEmpty);

Assertions.assertThat(continuationTokenUsed[0])
.describedAs("First continuation token used is not as expected")
.isNull();

if (expectedInvocations > 1) {
Assertions.assertThat(continuationTokenUsed[1])
.describedAs("Second continuation token used is not as expected")
.isEqualTo(firstCT);
}

if (expectedInvocations > 2) {
Assertions.assertThat(continuationTokenUsed[2])
.describedAs("Third continuation token used is not as expected")
.isEqualTo(secondCT);
}

Mockito.verify(spiedClient, times(expectedInvocations))
.listPath(eq("/testPath"), eq(false), eq(1),
any(), any(TracingContext.class), any());
Expand Down