Look in more directories for restore binaries

This makes restores compatible with images from other distros.

Issue: PGO-864

Author: cbandy

internal/controller/postgrescluster/pgbackrest.go

@@ -1270,7 +1270,7 @@ func (r *Reconciler) reconcileRestoreJob(ctx context.Context,
 
 	// NOTE (andrewlecuyer): Forcing users to put each argument separately might prevent the need
 	// to do any escaping or use eval.
-	cmd := pgbackrest.RestoreCommand(pgdata, params, strings.Join(opts, " "))
+	cmd := pgbackrest.RestoreCommand(cluster.Spec.PostgresVersion, pgdata, params, strings.Join(opts, " "))
 
 	// create the volume resources required for the postgres data directory
 	dataVolumeMount := postgres.DataVolumeMount()

internal/pgbackrest/config.go

@@ -212,7 +212,7 @@ func MakePGBackrestLogDir(template *corev1.PodTemplateSpec,
 //   - Renames the data directory as needed to bootstrap the cluster using the restored database.
 //     This ensures compatibility with the "existing" bootstrap method that is included in the
 //     Patroni config when bootstrapping a cluster using an existing data directory.
-func RestoreCommand(pgdata string, params *postgres.ParameterSet, args ...string) []string {
+func RestoreCommand(postgresVersion int32, pgdata string, params *postgres.ParameterSet, args ...string) []string {
 	ps := params.DeepCopy()
 	ps.Add("data_directory", pgdata)
 
@@ -266,6 +266,7 @@ func RestoreCommand(pgdata string, params *postgres.ParameterSet, args ...string
 
 	script := strings.Join([]string{
 		`declare -r PGDATA="$1" opts="$2"; export PGDATA PGHOST`,
+		postgres.ShellPath(postgresVersion),
 
 		// Remove any "postmaster.pid" file leftover from a prior failure.
 		`rm -f "${PGDATA}/postmaster.pid"`,

internal/pgbackrest/config_test.go

@@ -790,11 +790,14 @@ func TestReloadCommandPrettyYAML(t *testing.T) {
 func TestRestoreCommand(t *testing.T) {
 	shellcheck := require.ShellCheck(t)
 
-	command := RestoreCommand("/pgdata/pg13", postgres.NewParameterSet(), "--repo=1")
+	command := RestoreCommand(19, "/pgdata/pg13", postgres.NewParameterSet(), "--repo=1")
 
 	assert.DeepEqual(t, command[:3], []string{"bash", "-ceu", "--"})
 	assert.Assert(t, len(command) > 3)
 
+	assert.Assert(t, cmp.Contains(command[3], "/usr/pgsql-19/bin"),
+		"expected path to PostgreSQL binaries")
+
 	dir := t.TempDir()
 	file := filepath.Join(dir, "script.bash")
 	assert.NilError(t, os.WriteFile(file, []byte(command[3]), 0o600))
@@ -807,7 +810,7 @@ func TestRestoreCommand(t *testing.T) {
 func TestRestoreCommandPrettyYAML(t *testing.T) {
 	assert.Assert(t,
 		cmp.MarshalContains(
-			RestoreCommand("/dir", postgres.NewParameterSet(), "--options"),
+			RestoreCommand(9, "/dir", postgres.NewParameterSet(), "--options"),
 			"\n- |",
 		),
 		"expected literal block scalar")
@@ -819,7 +822,7 @@ func TestRestoreCommandTDE(t *testing.T) {
 
 	assert.Assert(t,
 		cmp.MarshalContains(
-			RestoreCommand("/dir", params, "--options"),
+			RestoreCommand(20, "/dir", params, "--options"),
 			"encryption_key_command = 'whatever'",
 		),
 		"expected encryption_key_command setting")