Skip to content

HDDS-7588. Intermittent failure in TestObjectStoreWithLegacyFS#testFlatKeyStructureWithOBS #4290

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
adoroszlai merged 1 commit into from
Feb 20, 2023
Merged

HDDS-7588. Intermittent failure in TestObjectStoreWithLegacyFS#testFlatKeyStructureWithOBS #4290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions ...ntegration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithLegacyFS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ private boolean assertKeyCount(
Table<String, OmKeyInfo> keyTable,
String dbKey, int expectedCnt, String keyName) {
int countKeys = 0;
int matchingKeys = 0;
try {
TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
itr = keyTable.iterator();
Expand All @@ -157,16 +158,20 @@ private boolean assertKeyCount(
break;
}
countKeys++;
Assert.assertTrue(keyValue.getKey().endsWith(keyName));
matchingKeys += keyValue.getKey().endsWith(keyName) ? 1 : 0;
}
} catch (IOException ex) {
LOG.info("Test failed with: " + ex.getMessage(), ex);
Assert.fail("Test failed with: " + ex.getMessage());
}
if (countKeys != expectedCnt) {
if (countKeys > expectedCnt) {
Assert.fail("Test failed with: too many keys found, expected "
+ expectedCnt + " keys, found " + countKeys + " keys");
}
if (matchingKeys != expectedCnt) {
LOG.info("Couldn't find KeyName:{} in KeyTable, retrying...", keyName);
}
return countKeys == expectedCnt;
return countKeys == expectedCnt && matchingKeys == expectedCnt;
}

@Test
Expand Down