Skip to content

Commit

Permalink
Merge #31122
Browse files Browse the repository at this point in the history
31122: roachtest: fix log dir of attached clusters r=andreimatei a=andreimatei

Fixes #31119

Release note: None

Co-authored-by: Andrei Matei <andrei@cockroachlabs.com>
  • Loading branch information
craig[bot] and andreimatei committed Oct 9, 2018
2 parents 35b30e8 + 6128509 commit 4746982
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions pkg/cmd/roachtest/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,8 @@ func attachToExistingCluster(
t.Fatalf("TODO(peter): unsupported nodes spec: %v", nodes)
}

l, err := rootLogger(t.Name())
logPath := filepath.Join(t.ArtifactsDir(), "test.log")
l, err := rootLogger(logPath)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -663,7 +664,7 @@ func attachToExistingCluster(

// validateCluster takes a cluster and checks that the reality corresponds to
// the cluster's spec. It's intended to be used with clusters created by
// attachToExistingCluste(); otherwise, clusters create with newCluster() are
// attachToExistingCluster(); otherwise, clusters create with newCluster() are
// know to be up to spec.
func (c *cluster) validate(ctx context.Context, nodes []nodeSpec, l *logger) error {
// Perform validation on the existing cluster.
Expand Down

0 comments on commit 4746982

Please sign in to comment.