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

Optimize checkLocalConfig logic #11869

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
+34 −23
Open

Optimize checkLocalConfig logic #11869

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf32067
优化checkLocalConfig逻辑
PleaseGiveMeTheCoke Mar 25, 2024
46b5cc9
修改不规范的等号和分号
PleaseGiveMeTheCoke Mar 29, 2024
90a9eaa
1. 多次校验文件是否存在
PleaseGiveMeTheCoke Apr 2, 2024
8c109d8
format
PleaseGiveMeTheCoke Apr 2, 2024
dabda8a
Merge branch 'alibaba:develop' into develop
PleaseGiveMeTheCoke Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
64 changes: 37 additions & 27 deletions client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,44 +866,54 @@ public void checkLocalConfig(CacheData cacheData) {
final String group = cacheData.group;
final String tenant = cacheData.tenant;
final String envName = cacheData.envName;

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

麻烦使用nacos-code-style进行reformat， 不需要删除缩紧

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

// Check if a failover file exists for the specified dataId, group, and tenant.
File file = LocalConfigInfoProcessor.getFailoverFile(envName, dataId, group, tenant);

// If not using local config info and a failover file exists, load and use it.
if (!cacheData.isUseLocalConfigInfo() && file.exists()) {
String content = LocalConfigInfoProcessor.getFailover(envName, dataId, group, tenant);
final String md5 = MD5Utils.md5Hex(content, Constants.ENCODE);
cacheData.setUseLocalConfigInfo(true);
cacheData.setLocalConfigInfoVersion(file.lastModified());
cacheData.setContent(content);
LOGGER.warn(
"[{}] [failover-change] failover file created. dataId={}, group={}, tenant={}, md5={}, content={}",
envName, dataId, group, tenant, md5, ContentUtils.truncateContent(content));

if (isFailOverFileCreated(cacheData, file)) {
loadAndUse(cacheData, file, true);
return;
}
// If use local config info, but the failover file is deleted, switch back to server config.
if (cacheData.isUseLocalConfigInfo() && !file.exists()) {

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

同上

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

if (isFailOverFileDeleted(cacheData, file)) {
// switch back to server config.
cacheData.setUseLocalConfigInfo(false);
LOGGER.warn("[{}] [failover-change] failover file deleted. dataId={}, group={}, tenant={}", envName,
dataId, group, tenant);
return;
}

// When the failover file content changes, indicating a change in local configuration.
if (cacheData.isUseLocalConfigInfo() && file.exists()
&& cacheData.getLocalConfigInfoVersion() != file.lastModified()) {
String content = LocalConfigInfoProcessor.getFailover(envName, dataId, group, tenant);
final String md5 = MD5Utils.md5Hex(content, Constants.ENCODE);
cacheData.setUseLocalConfigInfo(true);
cacheData.setLocalConfigInfoVersion(file.lastModified());
cacheData.setContent(content);
LOGGER.warn(
"[{}] [failover-change] failover file changed. dataId={}, group={}, tenant={}, md5={}, content={}",
envName, dataId, group, tenant, md5, ContentUtils.truncateContent(content));

if (isFailOverFileChanged(cacheData, file)) {
loadAndUse(cacheData, file, false);
}
}

private void loadAndUse(CacheData cacheData, File file, boolean failOverFileCreated) {
String content = LocalConfigInfoProcessor.getFailover(cacheData.envName, cacheData.dataId, cacheData.group, tenant);
final String md5 = MD5Utils.md5Hex(content, Constants.ENCODE);
cacheData.setUseLocalConfigInfo(true);
cacheData.setLocalConfigInfoVersion(file.lastModified());
cacheData.setContent(content);
LOGGER.warn(
"[{}] [failover-change] failover file {}. dataId={}, group={}, tenant={}, md5={}, content={}",
failOverFileCreated ? "created" : "changed",
cacheData.envName, cacheData.dataId, cacheData.group, tenant, md5, ContentUtils.truncateContent(content));
}

private boolean isFailOverFileCreated(CacheData cacheData, File file) {
// not using local config info, but a failover file exists
return !cacheData.isUseLocalConfigInfo() && file.exists();
}

private boolean isFailOverFileChanged(CacheData cacheData, File file) {
// using local config info, but there is a change in local configuration
return cacheData.isUseLocalConfigInfo() && file.exists() && cacheData.getLocalConfigInfoVersion() != file.lastModified();
}

private boolean isFailOverFileDeleted(CacheData cacheData, File file) {
// using local config info, but the failover file is deleted
return cacheData.isUseLocalConfigInfo() && !file.exists();
}

private ExecutorService ensureSyncExecutor(String taskId) {
if (!multiTaskExecutor.containsKey(taskId)) {
Expand Down