Skip to content

Commit

Permalink
Merge pull request #45861 from pbardea/import-protected-ts-err
Browse files Browse the repository at this point in the history
importccl: handle protected timestamp removal upon resume
  • Loading branch information
pbardea authored Mar 9, 2020
2 parents 34a5234 + d4c48f2 commit f5fe582
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion pkg/ccl/importccl/import_stmt.go
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,13 @@ func (r *importResumer) Resume(
ptsID := details.ProtectedTimestampRecord
if ptsID != nil && !r.testingKnobs.ignoreProtectedTimestamps {
if err := p.ExecCfg().ProtectedTimestampProvider.Verify(ctx, *ptsID); err != nil {
return err
if errors.Is(err, protectedts.ErrNotExists) {
// No reason to return an error which might cause problems if it doesn't
// seem to exist.
log.Warningf(ctx, "failed to release protected which seems not to exist: %v", err)
} else {
return err
}
}
}

Expand Down

0 comments on commit f5fe582

Please sign in to comment.