Skip to content

Commit 1788178

Browse files
author
Jeff McCormick
committed
update backup error messages back to the pgo user, make them clearer
1 parent 50a5124 commit 1788178

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

apiserver/backupservice/backupimpl.go

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func CreateBackup(request *msgs.CreateBackupRequest) msgs.CreateBackupResponse {
119119

120120
if len(clusterList.Items) == 0 {
121121
log.Debug("no clusters found")
122-
resp.Status.Msg = "no clusters found"
122+
resp.Results = append(resp.Results, "no clusters found with that selector")
123123
return resp
124124
} else {
125125
newargs := make([]string, 0)
@@ -130,16 +130,29 @@ func CreateBackup(request *msgs.CreateBackupRequest) msgs.CreateBackupResponse {
130130
}
131131

132132
}
133+
133134
for _, arg := range request.Args {
134135
log.Debug("create backup called for " + arg)
135136

137+
cluster := crv1.Pgcluster{}
138+
found, err := kubeapi.Getpgcluster(apiserver.RESTClient, &cluster, arg, apiserver.Namespace)
139+
if !found {
140+
resp.Status.Code = msgs.Error
141+
resp.Status.Msg = arg + " was not found, verify cluster name"
142+
return resp
143+
} else if err != nil {
144+
resp.Status.Code = msgs.Error
145+
resp.Status.Msg = err.Error()
146+
return resp
147+
}
148+
136149
//remove any existing backup job
137150
RemoveBackupJob("backup-" + arg)
138151

139152
result := crv1.Pgbackup{}
140153

141154
// error if it already exists
142-
found, err := kubeapi.Getpgbackup(apiserver.RESTClient, &result, arg, apiserver.Namespace)
155+
found, err = kubeapi.Getpgbackup(apiserver.RESTClient, &result, arg, apiserver.Namespace)
143156
if !found {
144157
log.Debug("pgbackup " + arg + " not found so we create it")
145158
} else if err != nil {

kubeapi/pgcluster.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ func GetpgclustersBySelector(client *rest.RESTClient, clusterList *crv1.Pgcluste
4747
Param("labelSelector", myselector.String()).
4848
Do().
4949
Into(clusterList)
50+
if kerrors.IsNotFound(err) {
51+
log.Debug("clusters for " + myselector.String() + " not found")
52+
}
5053
if err != nil {
5154
log.Error("error getting list of clusters " + err.Error())
5255
}

pgo/cmd/backup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ func createBackup(args []string) {
238238
}
239239

240240
if len(response.Results) == 0 {
241-
fmt.Println("no backups found")
241+
fmt.Println("no clusters found")
242242
return
243243
}
244244

0 commit comments

Comments
 (0)