![Wei-Chiu Chuang](/assets/img/avatar_default.png)
(cherry picked from commit cee8c62498f55794f911ce62edfd4be9e88a7361) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java (cherry picked from commit dd79aee635fdc61648e0c87bea1560dc35aee053) Co-authored-by: caozhiqiang <lfxy@163.com> Reviewed-by: Takanobu Asanuma <tasanuma@apache.org>