Skip to content

Commit

Permalink
server: update data distribution endpoint to match new zone config ou…
Browse files Browse the repository at this point in the history
…tput

The endpoint was broken by cockroachdb#28612, which changed the output schema of
`SHOW ALL ZONE CONFIGURATIONS`, which was used by the endpoint. The
breakage was not caught because the unit test for the endpoint was
skipped due to flakiness under stress.

Release note: None
  • Loading branch information
Pete Vilter committed Sep 13, 2018
1 parent 2a9f767 commit 77adc97
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/server/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -1539,8 +1539,8 @@ func (s *adminServer) DataDistribution(
for _, row := range rows2 {
zcID := int64(tree.MustBeDInt(row[0]))
zcCliSpecifier := string(tree.MustBeDString(row[1]))
zcYaml := tree.MustBeDBytes(row[2])
zcBytes := tree.MustBeDBytes(row[3])
zcYaml := tree.MustBeDString(row[2])
zcBytes := tree.MustBeDBytes(row[4])
var zcProto config.ZoneConfig
if err := protoutil.Unmarshal([]byte(zcBytes), &zcProto); err != nil {
return nil, s.serverError(err)
Expand Down

0 comments on commit 77adc97

Please sign in to comment.