Skip to content

HDDS-14670. SCM queryFinalizeStatus shouldFinalize should only be true when out of safemode #10193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sodonnel wants to merge 1 commit into
base: HDDS-14496-zdu
Choose a base branch
from
+26 −2
Open

HDDS-14670. SCM queryFinalizeStatus shouldFinalize should only be true when out of safemode #10193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...s/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,7 +1213,7 @@ public HddsProtos.UpgradeStatus queryUpgradeStatus() throws IOException {
scm.getScmNodeManager().getDatanodeFinalizationCounts();
int finalizedDatanodes = datanodeFinalizationCounts.getNumFinalizedDatanodes();
int healthyDatanodes = datanodeFinalizationCounts.getTotalHealthyDatanodes();
boolean shouldFinalize = scmFinalized && datanodeFinalizationCounts.allNodesFinalized();
boolean shouldFinalize = scmFinalized && datanodeFinalizationCounts.allNodesFinalized() && !scm.isInSafeMode();

HddsProtos.UpgradeStatus result = HddsProtos.UpgradeStatus.newBuilder()
.setScmFinalized(scmFinalized)
Expand Down
26 changes: 25 additions & 1 deletion ...rver-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState.CLOSED;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_READONLY_ADMINISTRATORS;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
Expand All @@ -46,6 +47,7 @@
import org.apache.hadoop.hdds.scm.ha.SCMNodeDetails;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
import org.apache.hadoop.hdds.scm.protocol.StorageContainerLocationProtocolServerSideTranslatorPB;
import org.apache.hadoop.hdds.scm.safemode.SCMSafeModeManager;
import org.apache.hadoop.hdds.utils.ProtocolMessageMetrics;
import org.apache.hadoop.ozone.container.common.SCMTestUtils;
import org.apache.hadoop.security.AccessControlException;
Expand All @@ -63,17 +65,22 @@ public class TestSCMClientProtocolServer {
private SCMClientProtocolServer server;
private StorageContainerManager scm;
private StorageContainerLocationProtocolServerSideTranslatorPB service;
private SCMSafeModeManager mockSafeModeManager;

@BeforeEach
void setUp(@TempDir File testDir) throws Exception {
OzoneConfiguration config = SCMTestUtils.getConf(testDir);

mockSafeModeManager = mock(SCMSafeModeManager.class);
when(mockSafeModeManager.getInSafeMode()).thenReturn(false);

SCMConfigurator configurator = new SCMConfigurator();
configurator.setSCMHAManager(SCMHAManagerStub.getInstance(true));
configurator.setScmContext(SCMContext.emptyContext());
configurator.setScmSafeModeManager(mockSafeModeManager);
config.set(OZONE_READONLY_ADMINISTRATORS, "testUser");
scm = HddsTestUtils.getScm(config, configurator);
scm.start();
scm.exitSafeMode();

server = scm.getClientProtocolServer();
service = new StorageContainerLocationProtocolServerSideTranslatorPB(server,
Expand Down Expand Up @@ -186,6 +193,23 @@ public void testQueryUpgradeStatus() throws Exception {
assertTrue(status.getShouldFinalize());
}

@Test
public void testQueryUpgradeStatusInSafemode() throws Exception {
// mockSafeModeManager defaults to returning true for getInSafeMode()
when(mockSafeModeManager.getInSafeMode()).thenReturn(true);
assertTrue(scm.isInSafeMode());

HddsProtos.UpgradeStatus status = server.queryUpgradeStatus();

// SCM starts already finalized in tests
assertTrue(status.getScmFinalized());
// No datanodes registered
assertEquals(0, status.getNumDatanodesFinalized());
assertEquals(0, status.getNumDatanodesTotal());
// shouldFinalize is false because SCM is in safe mode
assertFalse(status.getShouldFinalize());
}

private ContainerInfo newContainerInfoForTest() {
return new ContainerInfo.Builder()
.setContainerID(1)
Expand Down