Merge pull request #69 from freshertm/add_datanode_hostname_option

alexey-milovidov · web-flow · commit d0ae7d256815 · 2025-01-09T21:49:19.000+01:00
Added dfs.client.use.datanode.hostname config option
diff --git a/src/client/RemoteBlockReader.cpp b/src/client/RemoteBlockReader.cpp
@@ -66,7 +66,7 @@ RemoteBlockReader::RemoteBlockReader(const ExtendedBlock& eb,
     readTimeout = conf.getInputReadTimeout();
     writeTimeout = conf.getInputWriteTimeout();
     connTimeout = conf.getInputConnTimeout();
-    sock = getNextPeer(datanode);
+    sock = getNextPeer(datanode, conf.connectViaHostname());
     in = shared_ptr<BufferedSocketReader>(new BufferedSocketReaderImpl(*sock));
     sender = shared_ptr<DataTransferProtocol>(new DataTransferProtocolSender(
         *sock, writeTimeout, datanode.formatAddress()));
@@ -82,14 +82,21 @@ RemoteBlockReader::~RemoteBlockReader() {
     }
 }
 
-shared_ptr<Socket> RemoteBlockReader::getNextPeer(const DatanodeInfo& dn) {
+shared_ptr<Socket> RemoteBlockReader::getNextPeer(const DatanodeInfo& dn, const bool connectToDnViaHostname) {
     shared_ptr<Socket> sock;
     try {
         sock = peerCache.getConnection(dn);
 
         if (!sock) {
             sock = shared_ptr<Socket>(new TcpSocketImpl);
-            sock->connect(dn.getIpAddr().c_str(), dn.getXferPort(),
+            
+            std::string host;
+            if(connectToDnViaHostname) {
+                host = dn.getHostName();
+            } else {
+                host = dn.getIpAddr();
+            }
+            sock->connect(host.c_str(), dn.getXferPort(),
                           connTimeout);
             sock->setNoDelay(true);
         }
diff --git a/src/client/RemoteBlockReader.h b/src/client/RemoteBlockReader.h
@@ -76,7 +76,7 @@ class RemoteBlockReader: public BlockReader {
 private:
     bool readTrailingEmptyPacket();
     shared_ptr<PacketHeader> readPacketHeader();
-    shared_ptr<Socket> getNextPeer(const DatanodeInfo& dn);
+    shared_ptr<Socket> getNextPeer(const DatanodeInfo& dn, const bool connectToDnViaHostname);
     void checkResponse();
     void readNextPacket();
     void sendStatus();
diff --git a/src/common/SessionConfig.cpp b/src/common/SessionConfig.cpp
@@ -69,6 +69,8 @@ SessionConfig::SessionConfig(const Config & conf) {
             &useMappedFile, "input.localread.mappedfile", true
         }, {
             &legacyLocalBlockReader, "dfs.client.use.legacy.blockreader.local", false
+        }, {
+            &connectToDnViaHostname, "dfs.client.use.datanode.hostname", false
         }
     };
     ConfigDefault<int32_t> i32Values[] = {
diff --git a/src/common/SessionConfig.h b/src/common/SessionConfig.h
@@ -139,6 +139,10 @@ class SessionConfig {
         return maxLocalBlockInfoCacheSize;
     }
 
+    bool connectViaHostname() const {
+        return connectToDnViaHostname;
+    }
+
     /*
      * OutputStream configure
      */
@@ -339,6 +343,7 @@ class SessionConfig {
     /*
      * InputStream configure
      */
+    bool connectToDnViaHostname;
     bool useMappedFile;
     bool readFromLocal;
     bool notRetryAnotherNode;
diff --git a/test/data/function-secure.xml b/test/data/function-secure.xml
@@ -39,5 +39,10 @@
 		<name>dfs.namenode.http-address.gphd-cluster.nn2</name>
 		<value>mdw:50070</value>
 	</property>
+
+	<property>
+		<name>dfs.client.use.datanode.hostname</name>
+		<value>true</value>
+	</property>
 	
 </configuration>
diff --git a/test/data/function-secure.xml.sample b/test/data/function-secure.xml.sample
@@ -39,5 +39,10 @@
 		<name>dfs.namenode.http-address.gphd-cluster.nn2</name>
 		<value>mdw:50070</value>
 	</property>
+
+	<property>
+		<name>dfs.client.use.datanode.hostname</name>
+		<value>true</value>
+	</property>
 	
 </configuration>
diff --git a/test/data/function-test.xml b/test/data/function-test.xml
@@ -119,4 +119,10 @@
 		<name>dfs.client.read.striped.thread-pool.size</name>
 		<value>64</value>
 	</property>
+
+	<property>
+		<name>dfs.client.use.datanode.hostname</name>
+		<value>true</value>
+	</property>
+	
 </configuration>
diff --git a/test/data/function-test.xml.sample b/test/data/function-test.xml.sample
@@ -104,4 +104,10 @@
 		<name>test.get.confint32</name>
 		<value>10</value>
 	</property>
+
+	<property>
+		<name>dfs.client.use.datanode.hostname</name>
+		<value>true</value>
+	</property>
+	
 </configuration>
diff --git a/test/data/invalidha.xml b/test/data/invalidha.xml
@@ -26,4 +26,10 @@
                 <name>dfs.client.failover.proxy.provider.phdcluster</name>
                 <value>org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider</value>
         </property>
+
+	<property>
+		<name>dfs.client.use.datanode.hostname</name>
+		<value>true</value>
+	</property>
+        
 </configuration>
diff --git a/test/data/validha.xml b/test/data/validha.xml
@@ -32,4 +32,10 @@
                 <name>dfs.client.failover.proxy.provider.phdcluster</name>
                 <value>org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider</value>
         </property>
+
+	<property>
+		<name>dfs.client.use.datanode.hostname</name>
+		<value>true</value>
+	</property>
+
 </configuration>

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,8 @@ SessionConfig::SessionConfig(const Config & conf) {`
`69`	`69`	`&useMappedFile, "input.localread.mappedfile", true`
`70`	`70`	`}, {`
`71`	`71`	`&legacyLocalBlockReader, "dfs.client.use.legacy.blockreader.local", false`
	`72`	`+ }, {`
	`73`	`+ &connectToDnViaHostname, "dfs.client.use.datanode.hostname", false`
`72`	`74`	`}`
`73`	`75`	`};`
`74`	`76`	`ConfigDefault<int32_t> i32Values[] = {`