MAINT try alternate migration approach

.github/workflows/test-migration.yaml

@@ -40,9 +40,9 @@ jobs:
           - standard
           - standard-with-dr
           - large
-            # - extra-large
+          - extra-large
           - large-with-dr
-            # - extra-large-with-dr
+          - extra-large-with-dr
         version: [2021.7.9, 2023.8.2, 2025.2.0]
         image: [almalinux-cloud/almalinux-8]
         include:

plans/migrate.pp

@@ -14,7 +14,15 @@
   Peadm::SingleTargetSpec $new_primary_host,
   Optional[String] $upgrade_version = undef,
   Optional[Peadm::SingleTargetSpec] $replica_host = undef,
+  Optional[Peadm::SingleTargetSpec] $primary_postgresql_host = undef,
+  Optional[Peadm::SingleTargetSpec] $replica_postgresql_host = undef,
 ) {
+  out::message("old_primary_host: ${old_primary_host}")
+  out::message("new_primary_host: ${new_primary_host}")
+  out::message("upgrade_version: ${upgrade_version}")
+  out::message("replica_host: ${replica_host}")
+  out::message("primary_postgresql_host: ${primary_postgresql_host}")
+  out::message("replica_postgresql_host: ${replica_postgresql_host}")
   # pre-migration checks
   out::message('This plan is a work in progress and it is not recommended to be used until it is fully implemented and supported')
   peadm::assert_supported_bolt_version()
@@ -26,7 +34,9 @@
   $all_hosts = peadm::flatten_compact([
     $old_primary_host,
     $new_primary_host,
-    $replica_host ? { undef => [], default => [$replica_host] }
+    $replica_host ? { undef => [], default => [$replica_host] },
+    $primary_postgresql_host ? { undef => [], default => [$primary_postgresql_host] },
+    $replica_postgresql_host ? { undef => [], default => [$replica_postgresql_host] }
   ].flatten)
   run_command('hostname', $all_hosts)  # verify can connect to targets
 
@@ -67,6 +77,9 @@
 
   run_plan('peadm::install', {
       primary_host                => $new_primary_host,
+      replica_host                => $replica_host,
+      primary_postgresql_host     => $primary_postgresql_host,
+      replica_postgresql_host     => $replica_postgresql_host,
       console_password            => $old_primary_password,
       code_manager_auto_configure => true,
       download_mode               => 'direct',
@@ -114,13 +127,6 @@
     out::message('No nodes to purge from old configuration')
   }
 
-  if $replica_host {
-    run_plan('peadm::add_replica', {
-        primary_host => $new_primary_host,
-        replica_host => $replica_host,
-    })
-  }
-
   if $upgrade_version and $upgrade_version != '' and !empty($upgrade_version) {
     run_plan('peadm::upgrade', {
         primary_host                => $new_primary_host,

plans/restore.pp

@@ -78,9 +78,12 @@
         undef   => $primary_target,
         default => peadm::get_targets(getvar('cluster.params.primary_postgresql_host'), 1),
       },
-      getvar('cluster.params.replica_postgresql_host') ? {
-        undef   => $replica_target,
-        default => peadm::get_targets(getvar('cluster.params.replica_postgresql_host'), 1),
+      ($restore_type != 'migration') ? {
+        true    => getvar('cluster.params.replica_postgresql_host') ? {
+          undef   => $replica_target,
+          default => peadm::get_targets(getvar('cluster.params.replica_postgresql_host'), 1),
+        },
+        default => [],
       },
   ])
 

spec/acceptance/peadm_spec/plans/test_migration.pp

@@ -30,6 +30,8 @@
     new_primary_host => $new_primary_target,
     upgrade_version => $upgrade_version,
     replica_host => $new_replica_target,
+    primary_postgresql_host => $new_primary_postgresql_target,
+    replica_postgresql_host => $new_replica_postgresql_target,
   )
 
   # run infra status on the new primary