HDDS-53. Fix TestKey#testPutAndGetKeyWithDnRestart. Contributed by Mukul Kumar Singh.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7d7decbc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7d7decbc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7d7decbc Branch: refs/heads/HDDS-4 Commit: 7d7decbc149912a1a02adb0a535ccf06cc999d6b Parents: e4c96b9 Author: Anu Engineer <[email protected]> Authored: Sat May 12 10:13:13 2018 -0700 Committer: Xiaoyu Yao <[email protected]> Committed: Mon May 14 10:31:09 2018 -0700 ---------------------------------------------------------------------- .../apache/hadoop/ozone/MiniOzoneClusterImpl.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d7decbc/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java index 6663933..b837100 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java @@ -63,6 +63,14 @@ import java.util.concurrent.TimeoutException; import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState .HEALTHY; import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_PLUGINS_KEY; +import static org.apache.hadoop.ozone.OzoneConfigKeys + .DFS_CONTAINER_IPC_PORT; +import static org.apache.hadoop.ozone.OzoneConfigKeys + .DFS_CONTAINER_IPC_RANDOM_PORT; +import static org.apache.hadoop.ozone.OzoneConfigKeys + .DFS_CONTAINER_RATIS_IPC_PORT; +import static org.apache.hadoop.ozone.OzoneConfigKeys + .DFS_CONTAINER_RATIS_IPC_RANDOM_PORT; /** * MiniOzoneCluster creates a complete in-process Ozone cluster suitable for @@ -212,6 +220,14 @@ public final class MiniOzoneClusterImpl implements MiniOzoneCluster { HddsDatanodeService datanodeService = hddsDatanodes.get(i); datanodeService.stop(); datanodeService.join(); + // ensure same ports are used across restarts. + Configuration conf = datanodeService.getConf(); + int currentPort = datanodeService.getDatanodeDetails().getContainerPort(); + conf.setInt(DFS_CONTAINER_IPC_PORT, currentPort); + conf.setBoolean(DFS_CONTAINER_IPC_RANDOM_PORT, false); + int ratisPort = datanodeService.getDatanodeDetails().getRatisPort(); + conf.setInt(DFS_CONTAINER_RATIS_IPC_PORT, ratisPort); + conf.setBoolean(DFS_CONTAINER_RATIS_IPC_RANDOM_PORT, false); datanodeService.start(null); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
