You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2026/10/12 12:27:54 UTC

(streampipes) branch dev updated: fix: Restore service health after reconnect (#5086)

This is an automated email from the ASF dual-hosted git repository.

dominikriemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git


The following commit(s) were added to refs/heads/dev by this push:
     new e853c11912 fix: Restore service health after reconnect (#5086)
e853c11912 is described below

commit e853c119121e8986496cf6dbc8bd516f73d404ed
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Mon Oct 12 14:27:49 2026 +0200

    fix: Restore service health after reconnect (#5086)
---
 .../StreamPipesExtensionsServiceBase.java          | 27 +++++---
 .../StreamPipesExtensionsServiceBaseTest.java      | 77 ++++++++++++++++++++++
 2 files changed, 95 insertions(+), 9 deletions(-)

diff --git a/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/StreamPipesExtensionsServiceBase.java b/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/StreamPipesExtensionsServiceBase.java
index e09c2871e7..049b0a639c 100644
--- a/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/StreamPipesExtensionsServiceBase.java
+++ b/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/StreamPipesExtensionsServiceBase.java
@@ -81,7 +81,7 @@ public abstract class StreamPipesExtensionsServiceBase extends StreamPipesServic
   private ExtensionBrokerRequestReceiver extensionBrokerRequestReceiver;
   private ExtensionServiceTransportMode extensionTransportMode = ExtensionServiceTransportMode.HTTP;
   private boolean natsBrokerReceiverActive = false;
-  private SpServiceRegistration currentServiceRegistration;
+  private volatile SpServiceRegistration currentServiceRegistration;
 
   public void init() {
     SpServiceDefinition serviceDef = provideServiceDefinition();
@@ -116,11 +116,7 @@ public abstract class StreamPipesExtensionsServiceBase extends StreamPipesServic
 
   public void afterServiceRegistered(SpServiceDefinition serviceDef,
                                      SpServiceRegistration serviceReg) {
-    StreamPipesClient client = new StreamPipesClientResolver().makeStreamPipesClientInstance();
-
-    // register all migrations at StreamPipes Core
-    var migrationConfigs = serviceDef.getMigrators().stream().map(IModelMigrator::config).toList();
-    new CoreRequestSubmitter().submitMigrationRequest(client, migrationConfigs, serviceId(), serviceReg);
+    registerMigrations(serviceDef, serviceReg);
 
     // initialize all function instances
     StreamPipesFunctionHandler.INSTANCE.initializeFunctions(serviceDef.getServiceGroup());
@@ -143,7 +139,7 @@ public abstract class StreamPipesExtensionsServiceBase extends StreamPipesServic
           Environments.getEnvironment()
               .getExtensionRequestTopicPrefix()
               .getValueOrReturn(ExtensionServiceBrokerTopics.DEFAULT_REQUEST_TOPIC_PREFIX),
-          this::onNatsReconnect
+          () -> onNatsReconnect(serviceDef)
       );
     } else {
       LOG.info("Starting Extension Service on HTTP Mode");
@@ -181,7 +177,7 @@ public abstract class StreamPipesExtensionsServiceBase extends StreamPipesServic
     new CoreRequestSubmitter().submitRegistrationRequest(client, serviceRegistration);
   }
 
-  private void onNatsReconnect() {
+  private void onNatsReconnect(SpServiceDefinition serviceDef) {
     var registration = this.currentServiceRegistration;
     if (registration == null) {
       LOG.warn("NATS reconnect detected but service registration is not available yet");
@@ -190,12 +186,25 @@ public abstract class StreamPipesExtensionsServiceBase extends StreamPipesServic
 
     try {
       LOG.info("NATS reconnect detected - refreshing service registration for {}", registration.getSvcId());
-      registerService(registration);
+      refreshServiceRegistration(serviceDef, registration);
     } catch (Exception e) {
       LOG.warn("Could not refresh service registration after NATS reconnect", e);
     }
   }
 
+  void refreshServiceRegistration(SpServiceDefinition serviceDef, SpServiceRegistration registration) {
+    registerService(registration);
+    // Registration resets readiness. Complete the migration handshake again, but
+    // do not initialize function instances that are already running.
+    registerMigrations(serviceDef, registration);
+  }
+
+  private void registerMigrations(SpServiceDefinition serviceDef, SpServiceRegistration registration) {
+    var client = new StreamPipesClientResolver().makeStreamPipesClientInstance();
+    var migrationConfigs = serviceDef.getMigrators().stream().map(IModelMigrator::config).toList();
+    new CoreRequestSubmitter().submitMigrationRequest(client, migrationConfigs, registration.getSvcId(), registration);
+  }
+
   protected Set<SpServiceTag> getServiceTags(Set<ExtensionItemDescription> extensions) {
     Set<SpServiceTag> tags = new HashSet<>();
     if (DeclarersSingleton.getInstance().getServiceDefinition() != null) {
diff --git a/streampipes-service-extensions/src/test/java/org/apache/streampipes/service/extensions/StreamPipesExtensionsServiceBaseTest.java b/streampipes-service-extensions/src/test/java/org/apache/streampipes/service/extensions/StreamPipesExtensionsServiceBaseTest.java
new file mode 100644
index 0000000000..d36d2ab07f
--- /dev/null
+++ b/streampipes-service-extensions/src/test/java/org/apache/streampipes/service/extensions/StreamPipesExtensionsServiceBaseTest.java
@@ -0,0 +1,77 @@
+/*
+ * 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.service.extensions;
+
+import org.apache.streampipes.client.StreamPipesClient;
+import org.apache.streampipes.extensions.api.migration.IModelMigrator;
+import org.apache.streampipes.extensions.management.client.StreamPipesClientResolver;
+import org.apache.streampipes.extensions.management.model.SpServiceDefinition;
+import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceRegistration;
+import org.apache.streampipes.model.extensions.svcdiscovery.SpServiceTagPrefix;
+import org.apache.streampipes.model.migration.ModelMigratorConfig;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.mockito.Mockito.CALLS_REAL_METHODS;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockConstruction;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class StreamPipesExtensionsServiceBaseTest {
+
+  @Test
+  void reconnectCompletesReadinessHandshakeWithoutMigrators() {
+    assertReconnectHandshake(List.of(), List.of());
+  }
+
+  @Test
+  void reconnectResubmitsConfiguredMigrations() {
+    var migrator = mock(IModelMigrator.class);
+    var config = new ModelMigratorConfig("adapter", SpServiceTagPrefix.ADAPTER, 1, 2);
+    when(migrator.config()).thenReturn(config);
+    assertReconnectHandshake(List.of(migrator), List.of(config));
+  }
+
+  private void assertReconnectHandshake(List<IModelMigrator<?, ?>> migrators, List<ModelMigratorConfig> configs) {
+    var service = mock(StreamPipesExtensionsServiceBase.class, CALLS_REAL_METHODS);
+    var definition = mock(SpServiceDefinition.class);
+    when(definition.getMigrators()).thenReturn(migrators);
+    var registration = new SpServiceRegistration();
+    registration.setSvcId("reconnected-service");
+    var client = mock(StreamPipesClient.class, RETURNS_DEEP_STUBS);
+    var admin = client.adminApi();
+
+    try (var resolvers = mockConstruction(StreamPipesClientResolver.class,
+        (resolver, context) -> when(resolver.makeStreamPipesClientInstance()).thenReturn(client))) {
+      service.refreshServiceRegistration(definition, registration);
+
+      var requests = inOrder(admin);
+      requests.verify(admin).registerService(registration);
+      requests.verify(admin).registerMigrations(configs, registration.getSvcId());
+      requests.verifyNoMoreInteractions();
+      verify(service, never()).afterServiceRegistered(definition, registration);
+    }
+  }
+}