Update the information fields for CloudberryDB
Update the fields on CloudberryDB to improve the experience when users
run the gpbackup tool.
diff --git a/backup/backup.go b/backup/backup.go
index 8a292f7..8c0b649 100644
--- a/backup/backup.go
+++ b/backup/backup.go
@@ -50,7 +50,7 @@
timestamp := history.CurrentTimestamp()
createBackupLockFile(timestamp)
initializeConnectionPool(timestamp)
- gplog.Info("Greenplum Database Version = %s", connectionPool.Version.VersionString)
+ gplog.Info("Cloudberry Database Version = %s", connectionPool.Version.VersionString)
gplog.Info("Starting backup of database %s", MustGetFlagString(options.DBNAME))
opts, err := options.NewOptions(cmdFlags)
diff --git a/end_to_end/locks_test.go b/end_to_end/locks_test.go
index c7d14b6..b559361 100644
--- a/end_to_end/locks_test.go
+++ b/end_to_end/locks_test.go
@@ -289,7 +289,7 @@
})
It("runs gpbackup and defers 2 deadlocked tables to main worker", func() {
if true {
- Skip(fmt.Sprintf("This test is not needed for old backup versions or GPDB versions < %s", backup.SNAPSHOT_GPDB_MIN_VERSION))
+ Skip(fmt.Sprintf("This test is not needed for old backup versions or CloudberryDB versions < %s", backup.SNAPSHOT_GPDB_MIN_VERSION))
}
// Acquire AccessExclusiveLock on public.foo to block gpbackup when it attempts
// to grab AccessShareLocks before its metadata dump section.
diff --git a/gppkg/gpbackup_tools.spec.in b/gppkg/gpbackup_tools.spec.in
index dd03ee3..f7b0bd9 100644
--- a/gppkg/gpbackup_tools.spec.in
+++ b/gppkg/gpbackup_tools.spec.in
@@ -1,7 +1,7 @@
Name: gpbackup_tools_%{operating_system}
Version: %{rpm_version}
Release: 1
-Summary: Backup and restore utilities for Greenplum
+Summary: Backup and restore utilities for CloudberryDB
License: Pivotal Software EULA
Source0: bin_gpbackup.tar.gz
BuildArch: x86_64
@@ -11,7 +11,7 @@
AutoReqProv: no
%description
-Backup and restore utilities for Greenplum
+Backup and restore utilities for CloudberryDB
%prep
%setup -c -q -T -D -a 0
diff --git a/integration/gpexpand_not_running_test.go b/integration/gpexpand_not_running_test.go
index 1d4c341..314d830 100644
--- a/integration/gpexpand_not_running_test.go
+++ b/integration/gpexpand_not_running_test.go
@@ -41,7 +41,7 @@
}
}()
- defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-Greenplum expansion currently in process. Once expansion is complete, it will be possible to restart gprestore, but please note existing backup sets taken with a different cluster configuration may no longer be compatible with the newly expanded cluster configuration`)
+ defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-CloudberryDB expansion currently in process. Once expansion is complete, it will be possible to restart gprestore, but please note existing backup sets taken with a different cluster configuration may no longer be compatible with the newly expanded cluster configuration`)
restore.DoSetup()
})
It("should prevent gprestore from starting when gpexpand is in phase 2", func() {
@@ -54,7 +54,7 @@
testhelper.AssertQueryRuns(postgresConn, "CREATE TABLE gpexpand.status (status text, updated timestamp)")
testhelper.AssertQueryRuns(postgresConn, "INSERT INTO gpexpand.status VALUES ('IN PROGRESS', now())")
- defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-Greenplum expansion currently in process. Once expansion is complete, it will be possible to restart gprestore, but please note existing backup sets taken with a different cluster configuration may no longer be compatible with the newly expanded cluster configuration`)
+ defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-CloudberryDB expansion currently in process. Once expansion is complete, it will be possible to restart gprestore, but please note existing backup sets taken with a different cluster configuration may no longer be compatible with the newly expanded cluster configuration`)
restore.DoSetup()
})
It("should prevent gpbackup from starting when gpexpand is in phase 1", func() {
@@ -76,7 +76,7 @@
}
}()
- defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-Greenplum expansion currently in process, please re-run gpbackup when the expansion has completed`)
+ defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-CloudberryDB expansion currently in process, please re-run gpbackup when the expansion has completed`)
backup.DoSetup()
})
It("should prevent gpbackup from starting when gpexpand is in phase 2", func() {
@@ -89,7 +89,7 @@
testhelper.AssertQueryRuns(postgresConn, "CREATE TABLE gpexpand.status (status text, updated timestamp)")
testhelper.AssertQueryRuns(postgresConn, "INSERT INTO gpexpand.status VALUES ('IN PROGRESS', now())")
- defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-Greenplum expansion currently in process, please re-run gpbackup when the expansion has completed`)
+ defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-CloudberryDB expansion currently in process, please re-run gpbackup when the expansion has completed`)
backup.DoSetup()
})
})
diff --git a/report/report.go b/report/report.go
index 8a9d17e..d75a366 100644
--- a/report/report.go
+++ b/report/report.go
@@ -127,7 +127,7 @@
reportInfo := make([]LineInfo, 0)
reportInfo = append(reportInfo,
LineInfo{Key: "timestamp key:", Value: timestamp},
- LineInfo{Key: "gpdb version:", Value: report.DatabaseVersion},
+ LineInfo{Key: "database version:", Value: report.DatabaseVersion},
LineInfo{Key: "gpbackup version:", Value: fmt.Sprintf("%s\n", report.BackupVersion)},
LineInfo{Key: "database name:", Value: report.DatabaseName},
LineInfo{Key: "command line:", Value: gpbackupCommandLine},
@@ -159,7 +159,7 @@
reportInfo = append(reportInfo,
LineInfo{Key: "segment count:", Value: fmt.Sprintf("%d", report.SegmentCount)})
- _, err = fmt.Fprint(reportFile, "Greenplum Database Backup Report\n\n")
+ _, err = fmt.Fprint(reportFile, "Cloudberry Database Backup Report\n\n")
if err != nil {
gplog.Error("Unable to write backup report file %s", reportFilename)
return
@@ -184,12 +184,12 @@
gprestoreCommandLine := strings.Join(os.Args, " ")
start, end, duration := GetDurationInfo(startTimestamp, operating.System.Now())
- utils.MustPrintf(reportFile, "Greenplum Database Restore Report\n\n")
+ utils.MustPrintf(reportFile, "Cloudberry Database Restore Report\n\n")
reportInfo := make([]LineInfo, 0)
reportInfo = append(reportInfo,
LineInfo{Key: "timestamp key:", Value: backupTimestamp},
- LineInfo{Key: "gpdb version:", Value: connectionPool.Version.VersionString},
+ LineInfo{Key: "database version:", Value: connectionPool.Version.VersionString},
LineInfo{Key: "gprestore version:", Value: fmt.Sprintf("%s\n", restoreVersion)},
LineInfo{Key: "database name:", Value: connectionPool.DBName},
LineInfo{Key: "command line:", Value: fmt.Sprintf("%s\n", gprestoreCommandLine)},
diff --git a/report/report_test.go b/report/report_test.go
index 74d9ba6..81c7abe 100644
--- a/report/report_test.go
+++ b/report/report_test.go
@@ -94,11 +94,11 @@
It("writes a report for a successful backup", func() {
backupReport.WriteBackupReportFile("filename", timestamp, endtime, objectCounts, "")
- Expect(buffer).To(Say(`Greenplum Database Backup Report
+ Expect(buffer).To(Say(`Cloudberry Database Backup Report
timestamp key: 20170101010101
-gpdb version: 5\.0\.0 build test
-gpbackup version: 0\.1\.0
+database version: 5.0.0 build test
+gpbackup version: 0.1.0
database name: testdb
command line: .*
@@ -124,11 +124,11 @@
})
It("writes a report for a failed backup", func() {
backupReport.WriteBackupReportFile("filename", timestamp, endtime, objectCounts, "Cannot access /tmp/backups: Permission denied")
- Expect(buffer).To(Say(`Greenplum Database Backup Report
+ Expect(buffer).To(Say(`Cloudberry Database Backup Report
timestamp key: 20170101010101
-gpdb version: 5\.0\.0 build test
-gpbackup version: 0\.1\.0
+database version: 5.0.0 build test
+gpbackup version: 0.1.0
database name: testdb
command line: .*
@@ -156,11 +156,11 @@
It("writes a report without database size information", func() {
backupReport.DatabaseSize = ""
backupReport.WriteBackupReportFile("filename", timestamp, endtime, objectCounts, "")
- Expect(buffer).To(Say(`Greenplum Database Backup Report
+ Expect(buffer).To(Say(`Cloudberry Database Backup Report
timestamp key: 20170101010101
-gpdb version: 5\.0\.0 build test
-gpbackup version: 0\.1\.0
+database version: 5.0.0 build test
+gpbackup version: 0.1.0
database name: testdb
command line: .*
@@ -245,11 +245,11 @@
It("writes a report for a failed restore", func() {
gplog.SetErrorCode(2)
report.WriteRestoreReportFile("filename", timestamp, restoreStartTime, connectionPool, restoreVersion, 3, 4, "Cannot access /tmp/backups: Permission denied")
- Expect(buffer).To(Say(`Greenplum Database Restore Report
+ Expect(buffer).To(Say(`Cloudberry Database Restore Report
timestamp key: 20170101010101
-gpdb version: 5\.0\.0 build test
-gprestore version: 0\.1\.0
+database version: 5.0.0 build test
+gprestore version: 0.1.0
database name: testdb
command line: .*
@@ -266,11 +266,11 @@
It("writes a report for a successful restore", func() {
gplog.SetErrorCode(0)
report.WriteRestoreReportFile("filename", timestamp, restoreStartTime, connectionPool, restoreVersion, 3, 3, "")
- Expect(buffer).To(Say(`Greenplum Database Restore Report
+ Expect(buffer).To(Say(`Cloudberry Database Restore Report
timestamp key: 20170101010101
-gpdb version: 5\.0\.0 build test
-gprestore version: 0\.1\.0
+database version: 5.0.0 build test
+gprestore version: 0.1.0
database name: testdb
command line: .*
@@ -286,11 +286,11 @@
It("writes a report for a successful restore with errors", func() {
gplog.SetErrorCode(1)
report.WriteRestoreReportFile("filename", timestamp, restoreStartTime, connectionPool, restoreVersion, 3, 3, "")
- Expect(buffer).To(Say(`Greenplum Database Restore Report
+ Expect(buffer).To(Say(`Cloudberry Database Restore Report
timestamp key: 20170101010101
-gpdb version: 5\.0\.0 build test
-gprestore version: 0\.1\.0
+database version: 5.0.0 build test
+gprestore version: 0.1.0
database name: testdb
command line: .*
@@ -426,7 +426,7 @@
})
Describe("Email-related functions", func() {
- reportFileContents := []byte(`Greenplum Database Backup Report
+ reportFileContents := []byte(`Cloudberry Database Backup Report
Timestamp Key: 20170101010101`)
contactsFileContents, _ := yaml.Marshal(report.ContactFile{
@@ -534,7 +534,7 @@
<html>
<body>
<pre style=\"font: monospace\">
-Greenplum Database Backup Report
+Cloudberry Database Backup Report
Timestamp Key: 20170101010101
</pre>
@@ -556,7 +556,7 @@
<html>
<body>
<pre style=\"font: monospace\">
-Greenplum Database Backup Report
+Cloudberry Database Backup Report
Timestamp Key: 20170101010101
</pre>
diff --git a/restore/restore.go b/restore/restore.go
index 6ee0f3c..b7edadb 100644
--- a/restore/restore.go
+++ b/restore/restore.go
@@ -87,7 +87,7 @@
gplog.Info("gpbackup version = %s", backupConfig.BackupVersion)
gplog.Info("gprestore version = %s", GetVersion())
- gplog.Info("Greenplum Database Version = %s", connectionPool.Version.VersionString)
+ gplog.Info("Database Version = %s", connectionPool.Version.VersionString)
BackupConfigurationValidation()
metadataFilename := globalFPInfo.GetMetadataFilePath()
diff --git a/utils/gpexpand_sensor.go b/utils/gpexpand_sensor.go
index dd10dfb..f5323a4 100644
--- a/utils/gpexpand_sensor.go
+++ b/utils/gpexpand_sensor.go
@@ -12,9 +12,9 @@
)
const (
- BackupPreventedByGpexpandMessage GpexpandFailureMessage = `Greenplum expansion currently in process, please re-run gpbackup when the expansion has completed`
+ BackupPreventedByGpexpandMessage GpexpandFailureMessage = `CloudberryDB expansion currently in process, please re-run gpbackup when the expansion has completed`
- RestorePreventedByGpexpandMessage GpexpandFailureMessage = `Greenplum expansion currently in process. Once expansion is complete, it will be possible to restart gprestore, but please note existing backup sets taken with a different cluster configuration may no longer be compatible with the newly expanded cluster configuration`
+ RestorePreventedByGpexpandMessage GpexpandFailureMessage = `CloudberryDB expansion currently in process. Once expansion is complete, it will be possible to restart gprestore, but please note existing backup sets taken with a different cluster configuration may no longer be compatible with the newly expanded cluster configuration`
CoordinatorDataDirQuery = `select datadir from gp_segment_configuration where content=-1 and role='p'`
GpexpandTemporaryTableStatusQuery = `SELECT status FROM gpexpand.status ORDER BY updated DESC LIMIT 1`
