Skip to content

Commit

Permalink
Merge #124768
Browse files Browse the repository at this point in the history
124768: roachtest: Revert "roachtest: don't inhibit cluster reuse on DNS deletion errors" r=srosenberg a=andreimatei

This reverts commit 596a3a2 (PR #124678). That commit made roachtest tolerate DNS record deletion errors, so that clusters can be reused even though their DNS records failed to be cleaned up. This seems to have been a bad idea, though, since stale DNS records can be a problem for reused clusters; see
#124678 (comment)

I now understand that there are two types of DNS records - normal ones (`A` records?) and `SRV` records. The former are associated with roachprod VMs. The latter are associated with cockroach nodes from host or virtual clusters, and are used for some sort of service discovery. It is the destruction of these SRV records that the original patch dealt with. Failure to delete these records might have consequences for the future tests using the cluster.

Epic: none
Release note: None

Co-authored-by: Andrei Matei <[email protected]>
  • Loading branch information
craig[bot] and andreimatei committed May 28, 2024
2 parents 4c1e969 + 9ca33c9 commit 0231fa6
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions pkg/cmd/roachtest/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -2990,8 +2990,7 @@ func (c *clusterImpl) WipeForReuse(

// Clear DNS records for the cluster.
if err := c.DestroyDNS(ctx, l); err != nil {
// Log and swallow the error.
l.PrintfCtx(ctx, "failed to destroy DNS records for cluster %s: %v", c.name, err)
return err
}
// Overwrite the spec of the cluster with the one coming from the test. In
// particular, this overwrites the reuse policy to reflect what the test
Expand Down

0 comments on commit 0231fa6

Please sign in to comment.