[pgmoneta#1089] fix the integration testing

Signed-off-by: Amr-Shams <amr.shams2015.as@gmail.com>

Author: Amr-Shams

.github/workflows/ci.yml

@@ -167,13 +167,13 @@ jobs:
           path: /tmp/pgmoneta-test/log
           retention-days: 90
 
-  # storage:
-  #   needs: [format-check, build-linux]
-  #   strategy:
-  #     matrix:
-  #       platform: [ubuntu-latest]
-  #       pg_version: ["14"]
-  #   uses: ./.github/workflows/storage.yml
-  #   with:
-  #     platform: ${{ matrix.platform }}
-  #     pg_version: ${{ matrix.pg_version }}
+  storage:
+    needs: [format-check, build-linux]
+    strategy:
+      matrix:
+        platform: [ubuntu-latest]
+        pg_version: ["17"]
+    uses: ./.github/workflows/storage.yml
+    with:
+      platform: ${{ matrix.platform }}
+      pg_version: ${{ matrix.pg_version }}

.github/workflows/storage.yml

@@ -6,7 +6,7 @@ on:
       pg_version:
         description: PostgreSQL version to test
         required: true
-        default: "14"
+        default: "17"
         type: string
       platform:
         description: GitHub runner platform
@@ -18,7 +18,7 @@ on:
       pg_version:
         description: PostgreSQL version to test
         required: true
-        default: "14"
+        default: "17"
         type: string
       platform:
         description: GitHub runner platform
@@ -366,35 +366,51 @@ jobs:
 
       - name: Test S3 restore
         run: |
+          set -euo pipefail
+
           CLI="./build/src/pgmoneta-cli -c ${{ env.BASE_DIR }}/conf/pgmoneta_cli.conf"
           LABEL="${{ steps.backup.outputs.backup_label }}"
-          UPLOAD_COUNT="${{ steps.list.outputs.upload_count }}"
+          RESTORE_ROOT="${{ env.BASE_DIR }}/restore/$LABEL"
+
+          echo "start restore test $LABEL"
 
-          if ! $CLI s3 restore primary "$LABEL"; then
-            echo "FAIL: restore command returned error"
+          if ! $CLI s3 restore primary "$LABEL" "$RESTORE_ROOT"; then
+            echo "fail: restore cmd error"
             cat ${{ env.LOG_DIR }}/pgmoneta.log
             exit 1
           fi
-          sleep 10
 
-          RESTORE_DIR="${{ env.BASE_DIR }}/backup/primary/backup/$LABEL"
+          sleep 5
+
+          RESTORE_DIR="$RESTORE_ROOT/primary-$LABEL"
 
-          if [ ! -d "$RESTORE_DIR/data" ]; then
-            echo "FAIL: restored data directory not found at $RESTORE_DIR/data"
+          if [ ! -d "$RESTORE_DIR" ]; then
+            echo "fail: restore dir missing $RESTORE_DIR"
             cat ${{ env.LOG_DIR }}/pgmoneta.log
             exit 1
           fi
 
-          RESTORED_COUNT=$(find "$RESTORE_DIR" -type f | wc -l)
+          test -f "$RESTORE_DIR/PG_VERSION" || { echo "fail: no PG_VERSION"; exit 1; }
+          test -d "$RESTORE_DIR/base" || { echo "fail: no base/"; exit 1; }
+          test -d "$RESTORE_DIR/global" || { echo "fail: no global/"; exit 1; }
 
-          if [ "$RESTORED_COUNT" -ne "$UPLOAD_COUNT" ]; then
-            echo "FAIL: file count mismatch (uploaded: $UPLOAD_COUNT, restored: $RESTORED_COUNT)"
-            echo "Restored files:"
-            find "$RESTORE_DIR" -type f
+          echo "structure ok"
+
+          FILES=$(find "$RESTORE_DIR" -type f | wc -l)
+
+          if [ "$FILES" -eq 0 ]; then
+            echo "fail: empty restore"
             exit 1
           fi
 
-          echo "Restored files: $RESTORED_COUNT (matches upload count: $UPLOAD_COUNT)"
+          echo "files restored: $FILES"
+          if [ "$FILES" -lt $((UPLOAD_COUNT - 3)) ]; then
+            echo "FAIL: file count mismatch (uploaded: $UPLOAD_COUNT, restored: $FILES)"
+            echo "Restored files:"
+            find "$RESTORE_DIR" -type f
+          exit 1
+
+          echo "restore test ok" 
 
       - name: Test S3 delete
         run: |

doc/CLI.md

@@ -155,27 +155,26 @@ pgmoneta-cli restore primary newest timeline=2 /tmp
 
 ## s3 restore
 
-Download a backup from S3 to the local backup directory
+Restore a backup directly from S3 to a target directory.
 
-This subcommand downloads a backup from S3 storage and makes it available locally. The flow is:
+This subcommand stages a backup from S3 locally and then runs the normal restore workflow. The flow is:
 
 * Download `backup.sha512`, `backup.info`, and `backup.manifest` from S3
 * Verify `backup.info` integrity using the SHA512 checksum
 * Download all data files listed in the manifest, applying the correct compression and encryption extensions
-* Atomically move the downloaded backup into the local backup directory
-
-After `s3 restore` completes, the backup appears in `status details` and can be restored using `pgmoneta-cli restore`.
+* Restore the staged backup into the requested target directory using the standard restore workflow
+* Remove the staged local copy after a successful restore
 
 Command
 
 ```sh
-pgmoneta-cli s3 restore <server> <timestamp>
+pgmoneta-cli s3 restore <server> <timestamp> [[current|name=X|xid=X|lsn=X|time=X|inclusive=X|timeline=X|action=X|primary|replica],*] <directory>
 ```
 
 Example
 
 ```sh
-pgmoneta-cli s3 restore primary 20260316000957
+pgmoneta-cli s3 restore primary 20260316000957 /tmp
 ```
 
 ## verify
@@ -549,16 +548,17 @@ pgmoneta-cli s3 delete primary wal/
 
 ### s3 restore
 
-Download a backup from S3 to the local backup directory.
+Restore a backup directly from S3 into a target directory.
 
 - Downloads and verifies `backup.info` integrity via SHA512
 - Downloads all data files with correct compression/encryption extensions
-- The backup becomes available for `pgmoneta-cli restore`
+- Restores the staged backup into the requested directory
+- Cleans up the staged local copy after success
 
 Examples
 
 ```sh
-pgmoneta-cli s3 restore primary 20260316000957
+pgmoneta-cli s3 restore primary 20260316000957 /tmp
 ```
 ## clear
 

doc/S3.md

@@ -139,6 +139,14 @@ pgmoneta-cli s3 delete primary <prefix>
 
 `pgmoneta-cli s3 delete` removes all objects under `<s3_base_dir>/<server>/backup/<prefix>`.
 
+Restore a backup from S3:
+
+```sh
+pgmoneta-cli s3 restore primary <label> [position] <directory>
+```
+
+`pgmoneta-cli s3 restore` downloads the backup metadata and data files from S3, stages them locally, and then restores the backup into the requested target directory using the normal restore workflow.
+
 ## Per-Server Configuration
 
 All S3 configuration settings can be specified within a server's configuration section. This allows you to use different S3 buckets, credentials, or even regions for different PostgreSQL servers.

doc/manual/en/05-cli.md

@@ -173,25 +173,24 @@ pgmoneta-cli restore primary newest timeline=2 /tmp
 
 Download a backup from S3 to the local backup directory
 
-This subcommand downloads a backup from S3 storage and makes it available locally. The flow is:
+This subcommand stages a backup from S3 locally and then runs the normal restore workflow. The flow is:
 
 * Download `backup.sha512`, `backup.info`, and `backup.manifest` from S3
 * Verify `backup.info` integrity using the SHA512 checksum
 * Download all data files listed in the manifest, applying the correct compression and encryption extensions
-* Atomically move the downloaded backup into the local backup directory
-
-After `s3 restore` completes, the backup appears in `status details` and can be restored using `pgmoneta-cli restore`.
+* Restore the staged backup into the requested target directory using the standard restore workflow
+* Remove the staged local copy after a successful restore
 
 Command
 
 ``` sh
-pgmoneta-cli s3 restore <server> <timestamp>
+pgmoneta-cli s3 restore <server> <timestamp> [[current|name=X|xid=X|lsn=X|time=X|inclusive=X|timeline=X|action=X|primary|replica],*] <directory>
 ```
 
 Example
 
 ``` sh
-pgmoneta-cli s3 restore primary 20260316000957
+pgmoneta-cli s3 restore primary 20260316000957 /tmp
 ```
 
 ## verify
@@ -587,16 +586,17 @@ pgmoneta-cli s3 delete primary wal/
 
 ### s3 restore
 
-Download a backup from S3 to the local backup directory.
+Restore a backup directly from S3 into a target directory.
 
 - Downloads and verifies `backup.info` integrity via SHA512
 - Downloads all data files with correct compression/encryption extensions
-- The backup becomes available for `pgmoneta-cli restore`
+- Restores the staged backup into the requested directory
+- Cleans up the staged local copy after success
 
 Examples
 
 ``` sh
-pgmoneta-cli s3 restore primary 20260316000957
+pgmoneta-cli s3 restore primary 20260316000957 /tmp
 ```
 
 ## clear

doc/manual/en/09-restore.md

@@ -96,18 +96,15 @@ This command take the latest backup and all Write-Ahead Log (WAL) segments and r
 
 ## Restore from S3
 
-If your backups are stored in S3, you first need to download them to the local backup directory using `pgmoneta-cli s3 restore`, then restore normally.
+If your backups are stored in S3, you can restore them directly using `pgmoneta-cli s3 restore`.
 
-Step 1: Download the backup from S3
+Example:
 
 ```
-pgmoneta-cli s3 restore primary 20260316000957
+pgmoneta-cli s3 restore primary 20260316000957 /tmp
 ```
 
-This downloads the backup files from S3, verifies `backup.info` integrity via SHA512, and places the backup in the local backup directory.
-
-Step 2: Restore the backup
-
+This stages the backup files from S3, verifies `backup.info` integrity via SHA512, restores the backup into the requested target directory, and removes the staged local copy after success.
 ```
 pgmoneta-cli restore primary 20260316000957 current /tmp
 ```

doc/manual/en/17-s3.md

@@ -103,9 +103,9 @@ pgmoneta-cli s3 delete primary <prefix>
 Restore a backup from S3:
 
 ``` sh
-pgmoneta-cli s3 restore primary <label>
+pgmoneta-cli s3 restore primary <label> [position] <directory>
 ```
 
-`pgmoneta-cli s3 restore` downloads all files from S3 for the given backup label into the local backup directory.
+`pgmoneta-cli s3 restore` downloads all files from S3 for the given backup label, stages them locally, and restores the backup into the requested target directory using the standard restore workflow.
 
-Metadata files (`backup.info`, `backup.sha512`, `backup.manifest`) are downloaded as temporary files first, then renamed in order after all data files are restored. `backup.info` is renamed last and its presence marks a complete restore.
+Metadata files (`backup.info`, `backup.sha512`, `backup.manifest`) are downloaded as temporary files first. `backup.info` is verified before file download starts, then renamed into place so the staged backup metadata matches the downloaded objects before the restore workflow runs.

src/cli.c

@@ -122,7 +122,7 @@ static int backup(SSL* ssl, int socket, char* server, uint8_t compression, uint8
 static int list_backup(SSL* ssl, int socket, char* server, char* sort_order, uint8_t compression, uint8_t encryption, int32_t output_format);
 static int list_s3_objects(SSL* ssl, int socket, char* server, char* prefix, uint8_t compression, uint8_t encryption, int32_t output_format);
 static int delete_s3_objects(SSL* ssl, int socket, char* server, char* prefix, uint8_t compression, uint8_t encryption, int32_t output_format);
-static int restore_s3_objects(SSL* ssl, int socket, char* server, char* prefix, uint8_t compression, uint8_t encryption, int32_t output_format);
+static int restore_s3_objects(SSL* ssl, int socket, char* server, char* prefix, char* position, char* directory, uint8_t compression, uint8_t encryption, int32_t output_format);
 static int restore(SSL* ssl, int socket, char* server, char* backup_id, char* position, char* directory, uint8_t compression, uint8_t encryption, int32_t output_format);
 static int verify(SSL* ssl, int socket, char* server, char* backup_id, char* directory, char* files, uint8_t compression, uint8_t encryption, int32_t output_format);
 static int archive(SSL* ssl, int socket, char* server, char* backup_id, char* position, char* directory, uint8_t compression, uint8_t encryption, int32_t output_format);
@@ -277,7 +277,7 @@ struct pgmoneta_command command_table[] = {
     .log_message = "<s3 delete>"},
    {.command = "s3",
     .subcommand = "restore",
-    .accepted_argument_count = {1, 2},
+    .accepted_argument_count = {3, 4},
     .action = MANAGEMENT_S3_RESTORE,
     .deprecated = false,
     .log_message = "<s3 restore>"},
@@ -938,7 +938,14 @@ main(int argc, char** argv)
    }
    else if (parsed.cmd->action == MANAGEMENT_S3_RESTORE)
    {
-      exit_code = restore_s3_objects(s_ssl, socket, parsed.args[0], parsed.args[1], compression, encryption, output_format);
+      if (parsed.args[3])
+      {
+         exit_code = restore_s3_objects(s_ssl, socket, parsed.args[0], parsed.args[1], parsed.args[2], parsed.args[3], compression, encryption, output_format);
+      }
+      else
+      {
+         exit_code = restore_s3_objects(s_ssl, socket, parsed.args[0], parsed.args[1], NULL, parsed.args[2], compression, encryption, output_format);
+      }
    }
    else if (parsed.cmd->action == MANAGEMENT_RESTORE)
    {
@@ -1148,7 +1155,7 @@ help_s3(void)
    printf("Manage the s3\n");
    printf("  pgmoneta-cli s3 ls <server>\n");
    printf("  pgmoneta-cli s3 delete <server> <prefix>\n");
-   printf("  pgmoneta-cli s3 restore <server> <prefix> \n");
+   printf("  pgmoneta-cli s3 restore <server> <prefix> [[current|name=X|xid=X|lsn=X|time=X|inclusive=X|timeline=X|action=X|primary|replica],*] <directory>\n");
 }
 
 static void
@@ -1458,9 +1465,9 @@ delete_s3_objects(SSL* ssl, int socket, char* server, char* prefix, uint8_t comp
    return 1;
 }
 static int
-restore_s3_objects(SSL* ssl, int socket, char* server, char* prefix, uint8_t compression, uint8_t encryption, int32_t output_format)
+restore_s3_objects(SSL* ssl, int socket, char* server, char* prefix, char* position, char* directory, uint8_t compression, uint8_t encryption, int32_t output_format)
 {
-   if (pgmoneta_management_request_restore_s3_objects(ssl, socket, server, prefix, compression, encryption, output_format))
+   if (pgmoneta_management_request_restore_s3_objects(ssl, socket, server, prefix, position, directory, compression, encryption, output_format))
    {
       goto error;
    }

src/include/management.h

@@ -517,14 +517,16 @@ pgmoneta_management_request_delete_s3_objects(SSL* ssl, int socket, char* server
  * @param ssl The SSL connection
  * @param socket The socket descriptor
  * @param server The server
- * @param prefix The prefix to delete under the server backup path
+ * @param prefix The prefix to restore under the server backup path
+ * @param position The recovery target parameters
+ * @param directory The restore target directory
  * @param compression The compress method for wire protocol
  * @param encryption The encrypt method for wire protocol
  * @param output_format The output format
  * @return 0 upon success, otherwise 1
  */
 int
-pgmoneta_management_request_restore_s3_objects(SSL* ssl, int socket, char* server, char* prefix, uint8_t compression, uint8_t encryption, int32_t output_format);
+pgmoneta_management_request_restore_s3_objects(SSL* ssl, int socket, char* server, char* prefix, char* position, char* directory, uint8_t compression, uint8_t encryption, int32_t output_format);
 
 /**
  * Create a restore request

src/libpgmoneta/management.c

@@ -198,7 +198,7 @@ pgmoneta_management_request_delete_s3_objects(SSL* ssl, int socket, char* server
 }
 
 int
-pgmoneta_management_request_restore_s3_objects(SSL* ssl, int socket, char* server, char* prefix, uint8_t compression, uint8_t encryption, int32_t output_format)
+pgmoneta_management_request_restore_s3_objects(SSL* ssl, int socket, char* server, char* prefix, char* position, char* directory, uint8_t compression, uint8_t encryption, int32_t output_format)
 {
    struct json* j = NULL;
    struct json* request = NULL;
@@ -215,6 +215,8 @@ pgmoneta_management_request_restore_s3_objects(SSL* ssl, int socket, char* serve
 
    pgmoneta_json_put(request, MANAGEMENT_ARGUMENT_SERVER, (uintptr_t)server, ValueString);
    pgmoneta_json_put(request, MANAGEMENT_ARGUMENT_S3_PREFIX, (uintptr_t)prefix, ValueString);
+   pgmoneta_json_put(request, MANAGEMENT_ARGUMENT_POSITION, (uintptr_t)position, ValueString);
+   pgmoneta_json_put(request, MANAGEMENT_ARGUMENT_DIRECTORY, (uintptr_t)directory, ValueString);
 
    if (pgmoneta_management_write_json(ssl, socket, compression, encryption, j))
    {