From 4c34bfad7fb3efb2654331e5f0a4749ded8af5c0 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 10 Feb 2026 20:30:19 +0100 Subject: [PATCH 1/6] move Node#fromProtobuf to NodeSchemaManager --- .../org/apache/hadoop/hdds/scm/net/InnerNode.java | 5 ----- .../apache/hadoop/hdds/scm/net/InnerNodeImpl.java | 2 +- .../java/org/apache/hadoop/hdds/scm/net/Node.java | 13 ------------- .../hadoop/hdds/scm/net/NodeSchemaManager.java | 12 ++++++++++++ 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNode.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNode.java index 2fca31c38a53..ac9ec514a80b 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNode.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNode.java @@ -99,9 +99,4 @@ Node getLeaf(int leafIndex, List excludedScopes, @Override int hashCode(); - - static InnerNode fromProtobuf( - HddsProtos.InnerNode innerNode) { - return InnerNodeImpl.fromProtobuf(innerNode); - } } diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java index c55646ad1ab9..c38a8800b5d6 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java @@ -109,7 +109,7 @@ public Builder setChildrenMap( String networkName = childrenMapProto.hasNetworkName() ? childrenMapProto.getNetworkName() : null; Node node = childrenMapProto.hasNetworkNode() ? - Node.fromProtobuf(childrenMapProto.getNetworkNode()) : null; + NodeSchemaManager.fromProtobuf(childrenMapProto.getNetworkNode()) : null; newChildrenMap.put(networkName, node); } this.childrenMap = newChildrenMap; diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/Node.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/Node.java index 54d720e3c6f6..849111161bce 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/Node.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/Node.java @@ -17,7 +17,6 @@ package org.apache.hadoop.hdds.scm.net; -import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; /** @@ -134,16 +133,4 @@ default HddsProtos.NetworkNode toProtobuf( int clientVersion) { return null; } - - static Node fromProtobuf( - HddsProtos.NetworkNode networkNode) { - if (networkNode.hasDatanodeDetails()) { - return DatanodeDetails.getFromProtoBuf( - networkNode.getDatanodeDetails()); - } else if (networkNode.hasInnerNode()) { - return InnerNode.fromProtobuf(networkNode.getInnerNode()); - } else { - return null; - } - } } diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaManager.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaManager.java index 326b16a7b6f9..0d6ad032969e 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaManager.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaManager.java @@ -23,6 +23,8 @@ import java.util.Arrays; import java.util.List; import org.apache.hadoop.hdds.conf.ConfigurationSource; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.scm.ScmConfigKeys; import org.apache.hadoop.hdds.scm.net.NodeSchemaLoader.NodeSchemaLoadResult; import org.slf4j.Logger; @@ -138,4 +140,14 @@ public String complete(String path) { } return null; } + + static Node fromProtobuf(HddsProtos.NetworkNode networkNode) { + if (networkNode.hasDatanodeDetails()) { + return DatanodeDetails.getFromProtoBuf(networkNode.getDatanodeDetails()); + } else if (networkNode.hasInnerNode()) { + return InnerNodeImpl.fromProtobuf(networkNode.getInnerNode()); + } else { + return null; + } + } } From 5663e05868e319e93dada2023ef514ef68a43209 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 10 Feb 2026 20:43:02 +0100 Subject: [PATCH 2/6] move network topology impl to hdds-server-framework --- hadoop-hdds/common/pom.xml | 13 +++++++------ hadoop-hdds/framework/pom.xml | 4 ++++ .../apache/hadoop/hdds/scm/net/InnerNodeImpl.java | 0 .../hadoop/hdds/scm/net/NetworkTopologyImpl.java | 0 .../hadoop/hdds/scm/net/NodeSchemaLoader.java | 0 .../hadoop/hdds/scm/net/NodeSchemaManager.java | 0 .../hdds/scm/net/TestNetworkTopologyImpl.java | 0 .../hadoop/hdds/scm/net/TestNodeSchemaLoader.java | 0 .../hadoop/hdds/scm/net/TestNodeSchemaManager.java | 0 .../hadoop/hdds/scm/net/TestYamlSchemaLoader.java | 0 .../networkTopologyTestFiles/enforce-error.xml | 0 .../networkTopologyTestFiles/external-entity.xml | 0 .../resources/networkTopologyTestFiles/good.xml | 0 .../resources/networkTopologyTestFiles/good.yaml | 0 .../networkTopologyTestFiles/invalid-cost.xml | 0 .../networkTopologyTestFiles/invalid-version.xml | 0 .../networkTopologyTestFiles/middle-leaf.yaml | 0 .../networkTopologyTestFiles/multiple-leaf.xml | 0 .../networkTopologyTestFiles/multiple-root.xml | 0 .../networkTopologyTestFiles/multiple-root.yaml | 0 .../networkTopologyTestFiles/multiple-topology.xml | 0 .../resources/networkTopologyTestFiles/no-leaf.xml | 0 .../resources/networkTopologyTestFiles/no-root.xml | 0 .../networkTopologyTestFiles/no-topology.xml | 0 .../path-layers-size-mismatch.xml | 0 .../path-with-id-reference-failure.xml | 0 .../networkTopologyTestFiles/unknown-layer-type.xml | 0 .../networkTopologyTestFiles/wrong-path-order-1.xml | 0 .../networkTopologyTestFiles/wrong-path-order-2.xml | 0 29 files changed, 11 insertions(+), 6 deletions(-) rename hadoop-hdds/{common => framework}/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java (100%) rename hadoop-hdds/{common => framework}/src/main/java/org/apache/hadoop/hdds/scm/net/NetworkTopologyImpl.java (100%) rename hadoop-hdds/{common => framework}/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaLoader.java (100%) rename hadoop-hdds/{common => framework}/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaManager.java (100%) rename hadoop-hdds/{common => framework}/src/test/java/org/apache/hadoop/hdds/scm/net/TestNetworkTopologyImpl.java (100%) rename hadoop-hdds/{common => framework}/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaLoader.java (100%) rename hadoop-hdds/{common => framework}/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java (100%) rename hadoop-hdds/{common => framework}/src/test/java/org/apache/hadoop/hdds/scm/net/TestYamlSchemaLoader.java (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/enforce-error.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/external-entity.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/good.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/good.yaml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/invalid-cost.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/invalid-version.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/middle-leaf.yaml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/multiple-leaf.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/multiple-root.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/multiple-root.yaml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/multiple-topology.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/no-leaf.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/no-root.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/no-topology.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/path-layers-size-mismatch.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/path-with-id-reference-failure.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/unknown-layer-type.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/wrong-path-order-1.xml (100%) rename hadoop-hdds/{common => framework}/src/test/resources/networkTopologyTestFiles/wrong-path-order-2.xml (100%) diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index ec6e4578706d..ef8fa23e97f6 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -63,10 +63,6 @@ commons-codec commons-codec - - commons-io - commons-io - info.picocli picocli @@ -184,14 +180,19 @@ slf4j-reload4j runtime + + + + commons-io + commons-io + test + org.apache.ozone hdds-config test-jar test - - org.apache.ozone hdds-test-utils diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index 74d25f660dc7..f8736c2ac037 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -120,6 +120,10 @@ javax.servlet javax.servlet-api + + org.apache.commons + commons-collections4 + org.apache.commons commons-compress diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java similarity index 100% rename from hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java rename to hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NetworkTopologyImpl.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/net/NetworkTopologyImpl.java similarity index 100% rename from hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NetworkTopologyImpl.java rename to hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/net/NetworkTopologyImpl.java diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaLoader.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaLoader.java similarity index 100% rename from hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaLoader.java rename to hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaLoader.java diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaManager.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaManager.java similarity index 100% rename from hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaManager.java rename to hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/net/NodeSchemaManager.java diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNetworkTopologyImpl.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/scm/net/TestNetworkTopologyImpl.java similarity index 100% rename from hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNetworkTopologyImpl.java rename to hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/scm/net/TestNetworkTopologyImpl.java diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaLoader.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaLoader.java similarity index 100% rename from hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaLoader.java rename to hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaLoader.java diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java similarity index 100% rename from hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java rename to hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/scm/net/TestNodeSchemaManager.java diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestYamlSchemaLoader.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/scm/net/TestYamlSchemaLoader.java similarity index 100% rename from hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/scm/net/TestYamlSchemaLoader.java rename to hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/scm/net/TestYamlSchemaLoader.java diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/enforce-error.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/enforce-error.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/enforce-error.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/enforce-error.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/external-entity.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/external-entity.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/external-entity.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/external-entity.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/good.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/good.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/good.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/good.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/good.yaml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/good.yaml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/good.yaml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/good.yaml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/invalid-cost.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/invalid-cost.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/invalid-cost.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/invalid-cost.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/invalid-version.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/invalid-version.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/invalid-version.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/invalid-version.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/middle-leaf.yaml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/middle-leaf.yaml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/middle-leaf.yaml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/middle-leaf.yaml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/multiple-leaf.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/multiple-leaf.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/multiple-leaf.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/multiple-leaf.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/multiple-root.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/multiple-root.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/multiple-root.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/multiple-root.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/multiple-root.yaml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/multiple-root.yaml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/multiple-root.yaml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/multiple-root.yaml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/multiple-topology.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/multiple-topology.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/multiple-topology.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/multiple-topology.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/no-leaf.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/no-leaf.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/no-leaf.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/no-leaf.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/no-root.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/no-root.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/no-root.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/no-root.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/no-topology.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/no-topology.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/no-topology.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/no-topology.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/path-layers-size-mismatch.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/path-layers-size-mismatch.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/path-layers-size-mismatch.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/path-layers-size-mismatch.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/path-with-id-reference-failure.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/path-with-id-reference-failure.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/path-with-id-reference-failure.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/path-with-id-reference-failure.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/unknown-layer-type.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/unknown-layer-type.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/unknown-layer-type.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/unknown-layer-type.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/wrong-path-order-1.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/wrong-path-order-1.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/wrong-path-order-1.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/wrong-path-order-1.xml diff --git a/hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/wrong-path-order-2.xml b/hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/wrong-path-order-2.xml similarity index 100% rename from hadoop-hdds/common/src/test/resources/networkTopologyTestFiles/wrong-path-order-2.xml rename to hadoop-hdds/framework/src/test/resources/networkTopologyTestFiles/wrong-path-order-2.xml From 817ff0303e90075393a5842362ecccff143c2cd5 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 10 Feb 2026 20:43:49 +0100 Subject: [PATCH 3/6] HDDS-14609. Remove dependency on snakeyaml from hdds-common --- hadoop-hdds/common/pom.xml | 4 ---- .../main/java/org/apache/hadoop/hdds/server/YamlUtils.java | 0 2 files changed, 4 deletions(-) rename hadoop-hdds/{common => framework}/src/main/java/org/apache/hadoop/hdds/server/YamlUtils.java (100%) diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index ef8fa23e97f6..5f9499debfc9 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -160,10 +160,6 @@ org.slf4j slf4j-api - - org.yaml - snakeyaml - org.apache.ratis ratis-metrics-dropwizard3 diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/server/YamlUtils.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/YamlUtils.java similarity index 100% rename from hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/server/YamlUtils.java rename to hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/YamlUtils.java From e799daf3525bef2e3308df855aae35b9004e6d08 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 10 Feb 2026 20:51:59 +0100 Subject: [PATCH 4/6] add package-info.java --- .../hadoop/hdds/scm/net/package-info.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/net/package-info.java diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/net/package-info.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/net/package-info.java new file mode 100644 index 000000000000..d363c3c5cf75 --- /dev/null +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/net/package-info.java @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * The network topology supported by Ozone. + */ +package org.apache.hadoop.hdds.scm.net; From ec953087db4e2660749b8659bf532bc9eb912841 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 10 Feb 2026 22:22:36 +0100 Subject: [PATCH 5/6] also move network-topology resources --- .../src/main/resources/network-topology-default.xml | 0 .../src/main/resources/network-topology-default.yaml | 0 .../src/main/resources/network-topology-nodegroup.xml | 0 hadoop-ozone/dist/dev-support/bin/dist-layout-stitching | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) rename hadoop-hdds/{common => framework}/src/main/resources/network-topology-default.xml (100%) rename hadoop-hdds/{common => framework}/src/main/resources/network-topology-default.yaml (100%) rename hadoop-hdds/{common => framework}/src/main/resources/network-topology-nodegroup.xml (100%) diff --git a/hadoop-hdds/common/src/main/resources/network-topology-default.xml b/hadoop-hdds/framework/src/main/resources/network-topology-default.xml similarity index 100% rename from hadoop-hdds/common/src/main/resources/network-topology-default.xml rename to hadoop-hdds/framework/src/main/resources/network-topology-default.xml diff --git a/hadoop-hdds/common/src/main/resources/network-topology-default.yaml b/hadoop-hdds/framework/src/main/resources/network-topology-default.yaml similarity index 100% rename from hadoop-hdds/common/src/main/resources/network-topology-default.yaml rename to hadoop-hdds/framework/src/main/resources/network-topology-default.yaml diff --git a/hadoop-hdds/common/src/main/resources/network-topology-nodegroup.xml b/hadoop-hdds/framework/src/main/resources/network-topology-nodegroup.xml similarity index 100% rename from hadoop-hdds/common/src/main/resources/network-topology-nodegroup.xml rename to hadoop-hdds/framework/src/main/resources/network-topology-nodegroup.xml diff --git a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching index 79fb802e38f9..17723b208cf6 100755 --- a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching +++ b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching @@ -90,8 +90,8 @@ run cp "${ROOT}/hadoop-ozone/dist/src/shell/conf/scm-audit-log4j2.properties" "e run cp "${ROOT}/hadoop-ozone/dist/src/shell/conf/s3g-audit-log4j2.properties" "etc/hadoop" run cp "${ROOT}/hadoop-ozone/dist/src/shell/conf/ozone-site.xml" "etc/hadoop" run cp -f "${ROOT}/hadoop-ozone/dist/src/shell/conf/log4j.properties" "etc/hadoop" -run cp "${ROOT}/hadoop-hdds/common/src/main/resources/network-topology-default.xml" "etc/hadoop" -run cp "${ROOT}/hadoop-hdds/common/src/main/resources/network-topology-nodegroup.xml" "etc/hadoop" +run cp "${ROOT}/hadoop-hdds/framework/src/main/resources/network-topology-default.xml" "etc/hadoop" +run cp "${ROOT}/hadoop-hdds/framework/src/main/resources/network-topology-nodegroup.xml" "etc/hadoop" run cp -r "${ROOT}/hadoop-ozone/dist/src/main/dockerlibexec/." "libexec/" From 59c6ced0fa925bd932c3a2504f45fb4ee67730d6 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 10 Feb 2026 22:56:45 +0100 Subject: [PATCH 6/6] temporarily add commons-io for tests --- hadoop-hdds/client/pom.xml | 6 ++++++ hadoop-ozone/common/pom.xml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml index 6240d7be1144..260f92265374 100644 --- a/hadoop-hdds/client/pom.xml +++ b/hadoop-hdds/client/pom.xml @@ -86,6 +86,12 @@ + + + commons-io + commons-io + test + org.apache.ozone hdds-common diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml index f98f248ff219..c3bb09ae792a 100644 --- a/hadoop-ozone/common/pom.xml +++ b/hadoop-ozone/common/pom.xml @@ -155,6 +155,12 @@ runtime + + + commons-io + commons-io + test + io.grpc grpc-inprocess