fix: improve core start up behavior (#2527)

* fix: improve core start up behavior * fix: remove duplicate file headers
apache · Mar 11, 2024 · 8dcf5f5 · 8dcf5f5
1 parent d301ea4
commit 8dcf5f5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 79 deletions.
diff --git a/...nt/src/main/java/org/apache/streampipes/connect/management/health/AdapterHealthCheck.java b/...nt/src/main/java/org/apache/streampipes/connect/management/health/AdapterHealthCheck.java
@@ -222,7 +222,8 @@ public Map<String, AdapterDescription> getAdaptersToRecover(
                                                    adapterDescription.getElementId()));
                                      } catch (AdapterException e) {
                                        LOG.info(
-                                           "Could not recover adapter at endpoint {} due to {}",
+                                           "Could not recover adapter at endpoint {}  - "
+                                               + "marking it as requested to recover (reason: {})",
                                            adapterEndpointUrl,
                                            e.getMessage()
                                        );

diff --git a/...rc/main/java/org/apache/streampipes/manager/migration/AdapterDescriptionMigration093.java b/...rc/main/java/org/apache/streampipes/manager/migration/AdapterDescriptionMigration093.java
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/admin/MigrationResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/admin/MigrationResource.java
@@ -22,7 +22,6 @@
 import org.apache.streampipes.manager.health.CoreInitialInstallationProgress;
 import org.apache.streampipes.manager.health.CoreServiceStatusManager;
 import org.apache.streampipes.manager.health.ServiceRegistrationManager;
-import org.apache.streampipes.manager.migration.AdapterDescriptionMigration093;
 import org.apache.streampipes.manager.migration.PipelineElementMigrationManager;
 import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceRegistration;
 import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceStatus;
@@ -64,8 +63,6 @@ public class MigrationResource extends AbstractAuthGuardedRestResource {
 
   private final CRUDStorage<String, SpServiceRegistration> extensionsServiceStorage =
       getNoSqlStorage().getExtensionsServiceStorage();
-
-  private final IAdapterStorage adapterDescriptionStorage = getNoSqlStorage().getAdapterDescriptionStorage();
   private final IAdapterStorage adapterStorage = getNoSqlStorage().getAdapterInstanceStorage();
 
   private final IDataProcessorStorage dataProcessorStorage = getNoSqlStorage().getDataProcessorStorage();
@@ -104,13 +101,12 @@ public ResponseEntity<Void> performMigrations(
     try {
       var extensionsServiceConfig = serviceManager.getService(serviceId);
       if (!CoreInitialInstallationProgress.INSTANCE.isInitiallyInstalling()) {
-        new AdapterDescriptionMigration093(adapterDescriptionStorage).reinstallAdapters(extensionsServiceConfig);
         if (!migrationConfigs.isEmpty()) {
           var anyServiceMigrating = serviceManager.isAnyServiceMigrating();
           var coreReady = isCoreReady();
           if (anyServiceMigrating || !coreReady) {
             LOG.info(
-                "Refusing migration request since precondition is not met (anyServiceMigratione={}, coreReady={}.",
+                "Refusing migration request since precondition is not met (anyServiceMigrating={}, coreReady={}.",
                 anyServiceMigrating,
                 coreReady
             );

diff --git a/...pipes-service-core/src/main/java/org/apache/streampipes/service/core/PostStartupTask.java b/...pipes-service-core/src/main/java/org/apache/streampipes/service/core/PostStartupTask.java
@@ -20,6 +20,7 @@
 
 import org.apache.streampipes.commons.prometheus.adapter.AdapterMetricsManager;
 import org.apache.streampipes.connect.management.management.WorkerAdministrationManagement;
+import org.apache.streampipes.manager.health.ServiceHealthCheck;
 import org.apache.streampipes.manager.operations.Operations;
 import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceTagPrefix;
 import org.apache.streampipes.model.pipeline.Pipeline;
@@ -65,6 +66,7 @@ public PostStartupTask(IPipelineStorage pipelineStorage) {
 
   @Override
   public void run() {
+    new ServiceHealthCheck().run();
     performAdapterAssetUpdate();
     startAllPreviouslyStoppedPipelines();
     startAdapters();