Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

roachtest: fix log dir of attached clusters #31122

Merged
merged 1 commit into from
Oct 9, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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