Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-12611. Ozone: SCM Cli: Use the hostname of SCM server instead of the bind address. Contributed by Elek, Marton.

Browse Source
This commit is contained in:
Chen Liang 2017-10-09 11:31:33 -07:00 committed by Owen O'Malley
parent e76e10fd7a
commit b05ad0b315
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/cli/SCMCLI.java
View File

@ -29,6 +29,7 @@
import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.conf.OzoneConfiguration; import org.apache.hadoop.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.client.OzoneClientUtils;
import org.apache.hadoop.ozone.scm.cli.container.ContainerCommandHandler; import org.apache.hadoop.ozone.scm.cli.container.ContainerCommandHandler;
import org.apache.hadoop.ozone.web.exceptions.OzoneException; import org.apache.hadoop.ozone.web.exceptions.OzoneException;
import org.apache.hadoop.scm.XceiverClientManager; import org.apache.hadoop.scm.XceiverClientManager;
@ -49,10 +50,6 @@
import static org.apache.hadoop.ozone.scm.cli.ResultCode.SUCCESS; import static org.apache.hadoop.ozone.scm.cli.ResultCode.SUCCESS;
import static org.apache.hadoop.ozone.scm.cli.ResultCode.UNRECOGNIZED_CMD; import static org.apache.hadoop.ozone.scm.cli.ResultCode.UNRECOGNIZED_CMD;
import static org.apache.hadoop.ozone.scm.cli.container.ContainerCommandHandler.CONTAINER_CMD; import static org.apache.hadoop.ozone.scm.cli.container.ContainerCommandHandler.CONTAINER_CMD;
import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_CLIENT_BIND_HOST_DEFAULT;
import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_CLIENT_BIND_HOST_KEY;
import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_CLIENT_PORT_DEFAULT;
import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_CLIENT_PORT_KEY;
import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE_DEFAULT; import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE_DEFAULT;
import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE_GB; import static org.apache.hadoop.scm.ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE_GB;
@ -106,21 +103,18 @@ private static ScmClient getScmClient(OzoneConfiguration ozoneConf)
throws IOException { throws IOException {
long version = RPC.getProtocolVersion( long version = RPC.getProtocolVersion(
StorageContainerLocationProtocolPB.class); StorageContainerLocationProtocolPB.class);
String scmAddress = ozoneConf.get(OZONE_SCM_CLIENT_BIND_HOST_KEY, InetSocketAddress scmAddress =
OZONE_SCM_CLIENT_BIND_HOST_DEFAULT); OzoneClientUtils.getScmAddressForClients(ozoneConf);
int scmPort = ozoneConf.getInt(OZONE_SCM_CLIENT_PORT_KEY,
OZONE_SCM_CLIENT_PORT_DEFAULT);
int containerSizeGB = ozoneConf.getInt(OZONE_SCM_CONTAINER_SIZE_GB, int containerSizeGB = ozoneConf.getInt(OZONE_SCM_CONTAINER_SIZE_GB,
OZONE_SCM_CONTAINER_SIZE_DEFAULT); OZONE_SCM_CONTAINER_SIZE_DEFAULT);
ContainerOperationClient.setContainerSizeB(containerSizeGB*OzoneConsts.GB); ContainerOperationClient.setContainerSizeB(containerSizeGB*OzoneConsts.GB);
InetSocketAddress address = new InetSocketAddress(scmAddress, scmPort);
RPC.setProtocolEngine(ozoneConf, StorageContainerLocationProtocolPB.class, RPC.setProtocolEngine(ozoneConf, StorageContainerLocationProtocolPB.class,
ProtobufRpcEngine.class); ProtobufRpcEngine.class);
StorageContainerLocationProtocolClientSideTranslatorPB client = StorageContainerLocationProtocolClientSideTranslatorPB client =
new StorageContainerLocationProtocolClientSideTranslatorPB( new StorageContainerLocationProtocolClientSideTranslatorPB(
RPC.getProxy(StorageContainerLocationProtocolPB.class, version, RPC.getProxy(StorageContainerLocationProtocolPB.class, version,
address, UserGroupInformation.getCurrentUser(), ozoneConf, scmAddress, UserGroupInformation.getCurrentUser(), ozoneConf,
NetUtils.getDefaultSocketFactory(ozoneConf), NetUtils.getDefaultSocketFactory(ozoneConf),
Client.getRpcTimeout(ozoneConf))); Client.getRpcTimeout(ozoneConf)));
ScmClient storageClient = new ContainerOperationClient( ScmClient storageClient = new ContainerOperationClient(