kvserver: squash RemoveOptions sanity check

pav-kv · pav-kv · commit 19a8a6e1658d · 2025-07-17T09:59:31.000+01:00
Epic: none
Release note: none
diff --git a/pkg/kv/kvserver/store_remove_replica.go b/pkg/kv/kvserver/store_remove_replica.go
@@ -75,12 +75,8 @@ func (s *Store) removeInitializedReplicaRaftMuLocked(
 	if !rep.IsInitialized() {
 		return nil, errors.AssertionFailedf("cannot remove uninitialized replica %s", rep)
 	}
-
-	if opts.InsertPlaceholder {
-		if opts.DestroyData {
-			return nil, errors.AssertionFailedf("cannot specify both InsertPlaceholder and DestroyData")
-		}
-
+	if opts.InsertPlaceholder && opts.DestroyData {
+		return nil, errors.AssertionFailedf("cannot specify both InsertPlaceholder and DestroyData")
 	}
 
 	// Run sanity checks and on success commit to the removal by setting the

Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,8 @@ func (s *Store) removeInitializedReplicaRaftMuLocked(`
`75`	`75`	`if !rep.IsInitialized() {`
`76`	`76`	`return nil, errors.AssertionFailedf("cannot remove uninitialized replica %s", rep)`
`77`	`77`	`}`
`78`		`-`
`79`		`- if opts.InsertPlaceholder {`
`80`		`- if opts.DestroyData {`
`81`		`- return nil, errors.AssertionFailedf("cannot specify both InsertPlaceholder and DestroyData")`
`82`		`- }`
`83`		`-`
	`78`	`+ if opts.InsertPlaceholder && opts.DestroyData {`
	`79`	`+ return nil, errors.AssertionFailedf("cannot specify both InsertPlaceholder and DestroyData")`
`84`	`80`	`}`
`85`	`81`
`86`	`82`	`// Run sanity checks and on success commit to the removal by setting the`