Skip to content

HDDS-6183. Intermittent failure in TestKeyDeletingService.checkIfDeleteServiceWithFailingSCM. #2991

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 6 commits into from
Jan 16, 2022
Merged

HDDS-6183. Intermittent failure in TestKeyDeletingService.checkIfDeleteServiceWithFailingSCM. #2991

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66e6a2e
HDDS-6183. Intermittent failure in TestKeyDeletingService.checkIfDele…
JyotinderSingh Jan 15, 2022
075586d
address reviews: use waitFor util to wait for assertion.
JyotinderSingh Jan 15, 2022
b392e1a
remove unncessary lines + minor change
JyotinderSingh Jan 15, 2022
26f28d2
fix logs
JyotinderSingh Jan 15, 2022
17e6032
trigger new CI check
JyotinderSingh Jan 15, 2022
02fcee1
trigger new CI check
JyotinderSingh Jan 15, 2022
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
24 changes: 21 additions & 3 deletions ...-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyDeletingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import java.util.Collections;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.apache.hadoop.hdds.client.StandaloneReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
Expand Down Expand Up @@ -66,6 +68,8 @@ public class TestKeyDeletingService {
public TemporaryFolder folder = new TemporaryFolder();
private OzoneManagerProtocol writeClient;
private OzoneManager om;
private static final Logger LOG =
LoggerFactory.getLogger(TestKeyDeletingService.class);

private OzoneConfiguration createConfAndInitValues() throws IOException {
OzoneConfiguration conf = new OzoneConfiguration();
Expand Down Expand Up @@ -121,7 +125,7 @@ public void checkIfDeleteServiceisDeletingKeys()
keyManager.getPendingDeletionKeys(Integer.MAX_VALUE).size(), 0);
}

@Test(timeout = 30000)
@Test(timeout = 40000)
public void checkIfDeleteServiceWithFailingSCM()
throws IOException, TimeoutException, InterruptedException,
AuthenticationException {
Expand All @@ -139,8 +143,22 @@ public void checkIfDeleteServiceWithFailingSCM()
createAndDeleteKeys(keyManager, keyCount, 1);
KeyDeletingService keyDeletingService =
(KeyDeletingService) keyManager.getDeletingService();
Assert.assertEquals(
keyManager.getPendingDeletionKeys(Integer.MAX_VALUE).size(), keyCount);
GenericTestUtils.waitFor(
() -> {
try {
int numPendingDeletionKeys =
keyManager.getPendingDeletionKeys(Integer.MAX_VALUE).size();
if (numPendingDeletionKeys != keyCount) {
LOG.info("Expected {} keys to be pending deletion, but got {}",
keyCount, numPendingDeletionKeys);
return false;
}
return true;
} catch (IOException e) {
LOG.error("Error while getting pending deletion keys.", e);
return false;
}
}, 100, 2000);
// Make sure that we have run the background thread 5 times more
GenericTestUtils.waitFor(
() -> keyDeletingService.getRunCount().get() >= 5,
Expand Down