Skip to content

Commit 41e275c

Browse files
committed
Add error handling and logging when shard failed
1 parent d79da30 commit 41e275c

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

pbm/restore/physical.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,10 +1052,7 @@ func (r *PhysRestore) Snapshot(
10521052

10531053
var progress nodeStatus
10541054
defer func() {
1055-
// set failed status of node on error, but
1056-
// don't mark node as failed after the local restore succeed
1057-
restoreFailed := progress.isFailed()
1058-
if err != nil && !errors.Is(err, ErrNoDataForShard) && restoreFailed {
1055+
if err != nil && !errors.Is(err, ErrNoDataForShard) {
10591056
r.MarkFailed(err)
10601057
}
10611058

@@ -2662,6 +2659,8 @@ func (r *PhysRestore) checkDiskSpace(bcpSize int64) error {
26622659

26632660
// MarkFailed sets the restore and rs state as failed with the given message
26642661
func (r *PhysRestore) MarkFailed(e error) {
2662+
r.log.Error("mark error during restore: %v", e)
2663+
26652664
err := util.RetryableWrite(r.stg,
26662665
r.syncPathNode+"."+string(defs.StatusError), errStatus(e))
26672666
if err != nil {

0 commit comments

Comments
 (0)