You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2020/07/30 04:26:09 UTC
[hadoop-ozone] branch master updated: HDDS-3423. Enabling
TestContainerReplicationEndToEnd and addressing failures (#1260)
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/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 93ac9ac HDDS-3423. Enabling TestContainerReplicationEndToEnd and addressing failures (#1260)
93ac9ac is described below
commit 93ac9acd8ff04fec836c4e89405065513bdb0b78
Author: prashantpogde <pr...@gmail.com>
AuthorDate: Wed Jul 29 21:25:53 2020 -0700
HDDS-3423. Enabling TestContainerReplicationEndToEnd and addressing failures (#1260)
---
.../client/rpc/TestContainerReplicationEndToEnd.java | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerReplicationEndToEnd.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerReplicationEndToEnd.java
index 2c7f818..d9f7578 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerReplicationEndToEnd.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerReplicationEndToEnd.java
@@ -45,8 +45,8 @@ import org.apache.hadoop.test.GenericTestUtils;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
@@ -65,7 +65,6 @@ import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_PIPELINE_L
* Tests delete key operation with a slow follower in the datanode
* pipeline.
*/
-@Ignore
public class TestContainerReplicationEndToEnd {
private static MiniOzoneCluster cluster;
@@ -94,10 +93,10 @@ public class TestContainerReplicationEndToEnd {
conf.setTimeDuration(HDDS_CONTAINER_REPORT_INTERVAL,
containerReportInterval, TimeUnit.MILLISECONDS);
- conf.setTimeDuration(OZONE_SCM_STALENODE_INTERVAL, containerReportInterval,
- TimeUnit.MILLISECONDS);
+ conf.setTimeDuration(OZONE_SCM_STALENODE_INTERVAL,
+ 5 * containerReportInterval, TimeUnit.MILLISECONDS);
conf.setTimeDuration(ScmConfigKeys.OZONE_SCM_DEADNODE_INTERVAL,
- 2 * containerReportInterval, TimeUnit.MILLISECONDS);
+ 10 * containerReportInterval, TimeUnit.MILLISECONDS);
conf.setTimeDuration(OZONE_SCM_PIPELINE_DESTROY_TIMEOUT, 1000,
TimeUnit.SECONDS);
DatanodeRatisServerConfig ratisServerConfig =
@@ -167,9 +166,13 @@ public class TestContainerReplicationEndToEnd {
.getPipeline(pipelineID);
key.close();
- if (cluster.getStorageContainerManager().getContainerManager()
- .getContainer(new ContainerID(containerID)).getState() !=
- HddsProtos.LifeCycleState.CLOSING) {
+ HddsProtos.LifeCycleState containerState =
+ cluster.getStorageContainerManager().getContainerManager()
+ .getContainer(new ContainerID(containerID)).getState();
+ LoggerFactory.getLogger(TestContainerReplicationEndToEnd.class).info(
+ "Current Container State is {}", containerState);
+ if ((containerState != HddsProtos.LifeCycleState.CLOSING) &&
+ (containerState != HddsProtos.LifeCycleState.CLOSED)) {
cluster.getStorageContainerManager().getContainerManager()
.updateContainerState(new ContainerID(containerID),
HddsProtos.LifeCycleEvent.FINALIZE);
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org