peterxcli commented on code in PR #8716:
URL: https://github.com/apache/ozone/pull/8716#discussion_r2173564041
##########
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestDataNodeSafeModeRule.java:
##########
@@ -67,20 +60,15 @@ private void setup(int requiredDns) throws Exception {
ozoneConfiguration.setInt(
HddsConfigKeys.HDDS_SCM_SAFEMODE_MIN_DATANODE, requiredDns);
- List<ContainerInfo> containers =
- new ArrayList<>(HddsTestUtils.getContainerInfo(1));
nodeManager = mock(NodeManager.class);
- ContainerManager containerManager = mock(ContainerManager.class);
- when(containerManager.getContainers()).thenReturn(containers);
eventQueue = new EventQueue();
- serviceManager = new SCMServiceManager();
- scmContext = SCMContext.emptyContext();
- SCMSafeModeManager scmSafeModeManager = new
SCMSafeModeManager(ozoneConfiguration,
- nodeManager, null, containerManager, serviceManager, eventQueue,
scmContext);
- scmSafeModeManager.start();
+ // Mock SCMSafeModeManager for DataNodeSafeModeRule dependencies
+ SCMSafeModeManager mockSafeModeManager = mock(SCMSafeModeManager.class);
+ when(mockSafeModeManager.getInSafeMode()).thenReturn(true);
Review Comment:
We don't need to assume safeModeManager is in safe mode.
##########
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestDataNodeSafeModeRule.java:
##########
@@ -67,20 +60,15 @@ private void setup(int requiredDns) throws Exception {
ozoneConfiguration.setInt(
HddsConfigKeys.HDDS_SCM_SAFEMODE_MIN_DATANODE, requiredDns);
- List<ContainerInfo> containers =
- new ArrayList<>(HddsTestUtils.getContainerInfo(1));
nodeManager = mock(NodeManager.class);
- ContainerManager containerManager = mock(ContainerManager.class);
- when(containerManager.getContainers()).thenReturn(containers);
eventQueue = new EventQueue();
- serviceManager = new SCMServiceManager();
- scmContext = SCMContext.emptyContext();
- SCMSafeModeManager scmSafeModeManager = new
SCMSafeModeManager(ozoneConfiguration,
- nodeManager, null, containerManager, serviceManager, eventQueue,
scmContext);
- scmSafeModeManager.start();
+ // Mock SCMSafeModeManager for DataNodeSafeModeRule dependencies
+ SCMSafeModeManager mockSafeModeManager = mock(SCMSafeModeManager.class);
+ when(mockSafeModeManager.getInSafeMode()).thenReturn(true);
- rule =
SafeModeRuleFactory.getInstance().getSafeModeRule(DataNodeSafeModeRule.class);
+ // Create DataNodeSafeModeRule directly without using SafeModeRuleFactory
Review Comment:
this comment could be removed.
```suggestion
```
--
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]
