Skip to content

roachprod: avoid flaky test due to unused functions#72390

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
healthy-pod:roachprod-avoid-flaky-test
Nov 3, 2021
Merged

roachprod: avoid flaky test due to unused functions#72390
craig[bot] merged 1 commit intocockroachdb:masterfrom
healthy-pod:roachprod-avoid-flaky-test

Conversation

@healthy-pod
Copy link
Copy Markdown
Contributor

Merging #71660 trigerred a flaky test due to unused functions.

This patch avoids that test by making use of / commenting out unused functions.

Release note: None

@healthy-pod healthy-pod requested a review from a team as a code owner November 3, 2021 15:37
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Member

@RaduBerinde RaduBerinde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @healthy-pod and @rail)


pkg/roachprod/roachprod.go, line 143 at r1 (raw file):

// 		MaxConcurrency: 32,
// 	}
// }

I'd add a var _ = DefaultSyncedCluster instead (that way the code will not rot)

Copy link
Copy Markdown
Member

@rail rail left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @RaduBerinde and @rail)


pkg/roachprod/roachprod.go, line 143 at r1 (raw file):

Previously, RaduBerinde wrote…

I'd add a var _ = DefaultSyncedCluster instead (that way the code will not rot)

+1, sounds safer

Merging cockroachdb#71660 trigerred a flaky test due to unused functions.

This patch avoids that test by making use of / commenting unused functions.

Release note: None
@healthy-pod healthy-pod force-pushed the roachprod-avoid-flaky-test branch from ed53242 to bbe3b2a Compare November 3, 2021 16:04
@healthy-pod
Copy link
Copy Markdown
Contributor Author

bors r=[RaduBerinde,stevendanna,rail]

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Nov 3, 2021

Build succeeded:

@craig craig bot merged commit 3bc13c2 into cockroachdb:master Nov 3, 2021
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Nov 3, 2021

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from bbe3b2a to blathers/backport-release-21.1-72390: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 21.1.x failed. See errors above.


error creating merge commit from bbe3b2a to blathers/backport-release-21.2-72390: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 21.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

@rafiss
Copy link
Copy Markdown
Collaborator

rafiss commented Nov 19, 2021

@healthy-pod @RaduBerinde friendly ping - does this still need to be backported?

@RaduBerinde
Copy link
Copy Markdown
Member

It was backported as part of #72641.

@healthy-pod healthy-pod deleted the roachprod-avoid-flaky-test branch September 20, 2022 23:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants