Improve startup behaviour

streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/health/AdapterHealthCheck.java

@@ -34,7 +34,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class AdapterHealthCheck {
+public class AdapterHealthCheck implements Runnable {
 
   private static final Logger LOG = LoggerFactory.getLogger(AdapterHealthCheck.class);
 
@@ -52,6 +52,11 @@ public AdapterHealthCheck(IAdapterStorage adapterStorage,
     this.adapterMasterManagement = adapterMasterManagement;
   }
 
+  @Override
+  public void run() {
+    this.checkAndRestoreAdapters();
+  }
+
   /**
    * In this method it is checked which adapters are currently running.
    * Then it calls all workers to validate if the adapter instance is
@@ -114,7 +119,7 @@ public Map<String, AdapterDescription> getAdaptersToRecover(
         allRunningInstancesOfOneWorker.forEach(adapterDescription ->
             allRunningInstancesAdapterDescription.remove(adapterDescription.getElementId()));
       } catch (AdapterException e) {
-        e.printStackTrace();
+        LOG.info("Could not recover adapter at endpoint {} due to {}", adapterEndpointUrl, e.getMessage());
       }
     });
 
@@ -130,10 +135,9 @@ public void recoverAdapters(Map<String, AdapterDescription> adaptersToRecover) {
           this.adapterMasterManagement.startStreamAdapter(adapterDescription.getElementId());
         }
       } catch (AdapterException e) {
-        LOG.warn("Could not start adapter {}", adapterDescription.getName(), e);
+        LOG.warn("Could not start adapter {} ({})", adapterDescription.getName(), e.getMessage());
       }
     }
 
   }
-
 }

streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/WorkerRestClient.java

@@ -73,14 +73,12 @@ public static void stopStreamAdapter(String baseUrl,
 
   public static List<AdapterDescription> getAllRunningAdapterInstanceDescriptions(String url) throws AdapterException {
     try {
-      LOG.info("Requesting all running adapter description instances: " + url);
       var responseString = ExtensionServiceExecutions
               .extServiceGetRequest(url)
               .execute().returnContent().asString();
 
       return JacksonSerializer.getObjectMapper().readValue(responseString, List.class);
     } catch (IOException e) {
-      LOG.error("List of running adapters could not be fetched", e);
       throw new AdapterException("List of running adapters could not be fetched from: " + url);
     }
   }
@@ -112,9 +110,6 @@ private static void triggerAdapterStateChange(AdapterDescription ad,
         var exception = getSerializer().readValue(responseString, AdapterException.class);
         throw new AdapterException(exception.getMessage(), exception.getCause());
       }
-
-      LOG.info("Adapter {} on endpoint: " + url + " with Response: ", ad.getName() + responseString);
-
     } catch (IOException e) {
       LOG.error("Adapter was not {} successfully", action, e);
       throw new AdapterException("Adapter was not " + action + " successfully with url " + url, e);
@@ -153,8 +148,7 @@ public static RuntimeOptionsResponse getConfiguration(String workerEndpoint,
         throw new SpConfigurationException(exception.getMessage(), exception.getCause());
       }
     } catch (IOException e) {
-      e.printStackTrace();
-      throw new AdapterException("Could not resolve runtime configurations from " + url);
+      throw new AdapterException("Could not resolve runtime configurations from " + url, e);
     }
   }
 
@@ -178,11 +172,10 @@ public static byte[] getIconAsset(String baseUrl) throws AdapterException {
     String url = baseUrl + "/assets/icon";
 
     try {
-      byte[] responseString = Request.Get(url)
+      return Request.Get(url)
               .connectTimeout(1000)
               .socketTimeout(100000)
               .execute().returnContent().asBytes();
-      return responseString;
     } catch (IOException e) {
       LOG.error(e.getMessage());
       throw new AdapterException("Could not get icon endpoint: " + url);

streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/migration/IAdapterMigrator.java

@@ -21,5 +21,5 @@
 import org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
 import org.apache.streampipes.model.connect.adapter.AdapterDescription;
 
-public  interface IAdapterMigrator extends IModelMigrator<AdapterDescription, IStaticPropertyExtractor> {
+public interface IAdapterMigrator extends IModelMigrator<AdapterDescription, IStaticPropertyExtractor> {
 }

streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/migration/DataSinkMigrator.java → streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/migration/IDataSinkMigrator.java

@@ -21,5 +21,5 @@
 import org.apache.streampipes.extensions.api.extractor.IDataSinkParameterExtractor;
 import org.apache.streampipes.model.graph.DataSinkInvocation;
 
-public interface DataSinkMigrator extends IModelMigrator<DataSinkInvocation, IDataSinkParameterExtractor> {
+public interface IDataSinkMigrator extends IModelMigrator<DataSinkInvocation, IDataSinkParameterExtractor> {
 }

streampipes-model/src/main/java/org/apache/streampipes/model/configuration/SpCoreConfiguration.java

@@ -34,6 +34,7 @@ public class SpCoreConfiguration {
   private GeneralConfig generalConfig;
 
   private boolean isConfigured;
+  private SpCoreConfigurationStatus serviceStatus;
 
   private String assetDir;
   private String filesDir;
@@ -120,4 +121,12 @@ public EmailTemplateConfig getEmailTemplateConfig() {
   public void setEmailTemplateConfig(EmailTemplateConfig emailTemplateConfig) {
     this.emailTemplateConfig = emailTemplateConfig;
   }
+
+  public SpCoreConfigurationStatus getServiceStatus() {
+    return this.serviceStatus;
+  }
+
+  public void setServiceStatus(SpCoreConfigurationStatus serviceStatus) {
+    this.serviceStatus = serviceStatus;
+  }
 }

streampipes-model/src/main/java/org/apache/streampipes/model/configuration/SpCoreConfigurationStatus.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.model.configuration;
+
+public enum SpCoreConfigurationStatus {
+  INSTALLING,
+  MIGRATING,
+  READY
+}

streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/migration/MigrationHelpers.java

@@ -40,6 +40,10 @@ public String getRev(JsonObject adapter) {
     return adapter.get(REV).getAsString();
   }
 
+  public String getAppId(JsonObject adapter) {
+    return adapter.get("properties").getAsJsonObject().get(APP_ID).getAsString();
+  }
+
   public void updateType(JsonObject adapter,
                          String typeFieldName) {
     adapter.add(typeFieldName, new JsonPrimitive(AdapterModels.NEW_MODEL));

streampipes-model/src/main/java/org/apache/streampipes/model/extensions/svcdiscovery/SpServiceRegistration.java

@@ -36,8 +36,8 @@ public class SpServiceRegistration {
   private int port;
   private List<SpServiceTag> tags;
   private String healthCheckPath;
-  private boolean healthy = true;
   private long firstTimeSeenUnhealthy = 0;
+  private SpServiceStatus status = SpServiceStatus.REGISTERED;
 
   public SpServiceRegistration() {
   }
@@ -133,14 +133,6 @@ public void setRev(String rev) {
     this.rev = rev;
   }
 
-  public boolean isHealthy() {
-    return healthy;
-  }
-
-  public void setHealthy(boolean healthy) {
-    this.healthy = healthy;
-  }
-
   public String getScheme() {
     return scheme;
   }
@@ -168,4 +160,12 @@ public String getSvcType() {
   public void setSvcType(String svcType) {
     this.svcType = svcType;
   }
+
+  public SpServiceStatus getStatus() {
+    return status;
+  }
+
+  public void setStatus(SpServiceStatus status) {
+    this.status = status;
+  }
 }

streampipes-model/src/main/java/org/apache/streampipes/model/extensions/svcdiscovery/SpServiceStatus.java

@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.model.extensions.svcdiscovery;
+
+public enum SpServiceStatus {
+  REGISTERED,
+  MIGRATING,
+  HEALTHY,
+  UNHEALTHY
+}

streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorInvocation.java

@@ -75,6 +75,7 @@ public DataProcessorInvocation(DataProcessorInvocation other) {
   public DataProcessorInvocation(DataProcessorDescription sepa, String domId) {
     this(sepa);
     this.dom = domId;
+    this.serviceTagPrefix = SpServiceTagPrefix.DATA_PROCESSOR;
   }
 
   public DataProcessorInvocation() {

streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkInvocation.java

@@ -59,6 +59,7 @@ public DataSinkInvocation(DataSinkDescription other) {
   public DataSinkInvocation(DataSinkDescription sec, String domId) {
     this(sec);
     this.setDom(domId);
+    this.serviceTagPrefix = SpServiceTagPrefix.DATA_SINK;
   }
 
   public DataSinkInvocation() {

streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/endpoint/ExtensionsServiceEndpointGenerator.java

@@ -72,7 +72,7 @@ private List<String> getServiceEndpoints() {
 
   private String selectService() throws NoServiceEndpointsAvailableException {
     List<String> serviceEndpoints = getServiceEndpoints();
-    if (serviceEndpoints.size() > 0) {
+    if (!serviceEndpoints.isEmpty()) {
       return getServiceEndpoints().get(0);
     } else {
       LOG.error("Could not find any service endpoints for appId {}, serviceTag {}", appId,

streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/health/CoreServiceStatusManager.java

@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.manager.health;
+
+import org.apache.streampipes.model.configuration.SpCoreConfiguration;
+import org.apache.streampipes.model.configuration.SpCoreConfigurationStatus;
+import org.apache.streampipes.storage.api.ISpCoreConfigurationStorage;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CoreServiceStatusManager {
+
+  private static final Logger LOG = LoggerFactory.getLogger(CoreServiceStatusManager.class);
+
+  private final ISpCoreConfigurationStorage storage;
+
+  public CoreServiceStatusManager(ISpCoreConfigurationStorage storage) {
+    this.storage = storage;
+  }
+
+  public boolean existsConfig() {
+    return storage.exists();
+  }
+
+  public boolean isCoreReady() {
+    return existsConfig() && storage.get().getServiceStatus() == SpCoreConfigurationStatus.READY;
+  }
+
+  public void updateCoreStatus(SpCoreConfigurationStatus status) {
+    var config = storage.get();
+    config.setServiceStatus(status);
+    storage.updateElement(config);
+    logService(config);
+  }
+
+  private void logService(SpCoreConfiguration coreConfig) {
+    LOG.info(
+        "Core is now in {} state",
+        coreConfig.getServiceStatus()
+    );
+  }
+}

streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/health/PipelineHealthCheck.java

@@ -45,6 +45,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
+import static org.apache.streampipes.manager.pipeline.PipelineManager.getPipeline;
+
 public class PipelineHealthCheck implements Runnable {
 
   private static final Logger LOG = LoggerFactory.getLogger(PipelineHealthCheck.class);
@@ -68,7 +70,7 @@ public void checkAndRestorePipelineElements() {
     pipelinesStats.setRunningPipelines(runningPipelines.size());
     pipelinesStats.setStoppedPipelines(pipelinesStats.getAllPipelines() - pipelinesStats.getRunningPipelines());
 
-    if (runningPipelines.size() > 0) {
+    if (!runningPipelines.isEmpty()) {
       Map<String, List<InvocableStreamPipesEntity>> endpointMap = generateEndpointMap();
       List<String> allRunningInstances = findRunningInstances(endpointMap.keySet());
 
@@ -115,15 +117,16 @@ public void checkAndRestorePipelineElements() {
           }
         });
         if (shouldUpdatePipeline.get()) {
-          if (failedInstances.size() > 0) {
-            pipeline.setHealthStatus(PipelineHealthStatus.FAILURE);
+          var currentPipeline = getPipeline(pipeline.getPipelineId());
+          if (!failedInstances.isEmpty()) {
+            currentPipeline.setHealthStatus(PipelineHealthStatus.FAILURE);
             pipelinesStats.failedIncrease();
-          } else if (recoveredInstances.size() > 0) {
-            pipeline.setHealthStatus(PipelineHealthStatus.REQUIRES_ATTENTION);
+          } else if (!recoveredInstances.isEmpty()) {
+            currentPipeline.setHealthStatus(PipelineHealthStatus.REQUIRES_ATTENTION);
             pipelinesStats.attentionRequiredIncrease();
           }
-          pipeline.setPipelineNotifications(pipelineNotifications);
-          StorageDispatcher.INSTANCE.getNoSqlStore().getPipelineStorageAPI().updatePipeline(pipeline);
+          currentPipeline.setPipelineNotifications(pipelineNotifications);
+          StorageDispatcher.INSTANCE.getNoSqlStore().getPipelineStorageAPI().updatePipeline(currentPipeline);
         }
       });
       int healthNum = pipelinesStats.getRunningPipelines() - pipelinesStats.getFailedPipelines()
@@ -233,13 +236,11 @@ private List<Pipeline> getRunningPipelines(List<Pipeline> allPipelines) {
   }
 
   private List<Pipeline> getAllPipelines() {
-    List<Pipeline> allPipelines = StorageDispatcher
+    return StorageDispatcher
             .INSTANCE
             .getNoSqlStore()
             .getPipelineStorageAPI()
             .getAllPipelines();
-
-    return allPipelines;
   }
 
   private int getElementsCount(List<Pipeline> allPipelines){