You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2023/11/13 08:08:55 UTC

(streampipes) branch dev updated: bug(#2165): Fix migration for adapter instances (#2167)

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

zehnder 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 18cdb2d4f bug(#2165): Fix migration for adapter instances (#2167)
18cdb2d4f is described below

commit 18cdb2d4f671e328f7836dbc3d44abc6035fcb24
Author: Philipp Zehnder <te...@users.noreply.github.com>
AuthorDate: Mon Nov 13 09:08:49 2023 +0100

    bug(#2165): Fix migration for adapter instances (#2167)
---
 .../streampipes/service/core/migrations/v093/AdapterMigration.java    | 4 +++-
 .../core/migrations/v093/migrator/SpecificAdapterMigrator.java        | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/AdapterMigration.java b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/AdapterMigration.java
index 29fd205ab..0e488db65 100644
--- a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/AdapterMigration.java
+++ b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/AdapterMigration.java
@@ -111,7 +111,9 @@ public class AdapterMigration implements Migration {
     LOG.info("Performing backup of old models to database adapterinstance_backup");
 
     adaptersToMigrate.forEach(adapter -> {
-      new AdapterBackupWriter(adapterInstanceBackupClient, new MigrationHelpers()).writeBackup(adapter);
+      // Is required to keep the _rev field for the original object. This field must be removed for the backup
+      var copyAdapter = adapter.deepCopy();
+      new AdapterBackupWriter(adapterInstanceBackupClient, new MigrationHelpers()).writeBackup(copyAdapter);
     });
 
     LOG.info("Performing migration of adapters");
diff --git a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/migrator/SpecificAdapterMigrator.java b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/migrator/SpecificAdapterMigrator.java
index 0c5a7765a..7c77c2f25 100644
--- a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/migrator/SpecificAdapterMigrator.java
+++ b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/migrator/SpecificAdapterMigrator.java
@@ -44,6 +44,8 @@ public class SpecificAdapterMigrator implements AdapterMigrator {
     var adapterName = helpers.getAdapterName(adapter);
     var convertedAdapter = converter.convert(adapter);
 
+    LOG.info("Start migrating adapter {}", adapterName);
+
     couchDbClient.update(convertedAdapter);
 
     LOG.info("Successfully migrated adapter {}", adapterName);