This is an automated email from the ASF dual-hosted git repository. devmadhuu pushed a commit to branch HDDS-11233 in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 2921d6eb16fd624a40e1c444933eacc42fc5b189 Author: Devesh Singh <[email protected]> AuthorDate: Mon Aug 10 12:39:57 2026 +0530 HDDS-11233. Fix compilation after rebase onto master. Adapt call sites that were auto-merged from master to the StorageType/ StorageTier-aware signatures introduced by this feature branch: allocateContainer, createPipeline, chooseVolume, getMatchingContainer(AndStorageTier), Container.create and getWriteChunkRequest now take the required tier argument. Also align NodeUtils (NodeManager.getNode) and RatisPipelineProvider (StorageTier.getUniformStorageType) with the current APIs, and renumber the ContainerStateManagerInvoker case variables to avoid a duplicate local. --- .../container/common/impl/TestHddsDispatcher.java | 12 +++++------ .../volume/TestCapacityVolumeChoosingPolicy.java | 2 +- ...tDiskBalancerWithConcurrentBackgroundTasks.java | 5 +++-- .../container/keyvalue/TestKeyValueContainer.java | 4 ++-- .../ha/invoker/ContainerStateManagerInvoker.java | 12 +++++------ .../org/apache/hadoop/hdds/scm/node/NodeUtils.java | 2 +- .../hdds/scm/pipeline/RatisPipelineProvider.java | 2 +- .../TestSCMContainerPlacementRackScatter.java | 2 +- .../hdds/scm/pipeline/TestECPipelineProvider.java | 2 +- .../scm/pipeline/TestRatisPipelineProvider.java | 5 +---- .../scm/pipeline/TestSimplePipelineProvider.java | 2 +- .../TestReconContainerHealthSummaryEndToEnd.java | 23 +++++++++++----------- .../TestPendingContainerTrackerIntegration.java | 3 ++- .../hdds/scm/safemode/TestSafeModeSCMHA.java | 3 ++- .../apache/hadoop/ozone/MiniOzoneClusterImpl.java | 3 ++- 15 files changed, 42 insertions(+), 40 deletions(-) diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java index 3019b07b242..beadbe0e362 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java @@ -703,7 +703,7 @@ public void testMalformedPutBlockDoesNotMarkContainerUnhealthy() throws IOExcept HddsDispatcher hddsDispatcher = createDispatcher(dd, scmId, conf); ContainerCommandRequestProto writeChunkRequest = - getWriteChunkRequest(dd.getUuidString(), 1L, 1L); + getWriteChunkRequest(dd.getUuidString(), 1L, 1L, null); ContainerCommandResponseProto writeChunkResponse = hddsDispatcher.dispatch(writeChunkRequest, null); assertEquals(ContainerProtos.Result.SUCCESS, writeChunkResponse.getResult()); @@ -1205,7 +1205,7 @@ public void testWriteChunkEnforcesSoftHardMinFreeSpace( Container container = new KeyValueContainer(containerData, conf); StorageVolumeUtil.getHddsVolumesList(volumeSet.getVolumesList()) .forEach(v -> v.setDbParentDir(tempDir.toFile())); - container.create(volumeSet, new RoundRobinVolumeChoosingPolicy(), scmId.toString()); + container.create(volumeSet, new RoundRobinVolumeChoosingPolicy(), scmId.toString(), StorageType.DISK); ContainerSet containerSet = newContainerSet(); containerSet.addContainer(container); StateContext context = ContainerTestUtils.getMockContext(dd, conf); @@ -1224,7 +1224,7 @@ public void testWriteChunkEnforcesSoftHardMinFreeSpace( // available(100) - hardSpare(30) = 70 > writeSize(~36): passes // available(100) - softSpare(50) = 50 > writeSize(~36): not in soft band ContainerCommandResponseProto response = - hddsDispatcher.dispatch(getWriteChunkRequest(dd.getUuidString(), 1L, 1L), null); + hddsDispatcher.dispatch(getWriteChunkRequest(dd.getUuidString(), 1L, 1L, null), null); assertEquals(ContainerProtos.Result.SUCCESS, response.getResult()); assertEquals(0, hddsVolume.getVolumeInfoStats().getNumWriteRequestsInSoftBandMinFreeSpace()); @@ -1235,7 +1235,7 @@ public void testWriteChunkEnforcesSoftHardMinFreeSpace( // available(75) - softSpare(50) = 25 < writeSize(~36): soft-band metric fires // Use incrementUsedSpace so the CachingSpaceUsageSource internal cache is updated; hddsVolume.incrementUsedSpace(25); // 400 → 425 - response = hddsDispatcher.dispatch(getWriteChunkRequest(dd.getUuidString(), 1L, 2L), null); + response = hddsDispatcher.dispatch(getWriteChunkRequest(dd.getUuidString(), 1L, 2L, null), null); assertEquals(ContainerProtos.Result.SUCCESS, response.getResult()); assertEquals(1, hddsVolume.getVolumeInfoStats().getNumWriteRequestsInSoftBandMinFreeSpace()); @@ -1244,7 +1244,7 @@ public void testWriteChunkEnforcesSoftHardMinFreeSpace( // --- Scenario 3: below hard limit (usedSpace → 465, available=35) --- // available(35) - hardSpare(30) = 5 < writeSize(~36): DISK_OUT_OF_SPACE hddsVolume.incrementUsedSpace(40); // 425 → 465 - response = hddsDispatcher.dispatch(getWriteChunkRequest(dd.getUuidString(), 1L, 3L), null); + response = hddsDispatcher.dispatch(getWriteChunkRequest(dd.getUuidString(), 1L, 3L, null), null); assertEquals(ContainerProtos.Result.DISK_OUT_OF_SPACE, response.getResult()); assertEquals(1, hddsVolume.getVolumeInfoStats().getNumWriteRequestsInSoftBandMinFreeSpace()); @@ -1269,7 +1269,7 @@ public void testEcReconstructionWriteChunkDeniedWhenContainerCreatableFalse() long containerId = 99L; ContainerCommandResponseProto response = dispatcher.dispatch( - withCreatableFalse(getWriteChunkRequest(dd.getUuidString(), containerId, 1L)), null); + withCreatableFalse(getWriteChunkRequest(dd.getUuidString(), containerId, 1L, null)), null); assertEquals(ContainerProtos.Result.CONTAINER_NOT_FOUND, response.getResult()); assertNull(dispatcher.getContainer(containerId)); } diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestCapacityVolumeChoosingPolicy.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestCapacityVolumeChoosingPolicy.java index 1530727867c..256dfb86b4a 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestCapacityVolumeChoosingPolicy.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestCapacityVolumeChoosingPolicy.java @@ -149,7 +149,7 @@ public void testChoosesLowerUtilizationAcrossDifferentCapacities() throws Except try { for (int i = 0; i < 1000; i++) { - HddsVolume volume = policy.chooseVolume(mixedVolumes, 0); + HddsVolume volume = policy.chooseVolume(mixedVolumes, 0, null); chooseCount.put(volume, chooseCount.get(volume) + 1); } assertThat(chooseCount.get(smallVolume)) diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDiskBalancerWithConcurrentBackgroundTasks.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDiskBalancerWithConcurrentBackgroundTasks.java index 316f7e5ca86..2090dfa8267 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDiskBalancerWithConcurrentBackgroundTasks.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/diskbalancer/TestDiskBalancerWithConcurrentBackgroundTasks.java @@ -43,6 +43,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.apache.commons.io.FileUtils; +import org.apache.hadoop.fs.StorageType; import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.fs.MockSpaceUsageCheckFactory; @@ -595,8 +596,8 @@ private KeyValueContainer createClosedContainer(long containerId, HddsVolume vol KeyValueContainer container = new KeyValueContainer(containerData, conf); VolumeChoosingPolicy policy = mock(VolumeChoosingPolicy.class); - when(policy.chooseVolume(any(List.class), anyLong())).thenReturn(vol); - container.create((VolumeSet) volumeSet, policy, scmId); + when(policy.chooseVolume(any(List.class), anyLong(), any(StorageType.class))).thenReturn(vol); + container.create((VolumeSet) volumeSet, policy, scmId, StorageType.DISK); containerSet.addContainer(container); vol.incrementUsedSpace(containerData.getBytesUsed()); return container; diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java index 8fffd1b3ebe..b31cd001f8c 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java @@ -531,7 +531,7 @@ public void testFailedImportCleanupMovesContainerBeforeDelete( init(versionInfo); HddsVolume containerVolume = volumeChoosingPolicy.chooseVolume( - StorageVolumeUtil.getHddsVolumesList(volumeSet.getVolumesList()), 1); + StorageVolumeUtil.getHddsVolumesList(volumeSet.getVolumesList()), 1, StorageType.DISK); KeyValueContainer container = new KeyValueContainer( keyValueContainerData, CONF) { @@ -798,7 +798,7 @@ public void testReportOfUnhealthyContainer( @ContainerTestVersionInfo.ContainerTest public void testMarkUnhealthyWithMissingMetadataDir(ContainerTestVersionInfo versionInfo) throws Exception { init(versionInfo); - keyValueContainer.create(volumeSet, volumeChoosingPolicy, scmId); + keyValueContainer.create(volumeSet, volumeChoosingPolicy, scmId, StorageType.DISK); // Simulate MISSING_METADATA_DIR using the same corruption helper used in scanner tests. File metadataDir = new File(keyValueContainerData.getMetadataPath()); diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/invoker/ContainerStateManagerInvoker.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/invoker/ContainerStateManagerInvoker.java index 4e719fd5b90..e04a7c077cf 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/invoker/ContainerStateManagerInvoker.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/invoker/ContainerStateManagerInvoker.java @@ -266,13 +266,13 @@ public Message invokeLocal(String methodName, Object[] p) throws Exception { break; case "getMatchingContainerAndStorageTier": - final long arg15 = p.length > 0 ? (long) p[0] : 0L; - final String arg16 = p.length > 1 ? (String) p[1] : null; - final PipelineID arg17 = p.length > 2 ? (PipelineID) p[2] : null; - final NavigableSet arg18 = p.length > 3 ? (NavigableSet) p[3] : null; - final StorageTier arg19 = p.length > 4 ? (StorageTier) p[4] : null; + final long arg30 = p.length > 0 ? (long) p[0] : 0L; + final String arg31 = p.length > 1 ? (String) p[1] : null; + final PipelineID arg32 = p.length > 2 ? (PipelineID) p[2] : null; + final NavigableSet arg33 = p.length > 3 ? (NavigableSet) p[3] : null; + final StorageTier arg34 = p.length > 4 ? (StorageTier) p[4] : null; returnType = ContainerInfo.class; - returnValue = getImpl().getMatchingContainerAndStorageTier(arg15, arg16, arg17, arg18, arg19); + returnValue = getImpl().getMatchingContainerAndStorageTier(arg30, arg31, arg32, arg33, arg34); break; case "reinitialize": diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeUtils.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeUtils.java index f42a6e0f5a7..9348251e481 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeUtils.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeUtils.java @@ -42,7 +42,7 @@ public static List<StorageTier> getDatanodesStorageTypes( List<DatanodeDetails> dns, NodeManager nodeManager) { List<Set<StorageType>> dnStorageTypes = new ArrayList<>(); for (DatanodeDetails dn : dns) { - DatanodeInfo datanodeInfo = nodeManager.getDatanodeInfo(dn); + DatanodeInfo datanodeInfo = nodeManager.getNode(dn.getID()); if (datanodeInfo == null) { throw new IllegalStateException("Cannot get Datanode : " + dn.getUuidString() + " Info"); } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java index 8e713cab86b..08005575dfc 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java @@ -180,7 +180,7 @@ public synchronized Pipeline create(RatisReplicationConfig replicationConfig, break; case THREE: StorageTierUtil.validateNotEmpty(storageTier); - StorageType storageType = StorageTierUtil.getStorageTypeForUniformStorageTier(storageTier, replicationConfig); + StorageType storageType = storageTier.getUniformStorageType(); dns = chooseThreeFactorDatanodes(excludedNodes, favoredNodes, factor.getNumber(), storageType); break; diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackScatter.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackScatter.java index ab0daadfee2..35783e55b74 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackScatter.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackScatter.java @@ -960,7 +960,7 @@ public void chooseNodeWithinRackPrefersLessUtilizedWhenEnabled() throws SCMExcep .thenReturn(new SCMNodeMetric(100L, 90L, 10L, 0L, 0L, 0L)); List<DatanodeDetails> chosen = policy.chooseDatanodes( - new ArrayList<>(), new ArrayList<>(), null, 1, 0, 0); + new ArrayList<>(), new ArrayList<>(), null, 1, 0, 0, null); assertEquals(Collections.singletonList(datanodes.get(0)), chosen); } diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestECPipelineProvider.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestECPipelineProvider.java index 0657282ca74..773bf5ee022 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestECPipelineProvider.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestECPipelineProvider.java @@ -98,7 +98,7 @@ public void setup() throws IOException, NodeNotFoundException { when(nodeManager.getNodeStatus(any())) .thenReturn(NodeStatus.inServiceHealthy()); - when(nodeManager.getDatanodeInfo(any())) + when(nodeManager.getNode(any())) .thenAnswer(invocation -> createDatanodeInfo(invocation.getArgument(0))); } diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java index 9ecaa8d5730..eeee021ac44 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java @@ -52,7 +52,6 @@ import org.apache.hadoop.hdds.client.RatisReplicationConfig; import org.apache.hadoop.hdds.client.ReplicationConfig; import org.apache.hadoop.hdds.client.StorageTier; -import org.apache.hadoop.hdds.client.StorageTierUtil; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.conf.StorageUnit; import org.apache.hadoop.hdds.protocol.DatanodeDetails; @@ -119,9 +118,7 @@ public void init(int maxPipelinePerNode, OzoneConfiguration conf, StorageTier st public void initWithNodes(int maxPipelinePerNode, OzoneConfiguration conf, List<DatanodeDetails> nodes, int count) throws Exception { conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath()); - StorageType storageType = StorageTierUtil.getStorageTypeForUniformStorageTier( - StorageTier.getDefaultTier(), - RatisReplicationConfig.getInstance(ReplicationFactor.ONE)); + StorageType storageType = StorageTier.getDefaultTier().getUniformStorageType(); nodeManager = new MockNodeManager(new NetworkTopologyImpl(new OzoneConfiguration()), nodes, false, count, storageType); initializeCommonState(maxPipelinePerNode, conf); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSimplePipelineProvider.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSimplePipelineProvider.java index 3326c09d5cd..7356f482204 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSimplePipelineProvider.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSimplePipelineProvider.java @@ -190,7 +190,7 @@ public void testCreatedPipelineOnlySupportsRequestedStorageTier() } when(nodeManager.getNodes(NodeStatus.inServiceHealthy())) .thenReturn(nodes); - when(nodeManager.getDatanodeInfo(any())) + when(nodeManager.getNode(any())) .thenAnswer(invocation -> invocation.getArgument(0)); when(pipelineStateManager.getPipelines( any(ReplicationConfig.class))) diff --git a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconContainerHealthSummaryEndToEnd.java b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconContainerHealthSummaryEndToEnd.java index af60f46a60b..4d977e42586 100644 --- a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconContainerHealthSummaryEndToEnd.java +++ b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconContainerHealthSummaryEndToEnd.java @@ -34,6 +34,7 @@ import java.util.Set; import java.util.stream.Collectors; import org.apache.hadoop.hdds.client.RatisReplicationConfig; +import org.apache.hadoop.hdds.client.StorageTier; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.hdds.protocol.DatanodeID; @@ -249,7 +250,7 @@ public void testContainerStateSummaryMatchesBetweenSCMAndRecon() List<ContainerID> openIds = new ArrayList<>(); for (int i = 0; i < 3; i++) { openIds.add(scmCm.allocateContainer( - RatisReplicationConfig.getInstance(ONE), "test").containerID()); + RatisReplicationConfig.getInstance(ONE), "test", StorageTier.getDefaultTier()).containerID()); } // Allocate CLOSING, QUASI_CLOSED, and CLOSED candidates as OPEN in SCM. @@ -259,15 +260,15 @@ public void testContainerStateSummaryMatchesBetweenSCMAndRecon() for (int i = 0; i < 3; i++) { closingIds.add(scmCm.allocateContainer( - RatisReplicationConfig.getInstance(ONE), "test").containerID()); + RatisReplicationConfig.getInstance(ONE), "test", StorageTier.getDefaultTier()).containerID()); } for (int i = 0; i < 3; i++) { quasiClosedIds.add(scmCm.allocateContainer( - RatisReplicationConfig.getInstance(ONE), "test").containerID()); + RatisReplicationConfig.getInstance(ONE), "test", StorageTier.getDefaultTier()).containerID()); } for (int i = 0; i < 3; i++) { closedIds.add(scmCm.allocateContainer( - RatisReplicationConfig.getInstance(ONE), "test").containerID()); + RatisReplicationConfig.getInstance(ONE), "test", StorageTier.getDefaultTier()).containerID()); } // Sync Recon: Pass 2 adds all OPEN containers (all 12 allocated above) to Recon. @@ -436,9 +437,9 @@ private void setupStateSummaryScenario( List<ContainerID> quasiClosedStateCandidates = new ArrayList<>(); for (int i = 0; i < 2; i++) { closingStateCandidates.add(scmCm.allocateContainer( - RatisReplicationConfig.getInstance(ONE), "test").containerID()); + RatisReplicationConfig.getInstance(ONE), "test", StorageTier.getDefaultTier()).containerID()); quasiClosedStateCandidates.add(scmCm.allocateContainer( - RatisReplicationConfig.getInstance(ONE), "test").containerID()); + RatisReplicationConfig.getInstance(ONE), "test", StorageTier.getDefaultTier()).containerID()); } syncAndWaitForReconContainers(reconScm, reconCm, combineContainerIds(closingStateCandidates, quasiClosedStateCandidates)); @@ -507,7 +508,7 @@ private List<Long> setupUnderReplicatedContainers( for (int i = 0; i < count; i++) { ContainerInfo c = scmCm.allocateContainer( RatisReplicationConfig.getInstance(HddsProtos.ReplicationFactor.THREE), - "test"); + "test", StorageTier.getDefaultTier()); createContainerOnPipeline(c); long cid = c.getContainerID(); ContainerID containerID = ContainerID.valueOf(cid); @@ -583,7 +584,7 @@ private List<Long> setupOverReplicatedContainers( List<Long> ids = new ArrayList<>(); for (int i = 0; i < count; i++) { ContainerInfo c = scmCm.allocateContainer( - RatisReplicationConfig.getInstance(ONE), "test"); + RatisReplicationConfig.getInstance(ONE), "test", StorageTier.getDefaultTier()); createContainerOnPipeline(c); long cid = c.getContainerID(); ContainerID containerID = ContainerID.valueOf(cid); @@ -677,7 +678,7 @@ private List<Long> setupMissingContainers( List<Long> ids = new ArrayList<>(); for (int i = 0; i < count; i++) { ContainerInfo c = scmCm.allocateContainer( - RatisReplicationConfig.getInstance(ONE), "test"); + RatisReplicationConfig.getInstance(ONE), "test", StorageTier.getDefaultTier()); createContainerOnPipeline(c); long cid = c.getContainerID(); ContainerID containerID = ContainerID.valueOf(cid); @@ -756,7 +757,7 @@ private List<Long> setupEmptyMissingContainers( List<Long> ids = new ArrayList<>(); for (int i = 0; i < count; i++) { ContainerInfo c = scmCm.allocateContainer( - RatisReplicationConfig.getInstance(ONE), "test"); + RatisReplicationConfig.getInstance(ONE), "test", StorageTier.getDefaultTier()); ids.add(c.getContainerID()); } @@ -810,7 +811,7 @@ private List<Long> setupEmptyOnlyContainers( List<Long> ids = new ArrayList<>(); for (int i = 0; i < count; i++) { ContainerInfo c = scmCm.allocateContainer( - RatisReplicationConfig.getInstance(ONE), "test"); + RatisReplicationConfig.getInstance(ONE), "test", StorageTier.getDefaultTier()); long cid = c.getContainerID(); ContainerID containerID = ContainerID.valueOf(cid); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestPendingContainerTrackerIntegration.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestPendingContainerTrackerIntegration.java index 657e5d0cd4b..382513755bf 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestPendingContainerTrackerIntegration.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestPendingContainerTrackerIntegration.java @@ -24,6 +24,7 @@ import java.util.function.BooleanSupplier; import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.client.RatisReplicationConfig; +import org.apache.hadoop.hdds.client.StorageTier; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor; import org.apache.hadoop.hdds.scm.node.PendingContainerTracker; @@ -114,7 +115,7 @@ public void testKeyWriteRecordsPendingAndICRRemovesIt() throws Exception { // Allocate a container directly containerManager.allocateContainer( RatisReplicationConfig.getInstance(ReplicationFactor.THREE), - "omServiceIdDefault"); + "omServiceIdDefault", StorageTier.getDefaultTier()); // Verify the added metric increased, meaning pending was recorded GenericTestUtils.waitFor( diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSafeModeSCMHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSafeModeSCMHA.java index 84da96ed422..ba6275b6ec1 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSafeModeSCMHA.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSafeModeSCMHA.java @@ -23,6 +23,7 @@ import java.io.IOException; import org.apache.hadoop.hdds.client.RatisReplicationConfig; +import org.apache.hadoop.hdds.client.StorageTier; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.scm.ha.SCMStateMachine; import org.apache.hadoop.hdds.scm.server.StorageContainerManager; @@ -102,7 +103,7 @@ public void testFollowerRestartExitSafeMode() throws Exception { GenericTestUtils.waitFor(() -> { try { currentLeader.getContainerManager().allocateContainer( - RatisReplicationConfig.getInstance(THREE), "safemode-test"); + RatisReplicationConfig.getInstance(THREE), "safemode-test", StorageTier.getDefaultTier()); } catch (Exception e) { // Ignore transient errors while the follower is catching up. } diff --git a/hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java b/hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java index e13719dde6e..95d75af5467 100644 --- a/hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java +++ b/hadoop-ozone/mini-cluster/src/main/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java @@ -44,6 +44,7 @@ import org.apache.hadoop.hdds.HddsUtils; import org.apache.hadoop.hdds.annotation.InterfaceAudience; import org.apache.hadoop.hdds.client.RatisReplicationConfig; +import org.apache.hadoop.hdds.client.StorageTier; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.hdds.protocol.DatanodeID; @@ -596,7 +597,7 @@ private void resetPipelinesForRackAwareness(MiniOzoneClusterImpl cluster) pm.deletePipeline(p.getId()); } - pm.createPipeline(threeWay); + pm.createPipeline(threeWay, StorageTier.getDefaultTier()); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
