diff --git a/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java b/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java index 22d91643d0..068187e401 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java @@ -717,7 +717,7 @@ public class ReplicasManager { this.checkSyncStateSetTaskFuture.cancel(false); } this.checkSyncStateSetTaskFuture = this.scheduledService.scheduleAtFixedRate(() -> { - final Set newSyncStateSet = this.haService.maybeShrinkInSyncStateSet(); + final Set newSyncStateSet = this.haService.maybeShrinkSyncStateSet(); newSyncStateSet.add(this.brokerControllerId); synchronized (this) { if (this.syncStateSet != null) { diff --git a/store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAService.java b/store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAService.java index bb6d2c54cc..4258614552 100644 --- a/store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAService.java +++ b/store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAService.java @@ -229,10 +229,10 @@ public class AutoSwitchHAService extends DefaultHAService { } /** - * Check and maybe shrink the inSyncStateSet. + * Check and maybe shrink the SyncStateSet. * A slave will be removed from SyncStateSet if (curTime - HaConnection.lastCaughtUpTime) > option(haMaxTimeSlaveNotCatchup) */ - public Set maybeShrinkInSyncStateSet() { + public Set maybeShrinkSyncStateSet() { final Set newSyncStateSet = getLocalSyncStateSet(); boolean isSyncStateSetChanged = false; final long haMaxTimeSlaveNotCatchup = this.defaultMessageStore.getMessageStoreConfig().getHaMaxTimeSlaveNotCatchup(); @@ -253,7 +253,7 @@ public class AutoSwitchHAService extends DefaultHAService { } /** - * Check and maybe add the slave to inSyncStateSet. A slave will be added to SyncStateSet if its slaveMaxOffset >= + * Check and maybe add the slave to SyncStateSet. A slave will be added to SyncStateSet if its slaveMaxOffset >= * current confirmOffset, and it is caught up to an offset within the current leader epoch. */ public void maybeExpandInSyncStateSet(final Long slaveBrokerId, final long slaveMaxOffset) {