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

Inner 2388: fix when modify slave instance when update db_instance #3876

Merged
merged 1 commit into from
May 22, 2024
Merged

Inner 2388: fix when modify slave instance when update db_instance #3876

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
7 changes: 2 additions & 5 deletions src/main/java/com/actiontech/dble/config/ConfigInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,7 @@ public void testConnection() {
boolean skipTestConnectionOnUpdate = false;
if (SystemConfig.getInstance().isSkipTestConOnUpdate()) {
if (reloadContext != null && !reloadContext.getAffectDbInstanceList().isEmpty()) {
if (reloadContext.getConfStatus() == ConfStatus.Status.MANAGER_DELETE) {
skipTestConnectionOnUpdate = true;
LOGGER.info("will skip all test connection.");
} else {
if (reloadContext.getConfStatus() != ConfStatus.Status.MANAGER_DELETE) {
boolean useSharding = reloadContext.getAffectDbInstanceList().stream().map(ele -> dbGroups.get(ele.getGroupName())).anyMatch((ele) -> ele != null && !ele.isShardingUseless());

//not support for sharding db group
Expand Down Expand Up @@ -246,7 +243,7 @@ public void testConnection() {
boolean find = reloadContext.getAffectDbInstanceList().stream().anyMatch((ele) -> ele.getGroupName().equals(finalDbGroupName) && ele.getInstanceName().equals(ds.getName()));
if (!find) {
//skip test connection on this dbInstance
ds.setTestConnSuccess(true);
ds.setTestConnSuccess(false);
LOGGER.info("dbGroup[" + ds.getDbGroupConfig().getName() + "] instance " + ds.getName() + " is skiped,because of option skipTestConOnUpdate");
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/actiontech/dble/config/model/SystemConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ private SystemConfig() {
private int useCostTimeStat = 0;
private int maxCostStatSize = 100;
private int costSamplePercent = 1;
private boolean skipTestConOnUpdate = false;
private boolean skipTestConOnUpdate = true;
//connection
private String charset = "utf8mb4";
private int maxPacketSize = 4 * 1024 * 1024;
Expand Down
Loading