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

migration/migrationmanager: remove code from 21.1 migration #67053

Merged

Conversation

ajwerner
Copy link
Contributor

We don't need to special case any more migrations. This special case was to
deal with the fact that we could not use the job infrastructure which uses the
migration table to create the migration table.

Release note: None

We don't need to special case any more migrations. This special case was to
deal with the fact that we could not use the job infrastructure which uses the
migration table to create the migration table.

Release note: None
@ajwerner ajwerner requested a review from irfansharif June 30, 2021 04:21
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@ajwerner
Copy link
Contributor Author

TFTR!

bors r=irfansharif

@craig
Copy link
Contributor

craig bot commented Jun 30, 2021

Build succeeded:

@craig craig bot merged commit 5bee963 into cockroachdb:master Jun 30, 2021
ajwerner added a commit to ajwerner/cockroach that referenced this pull request Jul 6, 2021
We no longer use the master roachtest for old branches. Given that, the answer
is to just remove this test from master.

This test fails because in cockroachdb#67053 I removed compatibility between 20.2 and
master. We should never be trying to do that upgrade.

Fixes cockroachdb#67182

Release note: None
ajwerner added a commit to ajwerner/cockroach that referenced this pull request Jul 14, 2021
We no longer use the master roachtest for old branches. Given that, the answer
is to just remove this test from master.

This test fails because in cockroachdb#67053 I removed compatibility between 20.2 and
master. We should never be trying to do that upgrade.

Fixes cockroachdb#67182

Release note: None
craig bot pushed a commit that referenced this pull request Jul 14, 2021
66850: sqlproxyccl: statistically load balance across tenants r=chrisseto a=chrisseto

    Previously, the SQLProxy's Directory implementation would always
    select the first instance from the pods list. As part of the
    SQLProxy's duty is load balancing, this was inadequate. This commit
    upgrades the tenant dir to have pods report their CPU load. This
    load is then used to perform a weighted distribution across all
    running tenant pods.

Release note: None

67276: roachtest: remove test which exercised 20.2-21.1 upgrade r=postamar a=ajwerner

We no longer use the master roachtest for old branches. Given that, the answer
is to just remove this test from master.

This test fails because in #67053 I removed compatibility between 20.2 and
master. We should never be trying to do that upgrade.

Fixes #67182

Release note: None

67460: cli: move the demo cluster to new sub-package `democluster` (5/) r=otan a=knz

First 15 commits are from #67459 and prior.
Please ignore those (they will disappear once the prefix PR is merged)

Only the last 5 commits belong to this PR.

This is part of a family of PRs that aim to encapsulate CLI functionality into finer grained packages.

67461: cli: SQL shell cleanups and better encapsulation (6/) r=otan a=knz

First 20 commits are from #67460 and prior.
Please ignore those (they will disappear once the prefix PR is merged)

Only the last 4 commits belong to this PR.

This is part of a family of PRs that aim to encapsulate CLI functionality into finer grained packages.

67474: cli: new sub-package `clisqlcfg` to ease the creation of a standalone SQL shell (8/) r=otan a=knz

First 28 commits are from #67462 and prior.
Please ignore those (they will disappear once the prefix PR is merged)

Only the last 2 commits belong to this PR.

This is part of a family of PRs that aim to encapsulate CLI functionality into finer grained packages.



67484: clisqlclient: drop the dependency on 'security' r=otan a=knz

Fixes #67481.
Informs #67470.

This PR only contains 1 commit (the last).
All commits except for the last belong to #67469 and prior PRs. Ignore them during review.


The 'security' package is quite large. There is no reason to embark it
into a standalone SQL shell.

Towards achieving this, this patch removes the dependency on the
'security' package from `clisqlclient` by moving the password prompt
code into a sub-package.

Release note: None

67588: compare_test: account for more differences from postgres r=otan a=rafiss

- explicit cast for constants #62602 (comment)
- don't use postgis_script builtin #62602 (comment)
- handle differences in timezone offset display #62602 (comment)

Release note: None

67594: build: update go to 1.16.6 r=rail a=rail

* [ ] Adjust the Pebble tests to run in new version.
* [x] Adjust version in Docker image ([source](./builder/Dockerfile)).
* [x] Adjust version in the TeamCity agent image ([setup script](./packer/teamcity-agent.sh))
* [x] Rebuild and push the Docker image (following [Basic Process](#basic-process))
* [x] Bump the version in `WORKSPACE` under `go_register_toolchains`. You may need to bump [rules_go](https://github.com/bazelbuild/rules_go/releases).
* [x] Bump the version in `builder.sh` accordingly ([source](./builder.sh#L6)).
* [x] Bump the version in `go-version-check.sh` ([source](./go-version-check.sh)), unless bumping to a new patch release.
* [x] Bump the go version in `go.mod`. You may also need to rerun `make vendor_rebuild` if vendoring has changed.
* [x] Bump the default installed version of Go in `bootstrap-debian.sh` ([source](./bootstrap/bootstrap-debian.sh)).
* [x] Replace other mentions of the older version of go (grep for `golang:<old_version>` and `go<old_version>`).
* [ ] Update the `builder.dockerImage` parameter in the TeamCity [`Cockroach`](https://teamcity.cockroachdb.com/admin/editProject.html?projectId=Cockroach&tab=projectParams) and [`Internal`](https://teamcity.cockroachdb.com/admin/editProject.html?projectId=Internal&tab=projectParams) projects.
* [ ] Ask the Developer Infrastructure team to deploy new TeamCity agent images according to [packer/README.md](./packer/README.md)

Release note: None

67603: roachtest: re-mark `pkg/cmd/roachtest` tests as `broken_in_bazel` r=rail a=rickystewart

`faa4c2ccdaeca01eca3ccee29a8a64973cf8b043` removed this tag, which
caused all Bazel test runs to begin failing.

Closes #67595.

Release note: None

Co-authored-by: Chris Seto <[email protected]>
Co-authored-by: Andrew Werner <[email protected]>
Co-authored-by: Raphael 'kena' Poss <[email protected]>
Co-authored-by: Rafi Shamim <[email protected]>
Co-authored-by: Rail Aliiev <[email protected]>
Co-authored-by: Ricky Stewart <[email protected]>
pawalt pushed a commit to pawalt/cockroach that referenced this pull request Jul 22, 2021
We no longer use the master roachtest for old branches. Given that, the answer
is to just remove this test from master.

This test fails because in cockroachdb#67053 I removed compatibility between 20.2 and
master. We should never be trying to do that upgrade.

Fixes cockroachdb#67182

Release note: None
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