Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-11463. Node Labels root directory creation doesn't have a retry logic - addendum (#5614)

This commit is contained in:
Peter Szucs 2023-05-04 12:27:25 +02:00 committed by GitHub
parent 0d06fd77de
commit bd607951c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/store/AbstractFSNodeStore.java
View File

@ -69,9 +69,9 @@ protected void initStore(Configuration conf, Path fsStorePath,
int maxRetries = conf.getInt(YarnConfiguration.NODE_STORE_ROOT_DIR_NUM_RETRIES,
YarnConfiguration.NODE_STORE_ROOT_DIR_NUM_DEFAULT_RETRIES);
int retryCount = 0;
boolean success = fs.mkdirs(fsWorkingPath);
boolean success = false;
while (!success && retryCount < maxRetries) {
while (!success && retryCount <= maxRetries) {
try {
if (!fs.exists(fsWorkingPath)) {
success = fs.mkdirs(fsWorkingPath);
@ -80,7 +80,7 @@ protected void initStore(Configuration conf, Path fsStorePath,
}
} catch (IOException e) {
retryCount++;
if (retryCount >= maxRetries) {
if (retryCount > maxRetries) {
throw e;
}
try {

44
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestFileSystemNodeLabelsStore.java
View File

@ -348,24 +348,56 @@ void testSerilizationAfterRecovery(String className) throws Exception {
@MethodSource("getParameters")
@ParameterizedTest
void testRootMkdirOnInitStore(String className) throws Exception {
void testRootMkdirOnInitStoreWhenRootDirectoryAlreadyExists(String className) throws Exception {
initTestFileSystemNodeLabelsStore(className);
final FileSystem mockFs = Mockito.mock(FileSystem.class);
final FileSystemNodeLabelsStore mockStore = createMockNodeLabelsStore(mockFs);
final int expectedMkdirsCount = 0;
Mockito.when(mockStore.getFs().exists(Mockito.any(Path.class)))
.thenReturn(true);
verifyMkdirsCount(mockStore, expectedMkdirsCount);
}
@MethodSource("getParameters")
@ParameterizedTest
void testRootMkdirOnInitStoreWhenRootDirectoryNotExists(String className) throws Exception {
initTestFileSystemNodeLabelsStore(className);
final FileSystem mockFs = Mockito.mock(FileSystem.class);
final FileSystemNodeLabelsStore mockStore = createMockNodeLabelsStore(mockFs);
final int expectedMkdirsCount = 1;
Mockito.when(mockStore.getFs().exists(Mockito.any(Path.class)))
.thenReturn(false).thenReturn(true);
verifyMkdirsCount(mockStore, expectedMkdirsCount);
}
@MethodSource("getParameters")
@ParameterizedTest
void testRootMkdirOnInitStoreRetryLogic(String className) throws Exception {
initTestFileSystemNodeLabelsStore(className);
final FileSystem mockFs = Mockito.mock(FileSystem.class);
final FileSystemNodeLabelsStore mockStore = createMockNodeLabelsStore(mockFs);
final int expectedMkdirsCount = 2;
Mockito.when(mockStore.getFs().exists(Mockito.any(Path.class)))
.thenReturn(false).thenReturn(false).thenReturn(true);
verifyMkdirsCount(mockStore, expectedMkdirsCount);
}
private FileSystemNodeLabelsStore createMockNodeLabelsStore(FileSystem mockFs) {
FileSystemNodeLabelsStore mockStore = new FileSystemNodeLabelsStore() {
public void initFileSystem(Configuration config) throws IOException {
setFs(mockFs);
}
};
mockStore.setFs(mockFs);
verifyMkdirsCount(mockStore, true, 1);
return mockStore;
}
private void verifyMkdirsCount(FileSystemNodeLabelsStore store,
boolean existsRetVal, int expectedNumOfCalls)
int expectedNumOfCalls)
throws Exception {
Mockito.when(store.getFs().exists(Mockito.any(
Path.class))).thenReturn(existsRetVal);
store.init(conf, mgr);
Mockito.verify(store.getFs(), Mockito.times(
expectedNumOfCalls)).mkdirs(Mockito.any(Path