Merge pull request #66638 from dt/backport20.2-65851

release-20.2: backupccl: avoid panic if not collecting prior IDs
cockroachdb · Jun 18, 2021 · 402d4f6 · 402d4f6
2 parents 5395395 + 61e0bed
commit 402d4f6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/ccl/backupccl/targets.go b/pkg/ccl/backupccl/targets.go
@@ -652,7 +652,7 @@ func getAllDescChanges(
 				// changed during truncate.
 				r.Desc = &desc
 				t := descpb.TableFromDescriptor(&desc, rev.Timestamp)
-				if t != nil && t.ReplacementOf.ID != descpb.InvalidID {
+				if priorIDs != nil && t != nil && t.ReplacementOf.ID != descpb.InvalidID {
 					priorIDs[t.ID] = t.ReplacementOf.ID
 				}
 			}