roachpb: make AdminChangeReplicasRequest.ExpDesc non-nullable

Prior to 19.1 AdminChangeReplicas did not take an expected range descriptor value which allowed for races with other changes to the range descriptor. For backwards compatibility the expectation was left as an optional field. This commit completes the migration and makes ExpDesc a required, non-nullable field. Clients which supply a zero value ExpDesc will now receive an error. Release note: None
cockroachdb · Jul 12, 2019 · 0a33dca · 0a33dca
1 parent 509baff
commit 0a33dca
Show file tree

Hide file tree

Showing 7 changed files with 580 additions and 618 deletions.
diff --git a/c-deps/libroach/protos/roachpb/api.pb.cc b/c-deps/libroach/protos/roachpb/api.pb.cc
diff --git a/c-deps/libroach/protos/roachpb/api.pb.h b/c-deps/libroach/protos/roachpb/api.pb.h
diff --git a/pkg/internal/client/batch.go b/pkg/internal/client/batch.go
@@ -658,7 +658,7 @@ func (b *Batch) adminChangeReplicas(
 		},
 		ChangeType: changeType,
 		Targets:    targets,
-		ExpDesc:    &expDesc,
+		ExpDesc:    expDesc,
 	}
 	b.appendReqs(req)
 	b.initResult(1, 0, notRaw, nil)

diff --git a/pkg/internal/client/db.go b/pkg/internal/client/db.go
@@ -541,7 +541,8 @@ func (db *DB) AdminChangeReplicas(
 		return nil, errors.Errorf("unexpected response of type %T for AdminChangeReplicas",
 			responses[0].GetInner())
 	}
-	return resp.Desc, nil
+	desc := resp.Desc
+	return &desc, nil
 }
 
 // AdminRelocateRange relocates the replicas for a range onto the specified