From 9f48acf20080c8d893f3122c72d708e801281962 Mon Sep 17 00:00:00 2001 From: lukeman Date: Thu, 29 Aug 2024 20:12:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86issue=EF=BC=9Ags=5Fprobackup?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E9=83=A8=E5=88=86=E6=89=93=E5=8D=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=9C=80=E5=B0=86oss=E4=BF=AE=E6=94=B9=E4=B8=BAs3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bin/pg_probackup/configure.cpp | 4 ++-- src/bin/pg_probackup/delete.cpp | 2 +- src/bin/pg_probackup/init.cpp | 2 +- src/bin/pg_probackup/merge.cpp | 2 +- src/bin/pg_probackup/oss/backup.cpp | 2 +- src/bin/pg_probackup/oss/oss_operator.cpp | 4 ++-- src/bin/pg_probackup/pg_probackupb.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_probackup/configure.cpp b/src/bin/pg_probackup/configure.cpp index 2d6d0df47..67a640b3f 100644 --- a/src/bin/pg_probackup/configure.cpp +++ b/src/bin/pg_probackup/configure.cpp @@ -43,7 +43,7 @@ static void show_configure_json(ConfigOption *opt); #define OPTION_COMPRESS_GROUP "Compression parameters" #define OPTION_REMOTE_GROUP "Remote access parameters" #define OPTION_DSS_GROUP "DSS connect parameters" -#define OPTION_OSS_GROUP "OSS connect parameters" +#define OPTION_OSS_GROUP "S3 connect parameters" /* * Short name should be non-printable ASCII character. @@ -602,7 +602,7 @@ readInstanceConfigFile(const char *instance_name) 'i', 235, "instance-id", &instance->dss.instance_id, SOURCE_CMD, (OptionSource)0, OPTION_DSS_GROUP, 0, option_get_value }, - /* OSS options */ + /* S3 options */ { 's', 236, "access-id", &instance_config.oss.access_id, SOURCE_CMD, (OptionSource)0, diff --git a/src/bin/pg_probackup/delete.cpp b/src/bin/pg_probackup/delete.cpp index cd5541c09..05f55a75e 100644 --- a/src/bin/pg_probackup/delete.cpp +++ b/src/bin/pg_probackup/delete.cpp @@ -187,7 +187,7 @@ void do_retention(void) backup_merged = false; if (current.media_type == MEDIA_TYPE_OSS) { - elog(ERROR, "Not supported when specifying OSS options"); + elog(ERROR, "Not supported when specifying S3 options"); } /* Get a complete list of backups. */ diff --git a/src/bin/pg_probackup/init.cpp b/src/bin/pg_probackup/init.cpp index ba76730b6..99613bea2 100644 --- a/src/bin/pg_probackup/init.cpp +++ b/src/bin/pg_probackup/init.cpp @@ -83,7 +83,7 @@ do_add_instance(InstanceConfig *instance) Oss::Oss* oss = getOssClient(); char* bucket_name = getBucketName(); if (!oss->BucketExists(bucket_name)) { - elog(ERROR, "Bucket '%s' does not exist on OSS, please create it first.", bucket_name); + elog(ERROR, "Bucket '%s' does not exist on S3, please create it first.", bucket_name); } } diff --git a/src/bin/pg_probackup/merge.cpp b/src/bin/pg_probackup/merge.cpp index b29c13067..ca0b6c4f8 100644 --- a/src/bin/pg_probackup/merge.cpp +++ b/src/bin/pg_probackup/merge.cpp @@ -123,7 +123,7 @@ do_merge(time_t backup_id) if (current.media_type == MEDIA_TYPE_OSS) { - elog(ERROR, "Not supported when specifying OSS options"); + elog(ERROR, "Not supported when specifying S3 options"); } if (backup_id == INVALID_BACKUP_ID) diff --git a/src/bin/pg_probackup/oss/backup.cpp b/src/bin/pg_probackup/oss/backup.cpp index 5ce177198..5797d2039 100644 --- a/src/bin/pg_probackup/oss/backup.cpp +++ b/src/bin/pg_probackup/oss/backup.cpp @@ -263,7 +263,7 @@ void backupFiles(FileAppender* appender, backup_files_arg* arg) time(&end_time); pretty_time_interval(difftime(end_time, start_time), pretty_time, lengthof(pretty_time)); - elog(INFO, "Backup files are backuped to oss, time elapsed: %s", pretty_time); + elog(INFO, "Backup files are backuped to s3, time elapsed: %s", pretty_time); } diff --git a/src/bin/pg_probackup/oss/oss_operator.cpp b/src/bin/pg_probackup/oss/oss_operator.cpp index cf0e93be8..21268ed9f 100644 --- a/src/bin/pg_probackup/oss/oss_operator.cpp +++ b/src/bin/pg_probackup/oss/oss_operator.cpp @@ -262,7 +262,7 @@ char* getBucketName() { char* bucket_name = instance_config.oss.access_bucket; if (bucket_name == NULL) { - elog(ERROR, "Required parameter not specified: OSS(--bucket_name)"); + elog(ERROR, "Required parameter not specified: S3(--bucket_name)"); } return bucket_name; } @@ -282,7 +282,7 @@ Oss::Oss* getOssClient() const char* access_bucket = instance_config.oss.access_bucket; if (!endpoint || !access_key || !secret_key || !access_bucket) { elog(ERROR, - "Required parameter not specified: OSS(--endpoint, --access_bucket, --access_id or --access_key)"); + "Required parameter not specified: S3(--endpoint, --access_bucket, --access_id or --access_key)"); } oss_client = new Oss::Oss(endpoint, access_key, secret_key, region); } diff --git a/src/bin/pg_probackup/pg_probackupb.h b/src/bin/pg_probackup/pg_probackupb.h index 9144f8fee..9d17e1bc0 100644 --- a/src/bin/pg_probackup/pg_probackupb.h +++ b/src/bin/pg_probackup/pg_probackupb.h @@ -306,7 +306,7 @@ struct pgBackup /* media type */ MediaType media_type; - /* local or oss */ + /* local or s3 */ oss_status_t oss_status; /* sender context */ SenderCxt* sender_cxt;