Skip to content
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

Jump to bottom

[ISSUE #6226] Shutdown flowMonitor when connection disconnect #6227

Merged
merged 5 commits into from
Mar 3, 2023
Merged

[ISSUE #6226] Shutdown flowMonitor when connection disconnect #6227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
700bc6a
Shutdown flowMonitor when connection disconnect
RongtongJin Mar 2, 2023
dd85b5f
Whether the master is existed has more accurate judgment
RongtongJin Mar 3, 2023
61098b8
Shutdown flowMonitor when HAClient service end
RongtongJin Mar 3, 2023
af1b3a9
Pass the check style
RongtongJin Mar 3, 2023
ab1ec48
Modify according to comments
RongtongJin Mar 3, 2023
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
3 changes: 2 additions & 1 deletion controller/src/main/java/org/apache/rocketmq/controller/impl/manager/SyncStateInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.util.HashSet;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;

/**
* Manages the syncStateSet of broker replicas.
Expand Down Expand Up @@ -53,7 +54,7 @@ public void updateSyncStateSetInfo(Set<String> newSyncStateSet) {
}

public boolean isMasterExist() {
return !this.masterAddress.isEmpty();
return !StringUtils.isBlank(masterAddress);
}

public String getClusterName() {
Expand Down
2 changes: 2 additions & 0 deletions store/src/main/java/org/apache/rocketmq/store/ha/DefaultHAClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ public void run() {
try {
switch (this.currentState) {
case SHUTDOWN:
this.flowMonitor.shutdown(true);
return;
case READY:
if (!this.connectMaster()) {
Expand Down Expand Up @@ -339,6 +340,7 @@ public void run() {
}
}

this.flowMonitor.shutdown(true);
log.info(this.getServiceName() + " service end");
}

Expand Down
4 changes: 4 additions & 0 deletions store/src/main/java/org/apache/rocketmq/store/ha/DefaultHAConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ public void run() {
log.error("", e);
}

flowMonitor.shutdown(true);

log.info(this.getServiceName() + " service end");
}

Expand Down Expand Up @@ -398,6 +400,8 @@ public void run() {
DefaultHAConnection.log.error("", e);
}

flowMonitor.shutdown(true);

DefaultHAConnection.log.info(this.getServiceName() + " service end");
}

Expand Down
3 changes: 3 additions & 0 deletions store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ public void run() {
try {
switch (this.currentState) {
case SHUTDOWN:
this.flowMonitor.shutdown(true);
return;
case READY:
// Truncate invalid msg first
Expand Down Expand Up @@ -437,6 +438,8 @@ public void run() {
}
}

this.flowMonitor.shutdown(true);
LOGGER.info(this.getServiceName() + " service end");
}

/**
Expand Down
5 changes: 5 additions & 0 deletions store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,8 @@ public void run() {
AutoSwitchHAConnection.LOGGER.error("", e);
}

flowMonitor.shutdown(true);

AutoSwitchHAConnection.LOGGER.info(this.getServiceName() + " service end");
}

Expand Down Expand Up @@ -739,6 +741,9 @@ public void run() {
} catch (IOException e) {
AutoSwitchHAConnection.LOGGER.error("", e);
}

flowMonitor.shutdown(true);

AutoSwitchHAConnection.LOGGER.info(this.getServiceName() + " service end");
}

Expand Down