Skip to content

tenantcostclient: deflake TestDataDriven#70748

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
RaduBerinde:deflake-tenant-side
Sep 27, 2021
Merged

tenantcostclient: deflake TestDataDriven#70748
craig[bot] merged 1 commit intocockroachdb:masterfrom
RaduBerinde:deflake-tenant-side

Conversation

@RaduBerinde
Copy link
Copy Markdown
Member

Deflaking test by adding more timers clauses - these ensure that
quotapool timers are set up before advance.

Release note: None

Release justification: test-only change.

Deflaking test by adding more `timers` clauses - these ensure that
quotapool timers are set up before `advance`.

Release note: None

Release justification: test-only change.
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@ajwerner ajwerner left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @RaduBerinde)

@RaduBerinde
Copy link
Copy Markdown
Member Author

TFTR!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Sep 27, 2021

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Sep 27, 2021

Build succeeded:

@craig craig bot merged commit f1c7f3c into cockroachdb:master Sep 27, 2021
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Sep 27, 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 bfba18c to blathers/backport-release-21.2-70748: 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants