You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by yj...@apache.org on 2026/03/17 22:04:47 UTC

(cloudberry) 01/01: Fix PostgresNode.pm for TAP tests on CBDB

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

yjhjstz pushed a commit to branch fix/in-place-tablespace-crashes
in repository https://gitbox.apache.org/repos/asf/cloudberry.git

commit 3766c20edd88c3b27931631708bcc833564c89b7
Author: Jianghua Yang <yj...@gmail.com>
AuthorDate: Wed Mar 18 06:04:09 2026 +0800

    Fix PostgresNode.pm for TAP tests on CBDB
    
    Two fixes:
    - Use TestLib::slurp_file instead of PostgreSQL::Test::Utils::slurp_file
      in adjust_conf(). PostgresNode.pm only imports TestLib, not
      PostgreSQL::Test::Utils, so the latter is undefined and causes
      t/101_restore_point_and_startup_pause to fail.
    
    - Replace cp with install -m 644 in enable_archiving() archive_command.
      coreutils 8.32 (Rocky 8, Ubuntu 22.04) uses copy_file_range() in cp
      which crashes on Docker overlayfs. install does not use
      copy_file_range(), avoiding the crash.
    
    Also add ic-recovery test suite to rocky8 and deb CI pipelines.
---
 .github/workflows/build-cloudberry-rocky8.yml | 3 +++
 .github/workflows/build-deb-cloudberry.yml    | 3 +++
 src/test/perl/PostgresNode.pm                 | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-cloudberry-rocky8.yml b/.github/workflows/build-cloudberry-rocky8.yml
index 2abf88060e3..f3a44fc7b28 100644
--- a/.github/workflows/build-cloudberry-rocky8.yml
+++ b/.github/workflows/build-cloudberry-rocky8.yml
@@ -339,6 +339,9 @@ jobs:
               },
               {"test":"ic-cbdb-parallel",
                "make_configs":["src/test/regress:installcheck-cbdb-parallel"]
+              },
+              {"test":"ic-recovery",
+               "make_configs":["src/test/recovery:installcheck"]
               }
             ]
           }'
diff --git a/.github/workflows/build-deb-cloudberry.yml b/.github/workflows/build-deb-cloudberry.yml
index 85d917b8ff0..3ba2e0cef89 100644
--- a/.github/workflows/build-deb-cloudberry.yml
+++ b/.github/workflows/build-deb-cloudberry.yml
@@ -254,6 +254,9 @@ jobs:
               },
               {"test":"ic-cbdb-parallel",
                "make_configs":["src/test/regress:installcheck-cbdb-parallel"]
+              },
+              {"test":"ic-recovery",
+               "make_configs":["src/test/recovery:installcheck"]
               }
             ]
           }'
diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
index 241ed8d49e8..e3010870f35 100644
--- a/src/test/perl/PostgresNode.pm
+++ b/src/test/perl/PostgresNode.pm
@@ -632,7 +632,7 @@ sub adjust_conf
 
     my $conffile = $self->data_dir . '/' . $filename;
 
-    my $contents = PostgreSQL::Test::Utils::slurp_file($conffile);
+    my $contents = TestLib::slurp_file($conffile);
     my @lines    = split(/\n/, $contents);
     my @result;
     my $eq = $skip_equals ? '' : '= ';
@@ -1220,7 +1220,7 @@ sub enable_archiving
 	my $copy_command =
 	  $TestLib::windows_os
 	  ? qq{copy "%p" "$path\\\\%f"}
-	  : qq{cp "%p" "$path/%f"};
+	  : qq{install -m 644 "%p" "$path/%f"};
 
 	# Enable archive_mode and archive_command on node
 	$self->append_conf(


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org