more

Author: onurctirtir

src/test/regress/pg_regress_multi.pl

@@ -442,6 +442,8 @@ sub should_use_specific_version
 }
 
 my $n1OldVersionBinDir = "";
+my @n1OldExtensionFiles = ();
+my $n1ExtensionBackupDir = catfile($TMP_CHECKDIR, "n1_extension_backup_current");
 
 # Prepare an isolated PostgreSQL installation directory for N-1 nodes and
 # set the bindir used by those nodes.
@@ -476,9 +478,6 @@ sub prepare_n1_isolated_pg_home_dir
 
     my $oldPkglibdir = `$n1OldVersionBinDir/pg_config --pkglibdir`;
     chomp $oldPkglibdir;
-    my $oldSharedir = `$n1OldVersionBinDir/pg_config --sharedir`;
-    chomp $oldSharedir;
-
     # accept both .../lib and parent layouts for CITUSLIBDIR
     my @libSearchDirs = ($citusLibdir, catfile($citusLibdir, "lib"));
     my @libFiles = ();
@@ -510,15 +509,62 @@ sub prepare_n1_isolated_pg_home_dir
 
     if (@extensionFiles)
     {
-        system("cp", ("-f", @extensionFiles, catfile($oldSharedir, "extension"))) == 0
-            or die "Could not copy Citus extension files into " . catfile($oldSharedir, "extension");
+        @n1OldExtensionFiles = @extensionFiles;
     }
     else
     {
         die "Could not find Citus extension files anywhere under $citusLibdir";
     }
 }
 
+sub backup_current_extension_files_for_n1
+{
+    my $currentSharedir = `$pgConfig --sharedir`;
+    chomp $currentSharedir;
+    my $currentExtensionDir = catfile($currentSharedir, "extension");
+
+    my @currentFiles = glob(catfile($currentExtensionDir, "citus*"));
+    return unless @currentFiles;
+
+    if (-e $n1ExtensionBackupDir)
+    {
+        remove_tree($n1ExtensionBackupDir) or die "Could not remove extension backup dir $n1ExtensionBackupDir";
+    }
+
+    make_path($n1ExtensionBackupDir) or die "Could not create extension backup dir $n1ExtensionBackupDir";
+    system("cp", ("-f", @currentFiles, $n1ExtensionBackupDir)) == 0
+        or die "Could not backup current Citus extension files into $n1ExtensionBackupDir";
+}
+
+sub apply_old_extension_files_for_n1
+{
+    return unless @n1OldExtensionFiles;
+
+    backup_current_extension_files_for_n1();
+
+    my $currentSharedir = `$pgConfig --sharedir`;
+    chomp $currentSharedir;
+    my $currentExtensionDir = catfile($currentSharedir, "extension");
+
+    system("cp", ("-f", @n1OldExtensionFiles, $currentExtensionDir)) == 0
+        or die "Could not copy Citus extension files into $currentExtensionDir";
+}
+
+sub restore_current_extension_files_after_n1
+{
+    return unless -d $n1ExtensionBackupDir;
+
+    my @backupFiles = glob(catfile($n1ExtensionBackupDir, "citus*"));
+    return unless @backupFiles;
+
+    my $currentSharedir = `$pgConfig --sharedir`;
+    chomp $currentSharedir;
+    my $currentExtensionDir = catfile($currentSharedir, "extension");
+
+    system("cp", ("-f", @backupFiles, $currentExtensionDir)) == 0
+        or die "Could not restore current Citus extension files into $currentExtensionDir";
+}
+
 sub node_bindir
 {
     my ($nodeType, $workerIndex) = @_;
@@ -988,6 +1034,7 @@ ()
 {
     my $saved_status = $?;
 
+    restore_current_extension_files_after_n1();
     restore_original(catfile($psqlLibdir, "citus.so")) if defined $psqlLibdir;
 
     if (!$conninfo && $serversAreShutdown eq "FALSE")
@@ -1245,6 +1292,15 @@ END
         ($firstLib =~ m/^citus$/)
             or die "Could not find citus as first library in shared_preload_libraries on worker $port.";
 
+        if (should_use_alternative_libdir("worker", $workeroff))
+        {
+            apply_old_extension_files_for_n1();
+        }
+        else
+        {
+            restore_current_extension_files_after_n1();
+        }
+
         for my $extension (@extensions)
         {
             if ($extension eq "citus" && should_use_specific_version("worker", $workeroff))
@@ -1279,6 +1335,11 @@ END
                 or die "Could not create foreign data wrapper $fdw on worker port $port";
         }
     }
+
+    if (!should_use_alternative_libdir("coordinator"))
+    {
+        restore_current_extension_files_after_n1();
+    }
 }
 else
 {
@@ -1335,9 +1396,26 @@ END
 # explicit VERSION.
 if (!$conninfo && should_use_specific_version("coordinator"))
 {
+    if (should_use_alternative_libdir("coordinator"))
+    {
+        apply_old_extension_files_for_n1();
+    }
+
     create_coordinator_database_and_extensions();
+
+    if (should_use_alternative_libdir("coordinator"))
+    {
+        restore_current_extension_files_after_n1();
+    }
+
     push(@arguments, "--use-existing");
 }
+elsif (!$conninfo && should_use_alternative_libdir("coordinator"))
+{
+    # pg_regress will create coordinator extension; ensure it sees old control/sql
+    # files while coordinator is running old Citus library.
+    apply_old_extension_files_for_n1();
+}
 
 my $startTime = time();