zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2986 from alibaba/hotfix_job_execute_condition

Browse Source 
[#2985] fix task executable judgment logic problems
This commit is contained in:
liaochuntao 2020-06-08 00:55:10 +08:00 committed by GitHub
commit 99539dd330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/src/main/java/com/alibaba/nacos/config/server/service/dump/EmbeddedDumpService.java
View File

@ -160,6 +160,9 @@ public class EmbeddedDumpService extends DumpService {
@Override @Override
protected boolean canExecute() { protected boolean canExecute() {
if (ApplicationUtils.getStandaloneMode()) {
return true;
}
// if is derby + raft mode, only leader can execute // if is derby + raft mode, only leader can execute
CPProtocol protocol = protocolManager.getCpProtocol(); CPProtocol protocol = protocolManager.getCpProtocol();
return protocol.isLeader(Constants.CONFIG_MODEL_RAFT_GROUP); return protocol.isLeader(Constants.CONFIG_MODEL_RAFT_GROUP);

10
config/src/main/java/com/alibaba/nacos/config/server/service/merge/MergeDatumService.java
View File

@ -109,15 +109,11 @@ public class MergeDatumService {
if (!PropertyUtil.isEmbeddedStorage()) { if (!PropertyUtil.isEmbeddedStorage()) {
return true; return true;
} }
try { if (ApplicationUtils.getStandaloneMode()) {
ProtocolManager protocolManager = ApplicationUtils.getBean(ProtocolManager.class);
return protocolManager.getCpProtocol().isLeader(Constants.CONFIG_MODEL_RAFT_GROUP);
} catch (NoSuchRaftGroupException e) {
return true; return true;
} catch (Exception e) {
// It's impossible to get to this point
throw new RuntimeException(e);
} }
ProtocolManager protocolManager = ApplicationUtils.getBean(ProtocolManager.class);
return protocolManager.getCpProtocol().isLeader(Constants.CONFIG_MODEL_RAFT_GROUP);
} }
class MergeAllDataWorker extends Thread { class MergeAllDataWorker extends Thread {