opensource/rocketmq
3
0
Fork 0
mirror of https://github.com/apache/rocketmq.git synced 2026-08-30 18:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

test(controller): add more logs when register and refactor ReplicasManagerRegisterTest

Browse Source 
1. add more logs when register and refactor ReplicasManagerRegisterTest
This commit is contained in:
TheR1sing3un
2023-03-12 19:16:24 +08:00
committed by rongtong
parent a240753951
commit 506a8a9037
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java
+12 -6
View File
@@ -167,8 +167,8 @@ public class ReplicasManager {
private boolean startBasicService() {
if (this.state == State.INITIAL) {
if (schedulingSyncControllerMetadata()) {
LOGGER.info("First time sync controller metadata success");
this.state = State.FIRST_TIME_SYNC_CONTROLLER_METADATA_DONE;
LOGGER.info("First time sync controller metadata success, change state to: {}", this.state);
} else {
return false;
}
@@ -177,8 +177,8 @@ public class ReplicasManager {
if (this.state == State.FIRST_TIME_SYNC_CONTROLLER_METADATA_DONE) {
for (int retryTimes = 0; retryTimes < 5; retryTimes++) {
if (register()) {
LOGGER.info("First time register broker success");
this.state = State.REGISTER_TO_CONTROLLER_DONE;
LOGGER.info("First time register broker success, change state to: {}", this.state);
break;
}
@@ -200,9 +200,10 @@ public class ReplicasManager {
// The scheduled task for heartbeat sending is not starting now, so we should manually send heartbeat request
this.sendHeartbeatToController();
if (this.masterBrokerId != null || brokerElect()) {
LOGGER.info("Master in this broker set is elected");
LOGGER.info("Master in this broker set is elected, masterBrokerId: {}, masterBrokerAddr: {}", this.masterAddress, this.masterBrokerId);
this.state = State.RUNNING;
this.brokerController.setIsolated(false);
LOGGER.info("All register process has been done, change state to: {}", this.state);
} else {
return false;
}
@@ -271,7 +272,7 @@ public class ReplicasManager {
LOGGER.error("Error happen when register broker to name-srv, Failed to change broker to master", e);
return;
}
LOGGER.info("Change broker [id:{}][address:{}] to master success, masterEpoch {}, syncStateSetEpoch:{}", this.brokerConfig, this.brokerAddress, newMasterEpoch, syncStateSetEpoch);
LOGGER.info("Change broker [id:{}][address:{}] to master success, masterEpoch {}, syncStateSetEpoch:{}", this.brokerControllerId, this.brokerAddress, newMasterEpoch, syncStateSetEpoch);
});
}
}
@@ -412,6 +413,7 @@ public class ReplicasManager {
try {
// 1. confirm now registering state
confirmNowRegisteringState();
LOGGER.info("Confirm now register state: {}", this.registerState);
// 2. check metadata/tempMetadata if valid
if (!checkMetadataValid()) {
LOGGER.error("Check and find that metadata/tempMetadata invalid, you can modify the broker config to make them valid");
@@ -425,6 +427,7 @@ public class ReplicasManager {
return false;
}
this.registerState = RegisterState.CREATE_TEMP_METADATA_FILE_DONE;
LOGGER.info("Register state change to {}, temp metadata: {}", this.registerState, this.tempBrokerMetadata);
}
// 3. apply brokerId to controller, and create metadata file
if (this.registerState == RegisterState.CREATE_TEMP_METADATA_FILE_DONE) {
@@ -441,13 +444,16 @@ public class ReplicasManager {
return false;
}
this.registerState = RegisterState.CREATE_METADATA_FILE_DONE;
LOGGER.info("Register state change to: {}, metadata: {}", this.registerState, this.brokerMetadata);
}
// 4. register
if (this.registerState == RegisterState.CREATE_METADATA_FILE_DONE) {
if (!registerBrokerToController()) {
LOGGER.error("Failed to register broker to controller");
return false;
}
this.registerState = RegisterState.REGISTERED;
LOGGER.info("Register state change to: {}, masterBrokerId: {}, masterBrokerAddr: {}", this.registerState, this.masterBrokerId, this.masterAddress);
}
return true;
} catch (final Exception e) {
@@ -560,7 +566,7 @@ public class ReplicasManager {
try {
this.brokerMetadata.readFromFile();
} catch (Exception e) {
LOGGER.error("read metadata file failed", e);
LOGGER.error("Read metadata file failed", e);
}
if (this.brokerMetadata.isLoaded()) {
this.registerState = RegisterState.CREATE_METADATA_FILE_DONE;
@@ -571,7 +577,7 @@ public class ReplicasManager {
try {
this.tempBrokerMetadata.readFromFile();
} catch (Exception e) {
LOGGER.error("read temp metadata file failed", e);
LOGGER.error("Read temp metadata file failed", e);
}
if (this.tempBrokerMetadata.isLoaded()) {
this.registerState = RegisterState.CREATE_TEMP_METADATA_FILE_DONE;
broker/src/test/java/org/apache/rocketmq/broker/controller/ReplicasManagerRegisterTest.java
+4 -5
View File
@@ -37,7 +37,6 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -90,20 +89,20 @@ public class ReplicasManagerRegisterTest {
return config;
}
@Mock
private BrokerController mockedBrokerController;
@Mock
private DefaultMessageStore mockedMessageStore;
@Mock
private BrokerOuterAPI mockedBrokerOuterAPI;
@Mock
private AutoSwitchHAService mockedAutoSwitchHAService;
@Before
public void setUp() throws Exception {
this.mockedBrokerController = Mockito.mock(BrokerController.class);
this.mockedMessageStore = Mockito.mock(DefaultMessageStore.class);
this.mockedBrokerOuterAPI = Mockito.mock(BrokerOuterAPI.class);
this.mockedAutoSwitchHAService = Mockito.mock(AutoSwitchHAService.class);
when(mockedBrokerController.getBrokerOuterAPI()).thenReturn(mockedBrokerOuterAPI);
when(mockedBrokerController.getMessageStore()).thenReturn(mockedMessageStore);
when(mockedBrokerController.getBrokerConfig()).thenReturn(BROKER_CONFIG);