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/cd8b9e91 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cd8b9e91 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cd8b9e91 Branch: refs/heads/HDDS-4 Commit: cd8b9e913e9a27196d5622feab68d679c0b552c5 Parents: 7e26e1f Author: Anu Engineer <aengin...@apache.org> Authored: Sat May 12 10:13:13 2018 -0700 Committer: Anu Engineer <aengin...@apache.org> Committed: Sat May 12 10:24:05 2018 -0700 ---------------------------------------------------------------------- .../apache/hadoop/ozone/MiniOzoneClusterImpl.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/cd8b9e91/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 17872f4..08d7176 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 @@ -62,6 +62,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 @@ -211,6 +219,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: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
