diff options
| author | Mukul Kumar Singh <msingh@apache.org> | 2018-01-25 12:36:55 +0530 |
|---|---|---|
| committer | Owen O'Malley <omalley@apache.org> | 2018-04-26 05:36:04 -0700 |
| commit | fb09d7537961935f3ed2506dca1d6e2cd2829a80 (patch) | |
| tree | eac4aa025aa2096c59eb7f32c56bae064c686cf8 /hadoop-hdfs-project/hadoop-hdfs/src/main | |
| parent | 4bb9ad8e8f39d88b07a0e408623b39a58d7d72fc (diff) | |
HDFS-13018. Block Storage: make the iscsi target addres configurable for discovery. Contributed by Elek, Marton.
Diffstat (limited to 'hadoop-hdfs-project/hadoop-hdfs/src/main')
| -rw-r--r-- | hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/jscsiHelper/SCSITargetDaemon.java | 19 | ||||
| -rw-r--r-- | hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml | 17 |
2 files changed, 35 insertions, 1 deletions
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/jscsiHelper/SCSITargetDaemon.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/jscsiHelper/SCSITargetDaemon.java index 37544f5973..ce7717be7b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/jscsiHelper/SCSITargetDaemon.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/jscsiHelper/SCSITargetDaemon.java @@ -17,6 +17,12 @@ */ package org.apache.hadoop.cblock.jscsiHelper; +import static org.apache.hadoop.cblock.CBlockConfigKeys + .DFS_CBLOCK_ISCSI_ADVERTISED_IP; +import static org.apache.hadoop.cblock.CBlockConfigKeys + .DFS_CBLOCK_ISCSI_ADVERTISED_PORT; +import static org.apache.hadoop.cblock.CBlockConfigKeys + .DFS_CBLOCK_ISCSI_ADVERTISED_PORT_DEFAULT; import org.apache.hadoop.cblock.protocolPB.CBlockClientServerProtocolPB; import org.apache.hadoop.cblock.protocolPB.CBlockServiceProtocolPB; import org.apache.hadoop.ipc.ProtobufRpcEngine; @@ -97,7 +103,18 @@ public final class SCSITargetDaemon { NetUtils.getDefaultSocketFactory(ozoneConf), 5000) ); CBlockManagerHandler cbmHandler = new CBlockManagerHandler(cbmClient); - Configuration jscsiConfig = new Configuration(jscsiServerAddress); + + String advertisedAddress = ozoneConf. + getTrimmed(DFS_CBLOCK_ISCSI_ADVERTISED_IP, jscsiServerAddress); + + int advertisedPort = ozoneConf. + getInt(DFS_CBLOCK_ISCSI_ADVERTISED_PORT, + DFS_CBLOCK_ISCSI_ADVERTISED_PORT_DEFAULT); + + Configuration jscsiConfig = + new Configuration(jscsiServerAddress, + advertisedAddress, + advertisedPort); DefaultMetricsSystem.initialize("CBlockMetrics"); CBlockTargetMetrics metrics = CBlockTargetMetrics.create(); CBlockTargetServer targetServer = new CBlockTargetServer( diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml index 434f5c7c76..e09afb2721 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml @@ -277,6 +277,23 @@ </description> </property> + <property> + <name>dfs.cblock.iscsi.advertised.ip</name> + <value>0.0.0.0</value> + <tag>CBLOCK</tag> + <description> + IP address returned during the iscsi discovery. + </description> + </property> + + <property> + <name>dfs.cblock.iscsi.advertised.port</name> + <value>3260</value> + <tag>CBLOCK</tag> + <description> + TCP port returned during the iscsi discovery. + </description> + </property> <!--Container Settings used by Datanode--> <property> <name>ozone.container.cache.size</name> |