This is an automated email from the ASF dual-hosted git repository. tuhaihe pushed a commit to branch REL_2_STABLE in repository https://gitbox.apache.org/repos/asf/cloudberry-backup.git
commit a0768517cd7c44f8e1ebe09082d052c5b47d7720 Author: woblerr <[email protected]> AuthorDate: Sun Mar 22 15:28:18 2026 +0300 Fix typo in flag names and function for backup clean and history clean commands. --- gpbackman/cmd/backup_clean.go | 14 +++++++------- gpbackman/cmd/constants.go | 2 +- gpbackman/cmd/history_clean.go | 16 ++++++++-------- gpbackman/gpbckpconfig/utils.go | 2 +- gpbackman/gpbckpconfig/utils_test.go | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gpbackman/cmd/backup_clean.go b/gpbackman/cmd/backup_clean.go index 1e610320..eb46ddba 100644 --- a/gpbackman/cmd/backup_clean.go +++ b/gpbackman/cmd/backup_clean.go @@ -19,7 +19,7 @@ var ( backupCleanAfterTimestamp string backupCleanPluginConfigFile string backupCleanBackupDir string - backupCleanOlderThenDays uint + backupCleanOlderThanDays uint backupCleanParallelProcesses int backupCleanCascade bool ) @@ -82,8 +82,8 @@ func init() { "delete all dependent backups", ) backupCleanCmd.PersistentFlags().UintVar( - &backupCleanOlderThenDays, - olderThenDaysFlagName, + &backupCleanOlderThanDays, + olderThanDaysFlagName, 0, "delete backup sets older than the given number of days", ) @@ -111,7 +111,7 @@ func init() { 1, "the number of parallel processes to delete local backups", ) - backupCleanCmd.MarkFlagsMutuallyExclusive(beforeTimestampFlagName, olderThenDaysFlagName, afterTimestampFlagName) + backupCleanCmd.MarkFlagsMutuallyExclusive(beforeTimestampFlagName, olderThanDaysFlagName, afterTimestampFlagName) } // These flag checks are applied only for backup-clean command. @@ -126,8 +126,8 @@ func doCleanBackupFlagValidation(flags *pflag.FlagSet) { } beforeTimestamp = backupCleanBeforeTimestamp } - if flags.Changed(olderThenDaysFlagName) { - beforeTimestamp = gpbckpconfig.GetTimestampOlderThen(backupCleanOlderThenDays) + if flags.Changed(olderThanDaysFlagName) { + beforeTimestamp = gpbckpconfig.GetTimestampOlderThan(backupCleanOlderThanDays) } // If after-timestamp flag is specified and have correct values. if flags.Changed(afterTimestampFlagName) { @@ -172,7 +172,7 @@ func doCleanBackupFlagValidation(flags *pflag.FlagSet) { } } if beforeTimestamp == "" && afterTimestamp == "" { - gplog.Error("%s", textmsg.ErrorTextUnableValidateValue(textmsg.ErrorValidationValue(), olderThenDaysFlagName, beforeTimestampFlagName, afterTimestampFlagName)) + gplog.Error("%s", textmsg.ErrorTextUnableValidateValue(textmsg.ErrorValidationValue(), olderThanDaysFlagName, beforeTimestampFlagName, afterTimestampFlagName)) execOSExit(exitErrorCode) } } diff --git a/gpbackman/cmd/constants.go b/gpbackman/cmd/constants.go index 28a3b209..0dce0aa3 100644 --- a/gpbackman/cmd/constants.go +++ b/gpbackman/cmd/constants.go @@ -26,7 +26,7 @@ const ( failedFlagName = "failed" cascadeFlagName = "cascade" forceFlagName = "force" - olderThenDaysFlagName = "older-than-days" + olderThanDaysFlagName = "older-than-days" beforeTimestampFlagName = "before-timestamp" afterTimestampFlagName = "after-timestamp" typeFlagName = "type" diff --git a/gpbackman/cmd/history_clean.go b/gpbackman/cmd/history_clean.go index dc62d5d6..473bf334 100644 --- a/gpbackman/cmd/history_clean.go +++ b/gpbackman/cmd/history_clean.go @@ -14,7 +14,7 @@ import ( // Flags for the gpbackman history-clean command (historyCleanCmd) var ( historyCleanBeforeTimestamp string - historyCleanOlderThenDays uint + historyCleanOlderThanDays uint ) var historyCleanCmd = &cobra.Command{ @@ -43,8 +43,8 @@ If the --history-db option is not specified, the history database will be search func init() { rootCmd.AddCommand(historyCleanCmd) historyCleanCmd.PersistentFlags().UintVar( - &historyCleanOlderThenDays, - olderThenDaysFlagName, + &historyCleanOlderThanDays, + olderThanDaysFlagName, 0, "delete information about backups older than the given number of days", ) @@ -54,10 +54,10 @@ func init() { "", "delete information about backups older than the given timestamp", ) - historyCleanCmd.MarkFlagsMutuallyExclusive(beforeTimestampFlagName, olderThenDaysFlagName) + historyCleanCmd.MarkFlagsMutuallyExclusive(beforeTimestampFlagName, olderThanDaysFlagName) } -// These flag checks are applied only for backup-clean command. +// These flag checks are applied only for history-clean command. func doCleanHistoryFlagValidation(flags *pflag.FlagSet) { var err error // If before-timestamp are specified and have correct values. @@ -69,11 +69,11 @@ func doCleanHistoryFlagValidation(flags *pflag.FlagSet) { } beforeTimestamp = historyCleanBeforeTimestamp } - if flags.Changed(olderThenDaysFlagName) { - beforeTimestamp = gpbckpconfig.GetTimestampOlderThen(historyCleanOlderThenDays) + if flags.Changed(olderThanDaysFlagName) { + beforeTimestamp = gpbckpconfig.GetTimestampOlderThan(historyCleanOlderThanDays) } if beforeTimestamp == "" { - gplog.Error("%s", textmsg.ErrorTextUnableValidateValue(textmsg.ErrorValidationValue(), olderThenDaysFlagName, beforeTimestampFlagName)) + gplog.Error("%s", textmsg.ErrorTextUnableValidateValue(textmsg.ErrorValidationValue(), olderThanDaysFlagName, beforeTimestampFlagName)) execOSExit(exitErrorCode) } } diff --git a/gpbackman/gpbckpconfig/utils.go b/gpbackman/gpbckpconfig/utils.go index 55954966..ef5e07bf 100644 --- a/gpbackman/gpbckpconfig/utils.go +++ b/gpbackman/gpbckpconfig/utils.go @@ -23,7 +23,7 @@ func CheckTimestamp(timestamp string) error { return nil } -func GetTimestampOlderThen(value uint) string { +func GetTimestampOlderThan(value uint) string { return time.Now().AddDate(0, 0, -int(value)).Format(Layout) } diff --git a/gpbackman/gpbckpconfig/utils_test.go b/gpbackman/gpbckpconfig/utils_test.go index 0703194c..825f2a74 100644 --- a/gpbackman/gpbckpconfig/utils_test.go +++ b/gpbackman/gpbckpconfig/utils_test.go @@ -121,10 +121,10 @@ var _ = Describe("utils tests", func() { }) }) - Describe("GetTimestampOlderThen", func() { + Describe("GetTimestampOlderThan", func() { It("returns timestamp within expected range", func() { input := uint(1) - got := GetTimestampOlderThen(input) + got := GetTimestampOlderThan(input) parsedTime, err := time.ParseInLocation(Layout, got, time.Now().Location()) Expect(err).ToNot(HaveOccurred()) now := time.Now() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
