Skip to content

Commit 1867f39

Browse files
authored
br: add some log to record the CR we are processing (#5711)
1 parent e98d820 commit 1867f39

File tree

4 files changed

+38
-0
lines changed

4 files changed

+38
-0
lines changed

cmd/backup-manager/app/backup/manager.go

+11
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
corev1 "k8s.io/api/core/v1"
3535
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3636
errorutils "k8s.io/apimachinery/pkg/util/errors"
37+
"k8s.io/apimachinery/pkg/util/json"
3738
"k8s.io/apimachinery/pkg/util/wait"
3839
"k8s.io/klog/v2"
3940
)
@@ -95,6 +96,13 @@ func (bm *Manager) ProcessBackup() error {
9596
return errorutils.NewAggregate(errs)
9697
}
9798

99+
crData, err := json.Marshal(backup)
100+
if err != nil {
101+
klog.Errorf("failed to marshal backup %v to json, err: %v", backup, err)
102+
} else {
103+
klog.Infof("start to process backup: %s", string(crData))
104+
}
105+
98106
// we treat snapshot backup as restarted if its status is not scheduled when backup pod just start to run
99107
// we will clean backup data before run br command
100108
if backup.Spec.Mode == v1alpha1.BackupModeSnapshot && (backup.Status.Phase != v1alpha1.BackupScheduled || v1alpha1.IsBackupRestart(backup)) {
@@ -122,6 +130,9 @@ func (bm *Manager) ProcessBackup() error {
122130
return bm.performBackup(ctx, backup.DeepCopy(), nil)
123131
}
124132

133+
klog.Infof("start to connect to tidb server (%s:%d) as the .spec.from field is specified",
134+
backup.Spec.From.Host, backup.Spec.From.Port)
135+
125136
// validate and create from db
126137
var db *sql.DB
127138
db, err = bm.validateAndCreateFromDB(ctx, backup.DeepCopy())

cmd/backup-manager/app/export/manager.go

+8
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
corev1 "k8s.io/api/core/v1"
3333
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3434
errorutils "k8s.io/apimachinery/pkg/util/errors"
35+
"k8s.io/apimachinery/pkg/util/json"
3536
"k8s.io/apimachinery/pkg/util/wait"
3637
"k8s.io/klog/v2"
3738
)
@@ -99,6 +100,13 @@ func (bm *BackupManager) ProcessBackup() error {
99100
return errorutils.NewAggregate(errs)
100101
}
101102

103+
crData, err := json.Marshal(backup)
104+
if err != nil {
105+
klog.Errorf("failed to marshal backup %v to json, err: %v", backup, err)
106+
} else {
107+
klog.Infof("start to process backup: %s", string(crData))
108+
}
109+
102110
reason, err := bm.setOptions(backup)
103111
if err != nil {
104112
errs = append(errs, err)

cmd/backup-manager/app/import/manager.go

+8
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
corev1 "k8s.io/api/core/v1"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
errorutils "k8s.io/apimachinery/pkg/util/errors"
30+
"k8s.io/apimachinery/pkg/util/json"
3031
"k8s.io/klog/v2"
3132
)
3233

@@ -87,6 +88,13 @@ func (rm *RestoreManager) ProcessRestore() error {
8788
return errorutils.NewAggregate(errs)
8889
}
8990

91+
crData, err := json.Marshal(restore)
92+
if err != nil {
93+
klog.Errorf("failed to marshal restore %v to json, err: %s", restore, err)
94+
} else {
95+
klog.Infof("start to process restore: %s", string(crData))
96+
}
97+
9098
rm.setOptions(restore)
9199

92100
return rm.performRestore(ctx, restore.DeepCopy())

cmd/backup-manager/app/restore/manager.go

+11
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
corev1 "k8s.io/api/core/v1"
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
errorutils "k8s.io/apimachinery/pkg/util/errors"
33+
"k8s.io/apimachinery/pkg/util/json"
3334
"k8s.io/apimachinery/pkg/util/wait"
3435
"k8s.io/klog/v2"
3536
)
@@ -96,12 +97,22 @@ func (rm *Manager) ProcessRestore() error {
9697
return fmt.Errorf("no br config in %s", rm)
9798
}
9899

100+
crData, err := json.Marshal(restore)
101+
if err != nil {
102+
klog.Errorf("failed to marshal restore %v to json, err: %s", restore, err)
103+
} else {
104+
klog.Infof("start to process restore: %s", string(crData))
105+
}
106+
99107
if restore.Spec.To == nil {
100108
return rm.performRestore(ctx, restore.DeepCopy(), nil)
101109
}
102110

103111
rm.setOptions(restore)
104112

113+
klog.Infof("start to connect to tidb server (%s:%d) as the .spec.to field is specified",
114+
restore.Spec.To.Host, restore.Spec.To.Port)
115+
105116
var db *sql.DB
106117
var dsn string
107118
err = wait.PollImmediate(constants.PollInterval, constants.CheckTimeout, func() (done bool, err error) {

0 commit comments

Comments
 (0)