vtutrinov commented on code in PR #4857: URL: https://github.com/apache/ozone/pull/4857#discussion_r1223060235
########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestStorageUtils.java: ########## @@ -0,0 +1,266 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.UUID; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test for StorageUtils. + */ +public class TestStorageUtils { + + @Test + public void testNoFilters() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, metaRequired, dataRequired); + //no filters, able to pick suitable volumes + assertTrue(hasSpace); + } + + @Test + public void testFilterNoDataSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, data -> + data.getStorageType() == StorageTypeProto.DISK, + null, + metaRequired, dataRequired); + //no free DISK storage + assertFalse(hasSpace); + } + + @Test + public void testHasSuitableDiskVolume() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + StorageReportProto data2 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 7_000_000); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1, data2))); Review Comment: ```suggestion updateStorageReports(asList(data0, data1, data2)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestStorageUtils.java: ########## @@ -0,0 +1,266 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.UUID; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test for StorageUtils. + */ +public class TestStorageUtils { + + @Test + public void testNoFilters() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, metaRequired, dataRequired); + //no filters, able to pick suitable volumes + assertTrue(hasSpace); + } + + @Test + public void testFilterNoDataSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, data -> + data.getStorageType() == StorageTypeProto.DISK, + null, + metaRequired, dataRequired); + //no free DISK storage + assertFalse(hasSpace); + } + + @Test + public void testHasSuitableDiskVolume() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + StorageReportProto data2 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 7_000_000); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1, data2))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); Review Comment: ```suggestion asList(meta0)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestStorageUtils.java: ########## @@ -0,0 +1,266 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.UUID; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test for StorageUtils. + */ +public class TestStorageUtils { + + @Test + public void testNoFilters() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, metaRequired, dataRequired); + //no filters, able to pick suitable volumes + assertTrue(hasSpace); + } + + @Test + public void testFilterNoDataSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); Review Comment: ```suggestion asList(meta0)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestStorageUtils.java: ########## @@ -0,0 +1,266 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.UUID; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test for StorageUtils. + */ +public class TestStorageUtils { + + @Test + public void testNoFilters() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, metaRequired, dataRequired); + //no filters, able to pick suitable volumes + assertTrue(hasSpace); + } + + @Test + public void testFilterNoDataSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, data -> + data.getStorageType() == StorageTypeProto.DISK, + null, + metaRequired, dataRequired); + //no free DISK storage + assertFalse(hasSpace); + } + + @Test + public void testHasSuitableDiskVolume() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + StorageReportProto data2 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 7_000_000); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1, data2))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, data -> + data.getStorageType() == StorageTypeProto.DISK, + null, + metaRequired, dataRequired); + //found suitable volume after filtering + assertTrue(hasSpace); + } + + @Test + public void testFilterNoMetaSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); Review Comment: ```suggestion asList(meta0)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestStorageUtils.java: ########## @@ -0,0 +1,266 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.UUID; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test for StorageUtils. + */ +public class TestStorageUtils { + + @Test + public void testNoFilters() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, metaRequired, dataRequired); + //no filters, able to pick suitable volumes + assertTrue(hasSpace); + } + + @Test + public void testFilterNoDataSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, data -> + data.getStorageType() == StorageTypeProto.DISK, + null, + metaRequired, dataRequired); + //no free DISK storage + assertFalse(hasSpace); + } + + @Test + public void testHasSuitableDiskVolume() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + StorageReportProto data2 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 7_000_000); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1, data2))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, data -> + data.getStorageType() == StorageTypeProto.DISK, + null, + metaRequired, dataRequired); + //found suitable volume after filtering + assertTrue(hasSpace); + } + + @Test + public void testFilterNoMetaSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); Review Comment: ```suggestion updateStorageReports(asList(data0, data1)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementHDD.java: ########## @@ -0,0 +1,165 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.conf.StorageUnit; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.exceptions.SCMException; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeManager; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN; +import static org.mockito.Mockito.when; + +/** + * Test for the DISK-only volume container placement. + */ +public class TestSCMContainerPlacementHDD { + + @Test + public void chooseDatanodes() throws SCMException { + //given + OzoneConfiguration conf = new OzoneConfiguration(); + // We are using small units here + conf.setStorageSize(OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN, + 1, StorageUnit.BYTES); + + List<DatanodeInfo> datanodes = new ArrayList<>(); + + DatanodeInfo datanodeInfo0 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage01 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + StorageReportProto storage02 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data2-" + datanodeInfo0.getUuidString(), + 300L, 0, 300L, StorageTypeProto.SSD); + MetadataStorageReportProto metaStorage01 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo0.updateStorageReports( + new ArrayList<>(Arrays.asList(storage01, storage02))); Review Comment: ```suggestion asList(storage01, storage02)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestStorageUtils.java: ########## @@ -0,0 +1,266 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.UUID; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test for StorageUtils. + */ +public class TestStorageUtils { + + @Test + public void testNoFilters() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); Review Comment: ```suggestion asList(meta0)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestStorageUtils.java: ########## @@ -0,0 +1,266 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.UUID; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test for StorageUtils. + */ +public class TestStorageUtils { + + @Test + public void testNoFilters() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); Review Comment: ```suggestion updateStorageReports(asList(data0, data1)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementHDD.java: ########## @@ -0,0 +1,165 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.conf.StorageUnit; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.exceptions.SCMException; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeManager; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN; +import static org.mockito.Mockito.when; + +/** + * Test for the DISK-only volume container placement. + */ +public class TestSCMContainerPlacementHDD { + + @Test + public void chooseDatanodes() throws SCMException { + //given + OzoneConfiguration conf = new OzoneConfiguration(); + // We are using small units here + conf.setStorageSize(OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN, + 1, StorageUnit.BYTES); + + List<DatanodeInfo> datanodes = new ArrayList<>(); + + DatanodeInfo datanodeInfo0 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage01 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + StorageReportProto storage02 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data2-" + datanodeInfo0.getUuidString(), + 300L, 0, 300L, StorageTypeProto.SSD); + MetadataStorageReportProto metaStorage01 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo0.updateStorageReports( + new ArrayList<>(Arrays.asList(storage01, storage02))); + datanodeInfo0.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage01))); Review Comment: ```suggestion asList(metaStorage01)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementHDD.java: ########## @@ -0,0 +1,165 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.conf.StorageUnit; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.exceptions.SCMException; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeManager; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN; +import static org.mockito.Mockito.when; + +/** + * Test for the DISK-only volume container placement. + */ +public class TestSCMContainerPlacementHDD { + + @Test + public void chooseDatanodes() throws SCMException { + //given + OzoneConfiguration conf = new OzoneConfiguration(); + // We are using small units here + conf.setStorageSize(OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN, + 1, StorageUnit.BYTES); + + List<DatanodeInfo> datanodes = new ArrayList<>(); + + DatanodeInfo datanodeInfo0 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage01 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + StorageReportProto storage02 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data2-" + datanodeInfo0.getUuidString(), + 300L, 0, 300L, StorageTypeProto.SSD); + MetadataStorageReportProto metaStorage01 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo0.updateStorageReports( + new ArrayList<>(Arrays.asList(storage01, storage02))); + datanodeInfo0.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage01))); + datanodes.add(datanodeInfo0); + + DatanodeInfo datanodeInfo1 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage11 = HddsTestUtils.createStorageReport( + datanodeInfo1.getUuid(), "/data1-" + datanodeInfo1.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + StorageReportProto storage12 = HddsTestUtils.createStorageReport( + datanodeInfo1.getUuid(), "/data2-" + datanodeInfo1.getUuidString(), + 300L, 0, 300L, null); + MetadataStorageReportProto metaStorage11 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo1.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo1.updateStorageReports( + new ArrayList<>(Arrays.asList(storage11, storage12))); + datanodeInfo1.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage11))); Review Comment: ```suggestion asList(metaStorage11)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementHDD.java: ########## @@ -0,0 +1,165 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.conf.StorageUnit; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.exceptions.SCMException; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeManager; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN; +import static org.mockito.Mockito.when; + +/** + * Test for the DISK-only volume container placement. + */ +public class TestSCMContainerPlacementHDD { + + @Test + public void chooseDatanodes() throws SCMException { + //given + OzoneConfiguration conf = new OzoneConfiguration(); + // We are using small units here + conf.setStorageSize(OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN, + 1, StorageUnit.BYTES); + + List<DatanodeInfo> datanodes = new ArrayList<>(); + + DatanodeInfo datanodeInfo0 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage01 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + StorageReportProto storage02 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data2-" + datanodeInfo0.getUuidString(), + 300L, 0, 300L, StorageTypeProto.SSD); + MetadataStorageReportProto metaStorage01 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo0.updateStorageReports( + new ArrayList<>(Arrays.asList(storage01, storage02))); + datanodeInfo0.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage01))); + datanodes.add(datanodeInfo0); + + DatanodeInfo datanodeInfo1 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage11 = HddsTestUtils.createStorageReport( + datanodeInfo1.getUuid(), "/data1-" + datanodeInfo1.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + StorageReportProto storage12 = HddsTestUtils.createStorageReport( + datanodeInfo1.getUuid(), "/data2-" + datanodeInfo1.getUuidString(), + 300L, 0, 300L, null); + MetadataStorageReportProto metaStorage11 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo1.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo1.updateStorageReports( + new ArrayList<>(Arrays.asList(storage11, storage12))); + datanodeInfo1.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage11))); + datanodes.add(datanodeInfo1); + + DatanodeInfo datanodeInfo2 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage21 = HddsTestUtils.createStorageReport( + datanodeInfo2.getUuid(), "/data1-" + datanodeInfo2.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + StorageReportProto storage22 = HddsTestUtils.createStorageReport( + datanodeInfo2.getUuid(), "/data2-" + datanodeInfo2.getUuidString(), + 300L, 0, 300L, StorageTypeProto.SSD); + MetadataStorageReportProto metaStorage21 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo2.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo2.updateStorageReports( + new ArrayList<>(Arrays.asList(storage21, storage22))); + datanodeInfo2.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage21))); + datanodes.add(datanodeInfo2); + + DatanodeInfo datanodeInfo3 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage31 = HddsTestUtils.createStorageReport( + datanodeInfo3.getUuid(), "/data1-" + datanodeInfo3.getUuidString(), + 100L, 0, 100L, null); + StorageReportProto storage32 = HddsTestUtils.createStorageReport( + datanodeInfo3.getUuid(), "/data2-" + datanodeInfo3.getUuidString(), + 300L, 0, 300L, null); + MetadataStorageReportProto metaStorage31 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo3.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + datanodeInfo3.updateStorageReports( + new ArrayList<>(Arrays.asList(storage31, storage32))); Review Comment: ```suggestion asList(storage31, storage32)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementHDD.java: ########## @@ -0,0 +1,165 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.conf.StorageUnit; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.exceptions.SCMException; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeManager; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN; +import static org.mockito.Mockito.when; + +/** + * Test for the DISK-only volume container placement. + */ +public class TestSCMContainerPlacementHDD { + + @Test + public void chooseDatanodes() throws SCMException { + //given + OzoneConfiguration conf = new OzoneConfiguration(); + // We are using small units here + conf.setStorageSize(OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN, + 1, StorageUnit.BYTES); + + List<DatanodeInfo> datanodes = new ArrayList<>(); + + DatanodeInfo datanodeInfo0 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage01 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + StorageReportProto storage02 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data2-" + datanodeInfo0.getUuidString(), + 300L, 0, 300L, StorageTypeProto.SSD); + MetadataStorageReportProto metaStorage01 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo0.updateStorageReports( + new ArrayList<>(Arrays.asList(storage01, storage02))); + datanodeInfo0.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage01))); + datanodes.add(datanodeInfo0); + + DatanodeInfo datanodeInfo1 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage11 = HddsTestUtils.createStorageReport( + datanodeInfo1.getUuid(), "/data1-" + datanodeInfo1.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + StorageReportProto storage12 = HddsTestUtils.createStorageReport( + datanodeInfo1.getUuid(), "/data2-" + datanodeInfo1.getUuidString(), + 300L, 0, 300L, null); + MetadataStorageReportProto metaStorage11 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo1.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo1.updateStorageReports( + new ArrayList<>(Arrays.asList(storage11, storage12))); Review Comment: ```suggestion asList(storage11, storage12)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementHDD.java: ########## @@ -0,0 +1,165 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.conf.StorageUnit; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.exceptions.SCMException; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeManager; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN; +import static org.mockito.Mockito.when; + +/** + * Test for the DISK-only volume container placement. + */ +public class TestSCMContainerPlacementHDD { + + @Test + public void chooseDatanodes() throws SCMException { + //given + OzoneConfiguration conf = new OzoneConfiguration(); + // We are using small units here + conf.setStorageSize(OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN, + 1, StorageUnit.BYTES); + + List<DatanodeInfo> datanodes = new ArrayList<>(); + + DatanodeInfo datanodeInfo0 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage01 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + StorageReportProto storage02 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data2-" + datanodeInfo0.getUuidString(), + 300L, 0, 300L, StorageTypeProto.SSD); + MetadataStorageReportProto metaStorage01 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo0.updateStorageReports( + new ArrayList<>(Arrays.asList(storage01, storage02))); + datanodeInfo0.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage01))); + datanodes.add(datanodeInfo0); + + DatanodeInfo datanodeInfo1 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage11 = HddsTestUtils.createStorageReport( + datanodeInfo1.getUuid(), "/data1-" + datanodeInfo1.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + StorageReportProto storage12 = HddsTestUtils.createStorageReport( + datanodeInfo1.getUuid(), "/data2-" + datanodeInfo1.getUuidString(), + 300L, 0, 300L, null); + MetadataStorageReportProto metaStorage11 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo1.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo1.updateStorageReports( + new ArrayList<>(Arrays.asList(storage11, storage12))); + datanodeInfo1.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage11))); + datanodes.add(datanodeInfo1); + + DatanodeInfo datanodeInfo2 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage21 = HddsTestUtils.createStorageReport( + datanodeInfo2.getUuid(), "/data1-" + datanodeInfo2.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + StorageReportProto storage22 = HddsTestUtils.createStorageReport( + datanodeInfo2.getUuid(), "/data2-" + datanodeInfo2.getUuidString(), + 300L, 0, 300L, StorageTypeProto.SSD); + MetadataStorageReportProto metaStorage21 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo2.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo2.updateStorageReports( + new ArrayList<>(Arrays.asList(storage21, storage22))); Review Comment: ```suggestion asList(storage21, storage22)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementHDD.java: ########## @@ -0,0 +1,165 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.conf.StorageUnit; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.exceptions.SCMException; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeManager; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN; +import static org.mockito.Mockito.when; + +/** + * Test for the DISK-only volume container placement. + */ +public class TestSCMContainerPlacementHDD { + + @Test + public void chooseDatanodes() throws SCMException { + //given + OzoneConfiguration conf = new OzoneConfiguration(); + // We are using small units here + conf.setStorageSize(OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN, + 1, StorageUnit.BYTES); + + List<DatanodeInfo> datanodes = new ArrayList<>(); + + DatanodeInfo datanodeInfo0 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage01 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + StorageReportProto storage02 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data2-" + datanodeInfo0.getUuidString(), + 300L, 0, 300L, StorageTypeProto.SSD); + MetadataStorageReportProto metaStorage01 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo0.updateStorageReports( + new ArrayList<>(Arrays.asList(storage01, storage02))); + datanodeInfo0.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage01))); + datanodes.add(datanodeInfo0); + + DatanodeInfo datanodeInfo1 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage11 = HddsTestUtils.createStorageReport( + datanodeInfo1.getUuid(), "/data1-" + datanodeInfo1.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + StorageReportProto storage12 = HddsTestUtils.createStorageReport( + datanodeInfo1.getUuid(), "/data2-" + datanodeInfo1.getUuidString(), + 300L, 0, 300L, null); + MetadataStorageReportProto metaStorage11 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo1.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo1.updateStorageReports( + new ArrayList<>(Arrays.asList(storage11, storage12))); + datanodeInfo1.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage11))); + datanodes.add(datanodeInfo1); + + DatanodeInfo datanodeInfo2 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage21 = HddsTestUtils.createStorageReport( + datanodeInfo2.getUuid(), "/data1-" + datanodeInfo2.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + StorageReportProto storage22 = HddsTestUtils.createStorageReport( + datanodeInfo2.getUuid(), "/data2-" + datanodeInfo2.getUuidString(), + 300L, 0, 300L, StorageTypeProto.SSD); + MetadataStorageReportProto metaStorage21 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo2.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo2.updateStorageReports( + new ArrayList<>(Arrays.asList(storage21, storage22))); + datanodeInfo2.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage21))); + datanodes.add(datanodeInfo2); + + DatanodeInfo datanodeInfo3 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage31 = HddsTestUtils.createStorageReport( + datanodeInfo3.getUuid(), "/data1-" + datanodeInfo3.getUuidString(), + 100L, 0, 100L, null); + StorageReportProto storage32 = HddsTestUtils.createStorageReport( + datanodeInfo3.getUuid(), "/data2-" + datanodeInfo3.getUuidString(), + 300L, 0, 300L, null); + MetadataStorageReportProto metaStorage31 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo3.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + datanodeInfo3.updateStorageReports( + new ArrayList<>(Arrays.asList(storage31, storage32))); + datanodeInfo3.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage31))); Review Comment: ```suggestion asList(metaStorage31)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementHDD.java: ########## @@ -0,0 +1,165 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.conf.StorageUnit; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.exceptions.SCMException; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeManager; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN; +import static org.mockito.Mockito.when; + +/** + * Test for the DISK-only volume container placement. + */ +public class TestSCMContainerPlacementHDD { + + @Test + public void chooseDatanodes() throws SCMException { + //given + OzoneConfiguration conf = new OzoneConfiguration(); + // We are using small units here + conf.setStorageSize(OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN, + 1, StorageUnit.BYTES); + + List<DatanodeInfo> datanodes = new ArrayList<>(); + + DatanodeInfo datanodeInfo0 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage01 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + StorageReportProto storage02 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data2-" + datanodeInfo0.getUuidString(), + 300L, 0, 300L, StorageTypeProto.SSD); + MetadataStorageReportProto metaStorage01 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo0.updateStorageReports( + new ArrayList<>(Arrays.asList(storage01, storage02))); + datanodeInfo0.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage01))); + datanodes.add(datanodeInfo0); + + DatanodeInfo datanodeInfo1 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage11 = HddsTestUtils.createStorageReport( + datanodeInfo1.getUuid(), "/data1-" + datanodeInfo1.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + StorageReportProto storage12 = HddsTestUtils.createStorageReport( + datanodeInfo1.getUuid(), "/data2-" + datanodeInfo1.getUuidString(), + 300L, 0, 300L, null); + MetadataStorageReportProto metaStorage11 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo1.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo1.updateStorageReports( + new ArrayList<>(Arrays.asList(storage11, storage12))); + datanodeInfo1.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage11))); + datanodes.add(datanodeInfo1); + + DatanodeInfo datanodeInfo2 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage21 = HddsTestUtils.createStorageReport( + datanodeInfo2.getUuid(), "/data1-" + datanodeInfo2.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + StorageReportProto storage22 = HddsTestUtils.createStorageReport( + datanodeInfo2.getUuid(), "/data2-" + datanodeInfo2.getUuidString(), + 300L, 0, 300L, StorageTypeProto.SSD); + MetadataStorageReportProto metaStorage21 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo2.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo2.updateStorageReports( + new ArrayList<>(Arrays.asList(storage21, storage22))); + datanodeInfo2.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage21))); Review Comment: ```suggestion asList(metaStorage21)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestStorageUtils.java: ########## @@ -0,0 +1,266 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.UUID; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test for StorageUtils. + */ +public class TestStorageUtils { + + @Test + public void testNoFilters() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, metaRequired, dataRequired); + //no filters, able to pick suitable volumes + assertTrue(hasSpace); + } + + @Test + public void testFilterNoDataSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, data -> + data.getStorageType() == StorageTypeProto.DISK, + null, + metaRequired, dataRequired); + //no free DISK storage + assertFalse(hasSpace); + } + + @Test + public void testHasSuitableDiskVolume() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + StorageReportProto data2 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 7_000_000); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1, data2))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, data -> + data.getStorageType() == StorageTypeProto.DISK, + null, + metaRequired, dataRequired); + //found suitable volume after filtering + assertTrue(hasSpace); + } + + @Test + public void testFilterNoMetaSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, null, + meta -> + meta.getStorageType() == StorageTypeProto.DISK, + metaRequired, dataRequired); + //no free metadata DISK storage + assertFalse(hasSpace); + } + + @Test + public void testFilterHasMetaSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + MetadataStorageReportProto meta1 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.DISK); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0, meta1))); Review Comment: ```suggestion asList(meta0, meta1)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementHDD.java: ########## @@ -0,0 +1,165 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.conf.StorageUnit; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.exceptions.SCMException; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeManager; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN; +import static org.mockito.Mockito.when; + +/** + * Test for the DISK-only volume container placement. + */ +public class TestSCMContainerPlacementHDD { + + @Test + public void chooseDatanodes() throws SCMException { + //given + OzoneConfiguration conf = new OzoneConfiguration(); + // We are using small units here + conf.setStorageSize(OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN, + 1, StorageUnit.BYTES); + + List<DatanodeInfo> datanodes = new ArrayList<>(); + + DatanodeInfo datanodeInfo0 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage01 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + StorageReportProto storage02 = HddsTestUtils.createStorageReport( + datanodeInfo0.getUuid(), "/data2-" + datanodeInfo0.getUuidString(), + 300L, 0, 300L, StorageTypeProto.SSD); + MetadataStorageReportProto metaStorage01 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo0.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo0.updateStorageReports( + new ArrayList<>(Arrays.asList(storage01, storage02))); + datanodeInfo0.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage01))); + datanodes.add(datanodeInfo0); + + DatanodeInfo datanodeInfo1 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage11 = HddsTestUtils.createStorageReport( + datanodeInfo1.getUuid(), "/data1-" + datanodeInfo1.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + StorageReportProto storage12 = HddsTestUtils.createStorageReport( + datanodeInfo1.getUuid(), "/data2-" + datanodeInfo1.getUuidString(), + 300L, 0, 300L, null); + MetadataStorageReportProto metaStorage11 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo1.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo1.updateStorageReports( + new ArrayList<>(Arrays.asList(storage11, storage12))); + datanodeInfo1.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage11))); + datanodes.add(datanodeInfo1); + + DatanodeInfo datanodeInfo2 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage21 = HddsTestUtils.createStorageReport( + datanodeInfo2.getUuid(), "/data1-" + datanodeInfo2.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + StorageReportProto storage22 = HddsTestUtils.createStorageReport( + datanodeInfo2.getUuid(), "/data2-" + datanodeInfo2.getUuidString(), + 300L, 0, 300L, StorageTypeProto.SSD); + MetadataStorageReportProto metaStorage21 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo2.getUuidString(), + 100L, 0, 100L, null); + datanodeInfo2.updateStorageReports( + new ArrayList<>(Arrays.asList(storage21, storage22))); + datanodeInfo2.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage21))); + datanodes.add(datanodeInfo2); + + DatanodeInfo datanodeInfo3 = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto storage31 = HddsTestUtils.createStorageReport( + datanodeInfo3.getUuid(), "/data1-" + datanodeInfo3.getUuidString(), + 100L, 0, 100L, null); + StorageReportProto storage32 = HddsTestUtils.createStorageReport( + datanodeInfo3.getUuid(), "/data2-" + datanodeInfo3.getUuidString(), + 300L, 0, 300L, null); + MetadataStorageReportProto metaStorage31 = + HddsTestUtils.createMetadataStorageReport( + "/metadata1-" + datanodeInfo3.getUuidString(), + 100L, 0, 100L, StorageTypeProto.SSD); + datanodeInfo3.updateStorageReports( + new ArrayList<>(Arrays.asList(storage31, storage32))); + datanodeInfo3.updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(metaStorage31))); + datanodes.add(datanodeInfo3); + + NodeManager mockNodeManager = Mockito.mock(NodeManager.class); + when(mockNodeManager.getNodes(NodeStatus.inServiceHealthy())) + .thenReturn(new ArrayList<>(datanodes)); Review Comment: ```suggestion .thenReturn(asList(datanodes)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestStorageUtils.java: ########## @@ -0,0 +1,266 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.UUID; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test for StorageUtils. + */ +public class TestStorageUtils { + + @Test + public void testNoFilters() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, metaRequired, dataRequired); + //no filters, able to pick suitable volumes + assertTrue(hasSpace); + } + + @Test + public void testFilterNoDataSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, data -> + data.getStorageType() == StorageTypeProto.DISK, + null, + metaRequired, dataRequired); + //no free DISK storage + assertFalse(hasSpace); + } + + @Test + public void testHasSuitableDiskVolume() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + StorageReportProto data2 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 7_000_000); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1, data2))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, data -> + data.getStorageType() == StorageTypeProto.DISK, + null, + metaRequired, dataRequired); + //found suitable volume after filtering + assertTrue(hasSpace); + } + + @Test + public void testFilterNoMetaSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, null, + meta -> + meta.getStorageType() == StorageTypeProto.DISK, + metaRequired, dataRequired); + //no free metadata DISK storage + assertFalse(hasSpace); + } + + @Test + public void testFilterHasMetaSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); Review Comment: ```suggestion updateStorageReports(asList(data0, data1)); ``` ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestStorageUtils.java: ########## @@ -0,0 +1,266 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ +package org.apache.hadoop.hdds.scm.container.placement.algorithms; + +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.StorageTypeProto; +import org.apache.hadoop.hdds.scm.HddsTestUtils; +import org.apache.hadoop.hdds.scm.node.DatanodeInfo; +import org.apache.hadoop.hdds.scm.node.NodeStatus; +import org.apache.hadoop.ozone.container.upgrade.UpgradeUtils; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.UUID; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test for StorageUtils. + */ +public class TestStorageUtils { + + @Test + public void testNoFilters() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, metaRequired, dataRequired); + //no filters, able to pick suitable volumes + assertTrue(hasSpace); + } + + @Test + public void testFilterNoDataSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, data -> + data.getStorageType() == StorageTypeProto.DISK, + null, + metaRequired, dataRequired); + //no free DISK storage + assertFalse(hasSpace); + } + + @Test + public void testHasSuitableDiskVolume() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + StorageReportProto data2 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 7_000_000); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1, data2))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, data -> + data.getStorageType() == StorageTypeProto.DISK, + null, + metaRequired, dataRequired); + //found suitable volume after filtering + assertTrue(hasSpace); + } + + @Test + public void testFilterNoMetaSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, null, + meta -> + meta.getStorageType() == StorageTypeProto.DISK, + metaRequired, dataRequired); + //no free metadata DISK storage + assertFalse(hasSpace); + } + + @Test + public void testFilterHasMetaSpace() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1))); + + MetadataStorageReportProto meta0 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.SSD); + MetadataStorageReportProto meta1 = + HddsTestUtils.createMetadataStorageReport("/meta-" + UUID.randomUUID(), + 2_000_000, 0, 2_000_000, StorageTypeProto.DISK); + datanodeInfo. + updateMetaDataStorageReports( + new ArrayList<>(Arrays.asList(meta0, meta1))); + + long dataRequired = 5_000_000; + long metaRequired = 1_000_000; + + boolean hasSpace = + StorageUtils.hasEnoughSpace(datanodeInfo, null, + meta -> + meta.getStorageType() == StorageTypeProto.DISK, + metaRequired, dataRequired); + //found suitable metadata DISK space + assertTrue(hasSpace); + } + + @Test + public void testHasSuitableDiskAndMetaVolume() { + DatanodeInfo datanodeInfo = new DatanodeInfo( + MockDatanodeDetails.randomDatanodeDetails(), + NodeStatus.inServiceHealthy(), + UpgradeUtils.defaultLayoutVersionProto()); + + StorageReportProto data0 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 2_000_000); + StorageReportProto data1 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 6_000_000, 0, 6_000_000, + StorageTypeProto.SSD); + StorageReportProto data2 = + HddsTestUtils.createStorageReport(UUID.randomUUID(), + "/" + UUID.randomUUID(), 7_000_000); + datanodeInfo. + updateStorageReports(new ArrayList<>(asList(data0, data1, data2))); Review Comment: ```suggestion updateStorageReports(asList(data0, data1, data2)); ``` ########## hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/SsdVolumeChoosingPolicy.java: ########## @@ -0,0 +1,31 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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. + */ + +package org.apache.hadoop.ozone.container.common.volume; + +import org.apache.hadoop.fs.StorageType; + +/** + * Chose only SSD volumes with {@link RoundRobinVolumeChoosingPolicy} policy. + */ +public class SsdVolumeChoosingPolicy extends FilteredVolumeChoosingPolicy { + + public SsdVolumeChoosingPolicy() { + super(new RoundRobinVolumeChoosingPolicy(), + volume -> volume.getStorageType() == StorageType.SSD); + } +} Review Comment: Is a new line required after the class definition? -- 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]
