[hadoop] branch branch-2 updated: HDFS-14247. Repeat adding node description into network topology. Contributed by HuangTao.

[weichiu]

This is an automated email from the ASF dual-hosted git repository.

weichiu pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 0272480  HDFS-14247. Repeat adding node description into network 
topology. Contributed by HuangTao.
0272480 is described below

commit 0272480e9fe72acbfd15be21c81113b7601e5853
Author: Inigo Goiri <inigo...@apache.org>
AuthorDate: Fri Mar 1 09:18:51 2019 -0800

    HDFS-14247. Repeat adding node description into network topology. 
Contributed by HuangTao.
    
    (cherry picked from commit 80b77deb42a3ef94d6bef160bc58d807f2faa104)
    (cherry picked from commit 96371245357bda63b3ede10f37a37f5333a85d69)
    (cherry picked from commit 90b88db35d42f2eab4da7f192a5fb99d9c834abb)
    (cherry picked from commit 9daa45f646d9eddda21c087c23e6d1498f98c055)
---
 .../org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
index 9f0e502..fe94a31 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
@@ -1060,7 +1060,6 @@ public class DatanodeManager {
           nodeDescr.setDependentHostNames(
               getNetworkDependenciesWithDefault(nodeDescr));
         }
-        networktopology.add(nodeDescr);
         nodeDescr.setSoftwareVersion(nodeReg.getSoftwareVersion());
         resolveUpgradeDomain(nodeDescr);
 


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org