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 acceptance/version-upgrade on remote clusters #29544

Merged

Conversation

petermattis
Copy link
Collaborator

No need to run a versionStep for the base version as we manually do that
before executing the version steps. Duplicating this work was failing on
the second upload because we can't overwrite the executable for a
running binary.

Fixes #29542

Release note: None

No need to run a versionStep for the base version as we manually do that
before executing the version steps. Duplicating this work was failing on
the second upload because we can't overwrite the executable for a
running binary.

Fixes cockroachdb#29542

Release note: None
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@petermattis
Copy link
Collaborator Author

bors r=tschottdorf

craig bot pushed a commit that referenced this pull request Sep 4, 2018
29520: sql: fix a panic in txn_state.go when verbose logging r=andreimatei,knz a=arjunravinarayan

Fix a panic (reproducible with 
`make testlogic TESTFLAGS='-verbosity=2' FILES=pg_catalog` ) 
due to an uninitialized
context. The comment on Ctx says that Ctx is uninitialized if we are
in `fsm.stateNoTxn`. In that case, use the parent (session) context
which is always initialized.

First commit is just some type assertions that I found useful to understand what's going on.

Fixes #29384.

29544: roachtest: fix acceptance/version-upgrade on remote clusters r=tschottdorf a=petermattis

No need to run a versionStep for the base version as we manually do that
before executing the version steps. Duplicating this work was failing on
the second upload because we can't overwrite the executable for a
running binary.

Fixes #29542

Release note: None

Co-authored-by: Arjun Narayan <[email protected]>
Co-authored-by: Peter Mattis <[email protected]>
@craig
Copy link
Contributor

craig bot commented Sep 4, 2018

Build succeeded

@craig craig bot merged commit bc683e5 into cockroachdb:master Sep 4, 2018
@petermattis petermattis deleted the pmattis/roachtest-version-upgrade branch September 4, 2018 20:03
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