devmadhuu commented on PR #10983: URL: https://github.com/apache/ozone/pull/10983#issuecomment-5290437806
> Could you help to highlight any conflicts that need reviewing? It is almost impossible for me to take a look at 100k+ LOC changes. If there are no notable conflicts, then we can proceed in merging master to [HDDS-11233](https://issues.apache.org/jira/browse/HDDS-11233). Thanks @ivandika3 for helping in review. I think mostly below areas is something you can focus: 1. `SCMCommonPlacementPolicy#hasEnoughSpace` — master moved to a slot-based availability check; the feature uses a StorageType + byte-based check. Signatures now using storageType + nodeManager. 2. Pipeline providers (`RatisPipelineProvider, SimplePipelineProvider, ECPipelineProvider, PipelineProvider, PipelineStateMap, PipelineStateManager(Impl), PipelineManager(Impl), WritableECContainerProvider`) — kept master's newPipelineBuilder pattern and added setSupportedStorageTier(...) + a storage-tier filter in getPipelines. 3. `BlockManagerImpl#allocateBlock` — master used getDefaultTier; feature adds storagePolicy + creation/fallback-tier logic. Kept the fallback logic on top of master's flow. 4. `ContainerProtocolCalls#writeChunkAsync / BlockOutputStream` — both sides added a new trailing arg (master: containerAutoCreate, feature: storageType). Merged into one overload chain carrying both. 5. Container state/manager layer (ContainerManager(Impl), ContainerStateManager(Impl), ContainerStateManagerInvoker, ContainerInfo) — feature's getMatchingContainerAndStorageTier rename + setStorageTier(...) 6. `NodeUtils `— updated to master's getNode(DatanodeID) after the DatanodeID/DatanodeDetails split. 7. Proto (`OmClientProtocol.proto, hdds.proto, DatanodeClientProtocol.proto, ScmAdminProtocol.proto, ScmServerDatanodeHeartbeatProtocol.proto`) — feature's storage-tier/policy fields (e.g. `OmBucketInfo/OmBucketArgs storagePolicy/allowFallbackStoragePolicy`) . All additive, no renumbering of existing fields. 8. EC/Ratis under-replication handlers (`ECUnderReplicationHandler, RatisUnderReplicationHandler`) > > Could you help to highlight any conflicts that need reviewing? It is almost impossible for me to take a look at 100k+ LOC changes. If there are no notable conflicts, then we can proceed in merging master to [HDDS-11233](https://issues.apache.org/jira/browse/HDDS-11233). > > Thanks @ivandika3 for helping in review. I think mostly below areas is something you can focus: > > 1. `SCMCommonPlacementPolicy#hasEnoughSpace` — master moved to a slot-based availability check; the feature uses a StorageType + byte-based check. Signatures now using storageType + nodeManager. > > 2. Pipeline providers (`RatisPipelineProvider, SimplePipelineProvider, ECPipelineProvider, PipelineProvider, PipelineStateMap, PipelineStateManager(Impl), PipelineManager(Impl), WritableECContainerProvider`) — kept master's newPipelineBuilder pattern and added setSupportedStorageTier(...) + a storage-tier filter in getPipelines. > > 3. `BlockManagerImpl#allocateBlock` — master used getDefaultTier; feature adds storagePolicy + creation/fallback-tier logic. Kept the fallback logic on top of master's flow. > > 4. `ContainerProtocolCalls#writeChunkAsync / BlockOutputStream` — both sides added a new trailing arg (master: containerAutoCreate, feature: storageType). Merged into one overload chain carrying both. > > 5. Container state/manager layer (ContainerManager(Impl), ContainerStateManager(Impl), ContainerStateManagerInvoker, ContainerInfo) — feature's getMatchingContainerAndStorageTier rename + setStorageTier(...) > > 6. `NodeUtils `— updated to master's getNode(DatanodeID) after the DatanodeID/DatanodeDetails split. > > 7. Proto (`OmClientProtocol.proto, hdds.proto, DatanodeClientProtocol.proto, ScmAdminProtocol.proto, ScmServerDatanodeHeartbeatProtocol.proto`) — feature's storage-tier/policy fields (e.g. `OmBucketInfo/OmBucketArgs storagePolicy/allowFallbackStoragePolicy`) . All additive, no renumbering of existing fields. > > 8. EC/Ratis under-replication handlers (`ECUnderReplicationHandler, RatisUnderReplicationHandler`) @ivandika3 did you get chance ? I am working on green CI. -- 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]
