virajjasani commented on code in PR #4321:
URL: https://github.com/apache/hadoop/pull/4321#discussion_r895085989
##########
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java:
##########
@@ -1648,40 +1647,46 @@ public int metaSave(String[] argv, int idx) throws
IOException {
* @throws IOException If an error while getting datanode report
*/
public int printTopology() throws IOException {
- DistributedFileSystem dfs = getDFS();
- final DatanodeInfo[] report = dfs.getDataNodeStats();
-
- // Build a map of rack -> nodes from the datanode report
- HashMap<String, TreeSet<String> > tree = new HashMap<String,
TreeSet<String>>();
- for(DatanodeInfo dni : report) {
- String location = dni.getNetworkLocation();
- String name = dni.getName();
-
- if(!tree.containsKey(location)) {
- tree.put(location, new TreeSet<String>());
- }
+ DistributedFileSystem dfs = getDFS();
+ final DatanodeInfo[] report = dfs.getDataNodeStats();
+
+ // Build a map of rack -> nodes from the datanode report
+ HashMap<String, HashMap<String, String>> tree = new HashMap<String,
+ HashMap<String, String>>();
Review Comment:
nit: could you please replace this with?
```
Map<String, HashMap<String, String>> map = new HashMap<>();
```
##########
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java:
##########
@@ -1648,40 +1647,46 @@ public int metaSave(String[] argv, int idx) throws
IOException {
* @throws IOException If an error while getting datanode report
*/
public int printTopology() throws IOException {
- DistributedFileSystem dfs = getDFS();
- final DatanodeInfo[] report = dfs.getDataNodeStats();
-
- // Build a map of rack -> nodes from the datanode report
- HashMap<String, TreeSet<String> > tree = new HashMap<String,
TreeSet<String>>();
- for(DatanodeInfo dni : report) {
- String location = dni.getNetworkLocation();
- String name = dni.getName();
-
- if(!tree.containsKey(location)) {
- tree.put(location, new TreeSet<String>());
- }
+ DistributedFileSystem dfs = getDFS();
+ final DatanodeInfo[] report = dfs.getDataNodeStats();
+
+ // Build a map of rack -> nodes from the datanode report
+ HashMap<String, HashMap<String, String>> tree = new HashMap<String,
+ HashMap<String, String>>();
+ for(DatanodeInfo dni : report) {
+ String location = dni.getNetworkLocation();
+ String name = dni.getName();
+ String dnState = dni.getAdminState().toString();
- tree.get(location).add(name);
+ if(!tree.containsKey(location)) {
+ tree.put(location, new HashMap<String, String>());
Review Comment:
same here, `new HashMap<>()` is sufficient :)
##########
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java:
##########
@@ -1648,40 +1647,46 @@ public int metaSave(String[] argv, int idx) throws
IOException {
* @throws IOException If an error while getting datanode report
*/
public int printTopology() throws IOException {
- DistributedFileSystem dfs = getDFS();
- final DatanodeInfo[] report = dfs.getDataNodeStats();
-
- // Build a map of rack -> nodes from the datanode report
- HashMap<String, TreeSet<String> > tree = new HashMap<String,
TreeSet<String>>();
- for(DatanodeInfo dni : report) {
- String location = dni.getNetworkLocation();
- String name = dni.getName();
-
- if(!tree.containsKey(location)) {
- tree.put(location, new TreeSet<String>());
- }
+ DistributedFileSystem dfs = getDFS();
+ final DatanodeInfo[] report = dfs.getDataNodeStats();
+
+ // Build a map of rack -> nodes from the datanode report
+ HashMap<String, HashMap<String, String>> tree = new HashMap<String,
+ HashMap<String, String>>();
+ for(DatanodeInfo dni : report) {
+ String location = dni.getNetworkLocation();
+ String name = dni.getName();
+ String dnState = dni.getAdminState().toString();
- tree.get(location).add(name);
+ if(!tree.containsKey(location)) {
+ tree.put(location, new HashMap<String, String>());
}
+
+ HashMap<String, String> node = tree.get(location);
+ node.put(name, dnState);
+ }
- // Sort the racks (and nodes) alphabetically, display in order
- ArrayList<String> racks = new ArrayList<String>(tree.keySet());
- Collections.sort(racks);
+ // Sort the racks (and nodes) alphabetically, display in order
+ ArrayList<String> racks = new ArrayList<String>(tree.keySet());
Review Comment:
nit: `List<String> racks = new ArrayList<>(tree.keySet())`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
