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

YARN-8278. DistributedScheduling is not working in HA. Contributed by Bibin A Chundatt.

Browse Source
This commit is contained in:
Weiwei Yang 2018-05-15 17:28:19 +08:00
parent 58b97c79e3
commit 2bb647bb91
2 changed files with 60 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/ServerRMProxy.java
View File

@ -34,6 +34,11 @@ public class ServerRMProxy<T> extends RMProxy<T> {
private static final Logger LOG = private static final Logger LOG =
LoggerFactory.getLogger(ServerRMProxy.class); LoggerFactory.getLogger(ServerRMProxy.class);
private interface ServerRMProtocols
extends DistributedSchedulingAMProtocol, ResourceTracker {
//Add nothing
}
private ServerRMProxy() { private ServerRMProxy() {
super(); super();
} }
@ -95,8 +100,8 @@ public InetSocketAddress getRMAddress(YarnConfiguration conf,
@InterfaceAudience.Private @InterfaceAudience.Private
@Override @Override
public void checkAllowedProtocols(Class<?> protocol) { public void checkAllowedProtocols(Class<?> protocol) {
Preconditions.checkArgument( Preconditions
protocol.isAssignableFrom(ResourceTracker.class), .checkArgument(protocol.isAssignableFrom(ServerRMProtocols.class),
"ResourceManager does not support this protocol"); "ResourceManager does not support this protocol");
} }
} }

52
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/api/TestServerRMProxy.java Normal file
View File

@ -0,0 +1,52 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.yarn.server.api;
import org.apache.hadoop.yarn.conf.HAUtil;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.junit.Assert;
import org.junit.Test;
/**
* Test ServerRMProxy.
*/
public class TestServerRMProxy {
@Test
public void testDistributedProtocol() {
YarnConfiguration conf = new YarnConfiguration();
try {
ServerRMProxy.createRMProxy(conf, DistributedSchedulingAMProtocol.class);
} catch (Exception e) {
Assert.fail("DistributedSchedulingAMProtocol fail in non HA");
}
// HA is enabled
conf.setBoolean(YarnConfiguration.RM_HA_ENABLED, true);
conf.set(YarnConfiguration.RM_HA_IDS, "rm1,rm2");
conf.set(HAUtil.addSuffix(YarnConfiguration.RM_HOSTNAME, "rm1"), "0.0.0.0");
conf.set(HAUtil.addSuffix(YarnConfiguration.RM_HOSTNAME, "rm2"), "0.0.0.0");
try {
ServerRMProxy.createRMProxy(conf, DistributedSchedulingAMProtocol.class);
} catch (Exception e) {
Assert.fail("DistributedSchedulingAMProtocol fail in HA");
}
}
}