You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ms...@apache.org on 2018/01/25 07:09:28 UTC
hadoop git commit: HDFS-13018. Block Storage: make the iscsi target
addres configurable for discovery. Contributed by Elek, Marton.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7240 b2b043ef1 -> 7ea3a3aa5
HDFS-13018. Block Storage: make the iscsi target addres configurable for discovery. Contributed by Elek, Marton.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7ea3a3aa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7ea3a3aa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7ea3a3aa
Branch: refs/heads/HDFS-7240
Commit: 7ea3a3aa5d575b6783353b517e08d4fa6595b0d9
Parents: b2b043e
Author: Mukul Kumar Singh <ms...@apache.org>
Authored: Thu Jan 25 12:36:55 2018 +0530
Committer: Mukul Kumar Singh <ms...@apache.org>
Committed: Thu Jan 25 12:36:55 2018 +0530
----------------------------------------------------------------------
.../apache/hadoop/cblock/CBlockConfigKeys.java | 8 ++++++++
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 2 +-
.../cblock/jscsiHelper/SCSITargetDaemon.java | 19 ++++++++++++++++++-
.../src/main/resources/ozone-default.xml | 17 +++++++++++++++++
4 files changed, 44 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ea3a3aa/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/cblock/CBlockConfigKeys.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/cblock/CBlockConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/cblock/CBlockConfigKeys.java
index 81ad8f5..fb8f17e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/cblock/CBlockConfigKeys.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/cblock/CBlockConfigKeys.java
@@ -187,6 +187,14 @@ public final class CBlockConfigKeys {
"dfs.cblock.rpc.timeout";
public static final String DFS_CBLOCK_RPC_TIMEOUT_DEFAULT = "300s";
+ public static final String DFS_CBLOCK_ISCSI_ADVERTISED_IP =
+ "dfs.cblock.iscsi.advertised.ip";
+
+ public static final String DFS_CBLOCK_ISCSI_ADVERTISED_PORT =
+ "dfs.cblock.iscsi.advertised.port";
+
+ public static final int DFS_CBLOCK_ISCSI_ADVERTISED_PORT_DEFAULT = 3260;
+
private CBlockConfigKeys() {
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ea3a3aa/hadoop-hdfs-project/hadoop-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index d3aaef9..b5e22a7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -211,7 +211,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>org.jscsi</groupId>
<artifactId>target</artifactId>
- <version>2.5.3</version>
+ <version>2.6.0</version>
<optional>true</optional>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ea3a3aa/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/jscsiHelper/SCSITargetDaemon.java
----------------------------------------------------------------------
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 37544f5..ce7717b 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(
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ea3a3aa/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml
----------------------------------------------------------------------
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 434f5c7..e09afb2 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org