big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDDS-53. Fix TestKey#testPutAndGetKeyWithDnRestart.

Browse Source 
Contributed by Mukul Kumar Singh.
This commit is contained in:
Anu Engineer 2018-05-12 10:13:13 -07:00
parent 7e26e1f216
commit cd8b9e913e
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
View File

@ -62,6 +62,14 @@
import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState
.HEALTHY; .HEALTHY;
import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_PLUGINS_KEY; 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 * MiniOzoneCluster creates a complete in-process Ozone cluster suitable for
@ -211,6 +219,14 @@ public void restartHddsDatanode(int i) {
HddsDatanodeService datanodeService = hddsDatanodes.get(i); HddsDatanodeService datanodeService = hddsDatanodes.get(i);
datanodeService.stop(); datanodeService.stop();
datanodeService.join(); 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); datanodeService.start(null);
} }