[ISSUE alibaba#5798] Fix upgraded server cannot downgrade and upgrade…

… again. (alibaba#5800) * [ISSUE alibaba#5798] Fix upgraded server cannot downgrade and upgrade again. * Fix NPE when delete ServiceMetadata of an non-exist service.
lakecenter · May 21, 2021 · 5c77307 · 5c77307
1 parent 6bc7c33
commit 5c77307
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/v2/metadata/ServiceMetadataProcessor.java b/naming/src/main/java/com/alibaba/nacos/naming/core/v2/metadata/ServiceMetadataProcessor.java
@@ -172,7 +172,10 @@ private ServiceMetadata mergeMetadata(ServiceMetadata oldMetadata, ServiceMetada
     private void deleteServiceMetadata(MetadataOperation<ServiceMetadata> op) {
         Service service = Service.newService(op.getNamespace(), op.getGroup(), op.getServiceName());
         namingMetadataManager.removeServiceMetadata(service);
-        service = ServiceManager.getInstance().removeSingleton(service);
+        Service removed = ServiceManager.getInstance().removeSingleton(service);
+        if (removed != null) {
+            service = removed;
+        }
         serviceStorage.removeData(service);
         doubleWriteMetadata(service, true);
     }

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/v2/upgrade/UpgradeJudgement.java b/naming/src/main/java/com/alibaba/nacos/naming/core/v2/upgrade/UpgradeJudgement.java
@@ -93,13 +93,15 @@ public UpgradeJudgement(RaftPeerSet raftPeerSet, RaftCore raftCore, ClusterVersi
         this.doubleWriteDelayTaskEngine = doubleWriteDelayTaskEngine;
         Boolean upgraded = upgradeStates.isUpgraded();
         upgraded = upgraded != null && upgraded;
-        if (!EnvUtil.getStandaloneMode() && !upgraded) {
-            initUpgradeChecker();
-        } else {
+        boolean isStandaloneMode = EnvUtil.getStandaloneMode();
+        if (isStandaloneMode || upgraded) {
             useGrpcFeatures.set(true);
             useJraftFeatures.set(true);
             all20XVersion.set(true);
         }
+        if (!isStandaloneMode) {
+            initUpgradeChecker();
+        }
         NotifyCenter.registerSubscriber(this);
     }