This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 46f305d HDDS-6183. Intermittent failure in
TestKeyDeletingService.checkIfDeleteServiceWithFailingSCM. (#2991)
46f305d is described below
commit 46f305d2ffd044d7b93be800daffaa46dc21fcb5
Author: Jyotinder Singh <[email protected]>
AuthorDate: Sun Jan 16 14:34:43 2022 +0530
HDDS-6183. Intermittent failure in
TestKeyDeletingService.checkIfDeleteServiceWithFailingSCM. (#2991)
---
.../hadoop/ozone/om/TestKeyDeletingService.java | 24 +++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyDeletingService.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyDeletingService.java
index 0a0a993..2860828 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyDeletingService.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyDeletingService.java
@@ -25,6 +25,8 @@ import java.util.ArrayList;
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;
@@ -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();
@@ -121,7 +125,7 @@ public class TestKeyDeletingService {
keyManager.getPendingDeletionKeys(Integer.MAX_VALUE).size(), 0);
}
- @Test(timeout = 30000)
+ @Test(timeout = 40000)
public void checkIfDeleteServiceWithFailingSCM()
throws IOException, TimeoutException, InterruptedException,
AuthenticationException {
@@ -139,8 +143,22 @@ public class TestKeyDeletingService {
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,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
