[JBPM-9464] Kie server notification causes bad status in BC

kiegroup · Nov 30, 2020 · 2765f5e · 2765f5e
1 parent b3efee1
commit 2765f5e
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 25 deletions.
diff --git a/kie-server-parent/kie-server-api/src/main/java/org/kie/server/api/KieServerConstants.java b/kie-server-parent/kie-server-api/src/main/java/org/kie/server/api/KieServerConstants.java
@@ -62,6 +62,8 @@ public class KieServerConstants {
     public static final String KIE_SERVER_IMAGESERVICE_MAX_NODES = "org.kie.server.service.image.max_nodes";
     public static final String KIE_SERVER_REST_MODE_READONLY = "org.kie.server.rest.mode.readonly";
     public static final String KIE_SERVER_NOTIFY_UPDATES_TO_CONTROLLERS = "org.kie.server.update.notifications.rest.enabled";
+    public static final String KIE_SERVER_NOTIFY_UPDATES_TO_CONTROLLERS_DELAY = "org.kie.server.update.notifications.delay";
+
     // configuration parameters
     public static final String CFG_PERSISTANCE_DS = "org.kie.server.persistence.ds";
     public static final String CFG_PERSISTANCE_TM = "org.kie.server.persistence.tm";

diff --git a/...r-controller-api/src/main/java/org/kie/server/controller/api/model/runtime/Container.java b/...r-controller-api/src/main/java/org/kie/server/controller/api/model/runtime/Container.java
@@ -54,7 +54,7 @@ public Container( final String containerSpecId,
         this.serverInstanceId = serverInstanceKey.getServerInstanceId();
         this.messages.addAll( messages );
         this.resolvedReleasedId = resolvedReleasedId;
-
+        setUrl(url);
     }
 
     public String getServerInstanceId() {

diff --git a/...controller-impl/src/main/java/org/kie/server/controller/impl/KieServerControllerImpl.java b/...controller-impl/src/main/java/org/kie/server/controller/impl/KieServerControllerImpl.java
@@ -165,11 +165,7 @@ public KieServerSetup update(KieServerStateInfo kieServerStateInfo) {
 
         // we update the server instance with the containers
         List<Container> containerList = new ArrayList<Container>();
-        List<KieContainerStatus> invalidStatus = Collections.singletonList(KieContainerStatus.STOPPED);
         for(ContainerSpec containerSpec : serverTemplate.getContainersSpec()) {
-            if(invalidStatus.contains(containerSpec.getStatus())) {
-                continue;
-            }
             Container container = new Container(containerSpec.getId(),
                           containerSpec.getContainerName(),
                           serverInstanceKey,
@@ -189,7 +185,6 @@ public KieServerSetup update(KieServerStateInfo kieServerStateInfo) {
 
         // we update and notify
         notificationService.notify(new ServerInstanceUpdated(serverInstance));
-        notificationService.notify(new ServerTemplateUpdated(serverTemplate));
 
         for(ContainerSpec currentSpec : serverTemplate.getContainersSpec()) {
             List<Container> specContainerList = new ArrayList<Container>();
@@ -206,7 +201,6 @@ public KieServerSetup update(KieServerStateInfo kieServerStateInfo) {
             notificationService.notify(serverTemplate, currentSpec, specContainerList);
         }
 
-
         return toKieServerSetup(serverTemplate);
     }
 

diff --git a/...ontroller-impl/src/main/java/org/kie/server/controller/impl/KieServerInstanceManager.java b/...ontroller-impl/src/main/java/org/kie/server/controller/impl/KieServerInstanceManager.java
@@ -16,6 +16,7 @@
 package org.kie.server.controller.impl;
 
 import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.ServiceLoader;
 
@@ -375,10 +376,16 @@ public List<Container> getContainers(final ServerTemplate serverTemplate,
 
     RemoteKieServerOperation<Void> getContainersRemoteOperation(final ServerTemplate serverTemplate,
                                                                 final ContainerSpec containerSpec) {
+
         return new RemoteKieServerOperation<Void>() {
             @Override
             public Void doOperation(KieServicesClient client,
                                     Container container) {
+
+                EnumSet<KieContainerStatus> set = EnumSet.of(KieContainerStatus.STARTED, KieContainerStatus.CREATING);
+                if(!set.contains(container.getStatus())) {
+                    return null;
+                }
 
                 final ServiceResponse<KieContainerResource> response = client.getContainerInfo(containerSpec.getId());
                 final KieContainerResource containerResource = response.getResult();

diff --git a/.../kie-server-services-common/src/main/java/org/kie/server/services/impl/KieServerImpl.java b/.../kie-server-services-common/src/main/java/org/kie/server/services/impl/KieServerImpl.java
@@ -322,7 +322,7 @@ public ServiceResponse<KieContainerResource> createContainer(String containerId,
                                     currentState.getContainers().add(container);
                                 });
                                 eventSupport.fireAfterContainerStarted(this, ci);
-                                getDefaultController().update(getInternalServerState());
+                                notifyStatusToControllers();
                                 return new ServiceResponse<KieContainerResource>(ServiceResponse.ResponseType.SUCCESS, "Container " + containerId + " successfully deployed with module " + releaseId + ".", ci.getResource());
                             } else {
                                 ci.getResource().setStatus(KieContainerStatus.FAILED);
@@ -432,7 +432,7 @@ public ServiceResponse<KieContainerResource> activateContainer(String containerI
                     });
 
                     eventSupport.fireAfterContainerActivated(this, kci);
-                    getDefaultController().update(getInternalServerState());
+                    notifyStatusToControllers();
                     messages.add(new Message(Severity.INFO, "Container " + containerId + " activated successfully."));
                     return new ServiceResponse<KieContainerResource>(ServiceResponse.ResponseType.SUCCESS, "Container " + containerId + " activated successfully.", kci.getResource());
                 }
@@ -481,7 +481,7 @@ public ServiceResponse<KieContainerResource> deactivateContainer(String containe
                     });
 
                     eventSupport.fireAfterContainerDeactivated(this, kci);
-                    getDefaultController().update(getInternalServerState());
+                    notifyStatusToControllers();
                     messages.add(new Message(Severity.INFO, "Container " + containerId + " deactivated successfully."));
                     return new ServiceResponse<KieContainerResource>(ServiceResponse.ResponseType.SUCCESS, "Container " + containerId + " deactivated successfully.", kci.getResource());
                 }
@@ -614,7 +614,7 @@ public ServiceResponse<Void> disposeContainer(String containerId) {
                         messages.add(new Message(Severity.INFO, "Container " + containerId + " successfully stopped."));
 
                         eventSupport.fireAfterContainerStopped(this, kci);
-                        getDefaultController().update(getInternalServerState());
+                        notifyStatusToControllers();
                         return new ServiceResponse<Void>(ServiceResponse.ResponseType.SUCCESS, "Container " + containerId + " successfully disposed.");
                     } else {
                         messages.add(new Message(Severity.INFO, "Container " + containerId + " was not instantiated."));
@@ -678,7 +678,7 @@ public ServiceResponse<KieScannerResource> updateScanner(String id, KieScannerRe
                             }
                         });
                     });
-                    getDefaultController().update(getInternalServerState());
+                    notifyStatusToControllers();
                     return scannerResponse;
                 }
             } else {
@@ -955,7 +955,7 @@ public ServiceResponse<ReleaseId> updateContainerReleaseId(String containerId, R
 
                 logger.info("Container {} successfully updated to release id {}", containerId, releaseId);
                 ks.getRepository().removeKieModule(originalReleaseId);
-                getDefaultController().update(getInternalServerState());
+                notifyStatusToControllers();
                 messages.add(new Message(Severity.INFO, "Release id successfully updated for container " + containerId));
                 return new ServiceResponse<ReleaseId>(ServiceResponse.ResponseType.SUCCESS, "Release id successfully updated.", kci.getResource().getReleaseId());
             } else {
@@ -1108,6 +1108,18 @@ protected KieServerController getController() {
         return controller;
     }
 
+    protected void notifyStatusToControllers() {
+        new Thread(() -> {
+            try {
+                Thread.sleep(Long.getLong(KieServerConstants.KIE_SERVER_NOTIFY_UPDATES_TO_CONTROLLERS_DELAY, 1000L));
+            } catch (InterruptedException e) {
+                // do nothing
+            } finally {
+                getDefaultController().update(getInternalServerState());
+            }
+        }).start();
+    }
+
     protected KieServerController getDefaultController() {
         return new DefaultRestControllerImpl(context);
     }

diff --git a/...mmon/src/main/java/org/kie/server/services/impl/controller/DefaultRestControllerImpl.java b/...mmon/src/main/java/org/kie/server/services/impl/controller/DefaultRestControllerImpl.java
@@ -146,16 +146,21 @@ public KieServerSetup connect(KieServerInfo serverInfo) {
 
         KieServerConfig config = currentState.getConfiguration();
         if (controllers != null && !controllers.isEmpty()) {
+            KieServerSetup kieServerSetup = null;
             for (String controllerUrl : controllers) {
 
                 if (controllerUrl != null && !controllerUrl.isEmpty()) {
-                    KieServerSetup kieServerSetup = connectToSingleController(serverInfo, config, controllerUrl);
-                    if (kieServerSetup != null && kieServerSetup.hasNoErrors()) {
-                        return kieServerSetup;
+                    KieServerSetup kieServerSetupController = connectToSingleController(serverInfo, config, controllerUrl);
+                    if (kieServerSetup == null && kieServerSetupController != null && kieServerSetupController.hasNoErrors()) {
+                        kieServerSetup = kieServerSetupController;
                     }
                 }
             }
 
+            if(kieServerSetup != null) {
+                return kieServerSetup;
+            }
+
             throw new KieControllerNotConnectedException("Unable to connect to any controller");
         } else {
             throw new KieControllerNotDefinedException("Unable to connect to any controller");
@@ -170,13 +175,8 @@ public void disconnect(KieServerInfo serverInfo) {
         KieServerConfig config = currentState.getConfiguration();
 
         for (String controllerUrl : controllers ) {
-
             if (controllerUrl != null && !controllerUrl.isEmpty()) {
-
-                boolean disconnected = disconnectFromSingleController(serverInfo, config, controllerUrl);
-                if (disconnected) {
-                    break;
-                }
+                disconnectFromSingleController(serverInfo, config, controllerUrl);
             }
         }
     }
@@ -212,9 +212,7 @@ public KieServerSetup update(KieServerStateInfo serverTemplateUpdate) {
                 }
             }
 
-        } else {
-            logger.warn("No controllers found to update to new status {}", serverTemplateUpdate);
-        }
+        } 
         // we return one of them coming fron the controller
         return kieServerSetup;
     }