|
@@ -27,6 +27,7 @@ import java.util.List;
|
|
|
|
|
|
import org.apache.hadoop.conf.Configuration;
|
|
import org.apache.hadoop.conf.Configuration;
|
|
import org.apache.hadoop.net.NetworkTopology;
|
|
import org.apache.hadoop.net.NetworkTopology;
|
|
|
|
+import org.apache.hadoop.net.ServerSocketUtil;
|
|
import org.apache.hadoop.security.SecurityUtil;
|
|
import org.apache.hadoop.security.SecurityUtil;
|
|
import org.apache.hadoop.security.UserGroupInformation;
|
|
import org.apache.hadoop.security.UserGroupInformation;
|
|
import org.apache.hadoop.security.token.SecretManager.InvalidToken;
|
|
import org.apache.hadoop.security.token.SecretManager.InvalidToken;
|
|
@@ -458,7 +459,8 @@ public class TestAMRMClientOnRMRestart {
|
|
.getMasterKey().getKeyId() == newToken.decodeIdentifier().getKeyId());
|
|
.getMasterKey().getKeyId() == newToken.decodeIdentifier().getKeyId());
|
|
|
|
|
|
// start 2nd RM
|
|
// start 2nd RM
|
|
- conf.set(YarnConfiguration.RM_SCHEDULER_ADDRESS, "0.0.0.0:9030");
|
|
|
|
|
|
+ conf.set(YarnConfiguration.RM_SCHEDULER_ADDRESS, "0.0.0.0:"
|
|
|
|
+ + ServerSocketUtil.getPort(45020, 10));
|
|
final MyResourceManager2 rm2 = new MyResourceManager2(conf, memStore);
|
|
final MyResourceManager2 rm2 = new MyResourceManager2(conf, memStore);
|
|
rm2.start();
|
|
rm2.start();
|
|
nm1.setResourceTrackerService(rm2.getResourceTrackerService());
|
|
nm1.setResourceTrackerService(rm2.getResourceTrackerService());
|