release-23.1: clusterversion: set developmentBranch to false by celiala · Pull Request #99387 · cockroachdb/cockroach

celiala · 2023-03-23T15:40:24Z

This PR sets developmentBranch to false, which must be set before selected a beta.1 candidate.

Release note: none.
Epic: REL-283
Release justification: Infra-only change. Denotes release-23.1 as a release branch/versions.

Backport 1/4 commits from #99128.

/cc @cockroachdb/release

As part of the 23.1 stability period tasks, this PR preps the 23.1 release branch and initializes 23.2 development, as per this release runbook: Prep Release and Define Start of Development for Next Release.

This PR will contain 4 commits:

commit	backported when
1. Set developmentBranch to false	soon after branch cut / before selecting beta.1 candidate
2. Update version.txt to alpha.8 (next release)	soon after branch cut / before selecting ~~beta.1~~ this week's alpha.8 candidate
3. Mint the previous release	should be final backport before the final RC / before selecting final RC candidate
4. Define the start of 23.2 development and placeholder key	(not backported)

Release note: none.
Epic: REL-283

blathers-crl · 2023-03-23T15:40:28Z

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

_{🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.}

cockroach-teamcity · 2023-03-23T15:40:35Z

This change is

celiala · 2023-03-24T14:21:46Z

Set developmentBranch to false

This commit is causing these test to fail:

pkg/upgrade/upgrademanager/upgrademanager_test:TestAlreadyRunningJobsAreHandledProperly
github.com/cockroachdb/cockroach/pkg/ccl/serverccl: TestServerStartupGuardrails
And the reason isn't exactly clear to me.

Because we really need version.txt to be alpha.8 in order to select this week's candidate, I'm going to pull this into its own PR, so we can merge that asap:
#99481

rail

Reviewed 9 of 9 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @celiala, @dt, and @renatolabs)

docs/generated/settings/settings-for-tenants.txt line 292 at r2 (raw file):

trace.span_registry.enabled	boolean	true	if set, ongoing traces can be seen at https://<ui>/#/debug/tracez
trace.zipkin.collector	string		the address of a Zipkin instance to receive traces, as <host>:<port>. If no port is specified, 9411 will be used.
version	version	22.2-94	set the active cluster version in the format '<major>.<minor>'

Do you know why we set the version to xx.yy-zz, but mention it as <major>.<minor>?

pkg/clusterversion/cockroach_versions.go line 901 at r1 (raw file):

// 2. forced to `false` on release branches: this allows running a
// release binary in a dev cluster.
var developmentBranch = false || envutil.EnvOrDefaultBool("COCKROACH_FORCE_DEV_VERSION", false)

Is there any specific reason to have false || ... here? Looks like the first part is ignored in any case and can be removed.

celiala

Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @dt, @rail, and @renatolabs)

docs/generated/settings/settings-for-tenants.txt line 292 at r2 (raw file):

Previously, rail (Rail Aliiev) wrote…

Do you know why we set the version to xx.yy-zz, but mention it as <major>.<minor>?

Not sure tbh? (all I know is that this has been the format for a while 🤷 )

pkg/clusterversion/cockroach_versions.go line 901 at r1 (raw file):

Previously, rail (Rail Aliiev) wrote…

Is there any specific reason to have false || ... here? Looks like the first part is ignored in any case and can be removed.

Ack, removed false ||

celiala · 2023-04-04T18:51:14Z

~~See #100609 for failing tests~~.

Update: see instead #100685

knz · 2023-04-05T07:36:18Z

following up here #100685

celiala · 2023-04-05T07:37:03Z

3 tests are failing here:

(1) TestAlreadyRunningJobsAreHandledProperly. in pkg/upgrade/upgrademanager/upgrademanager_test

=== RUN   TestAlreadyRunningJobsAreHandledProperly
    manager_external_test.go:120:
          Error Trace:  pkg/upgrade/upgrademanager/upgrademanager_test_test/pkg/upgrade/upgrademanager/manager_external_test.go:120
          Error:        Received unexpected error:
                        sql: no rows in result set

(2) TestPauseMigration. in pkg/upgrade/upgrademanager/upgrademanager_test

=== RUN   TestPauseMigration
    manager_external_test.go:464: error scanning '&{<nil> 0xc003f80200}': sql: no rows in result set

(3) TestServerStartupGuardrails. in github.com/cockroachdb/cockroach/pkg/ccl/serverccl

I230405 05:30:21.943950 189123 upgrade/upgrademanager/manager.go:168  [T1,n1] 1170  running permanent upgrades up to version: 1000022.2
I230405 05:30:21.944731 189876 sql/temporary_schema.go:505  [T1,n1] 1171  running temporary object cleanup background job
I230405 05:30:21.945053 189877 sql/sqlstats/persistedsqlstats/provider.go:129  [T1,n1] 1172  starting sql-stats-worker with initial delay: 10m15.992188656s
I230405 05:30:21.946647 189895 kv/kvclient/rangefeed/rangefeedcache/watcher.go:335  [T1,n1] 1173  system-config-cache: established range feed cache
I230405 05:30:21.947169 189864 kv/kvserver/replica_rangefeed.go:701  [T1,n1,rangefeed=table-stats-cache,mux_n=1,gen=2,r21/1:/Table/2{0-1},s1] 1174  RangeFeed closed timestamp is empty
I230405 05:30:21.950611 189876 sql/temporary_schema.go:555  [T1,n1] 1175  found 0 temporary schemas
I230405 05:30:21.950720 189876 sql/temporary_schema.go:558  [T1,n1] 1176  early exiting temporary schema cleaner as no temporary schemas were found
I230405 05:30:21.950747 189876 sql/temporary_schema.go:559  [T1,n1] 1177  completed temporary object cleanup job
I230405 05:30:21.950765 189876 sql/temporary_schema.go:640  [T1,n1] 1178  temporary object cleaner next scheduled to run at 2023-04-05 06:00:21.944702855 +0000 UTC m=+1944.305053323
E230405 05:30:21.994611 189894 spanconfig/spanconfigmanager/manager.go:141  [T1,n1] 1179  error starting auto span config reconciliation job: get-jobs: system-jobs-scan: relation "system.job_info" does not exist
I230405 05:30:22.008682 189123 upgrade/upgrademanager/manager.go:229  [T1,n1] 1180  the last permanent upgrade (v22.2-98) does not appear to have completed; attempting to run all upgrades
I230405 05:30:22.009905 189123 upgrade/upgrademanager/manager.go:270  [T1,n1] 1181  running permanent upgrade for version 0.0-2
    test_server_shim.go:331: migration-manager-find-jobs: system-jobs-scan: relation "system.job_info" does not exist
        (1) attached stack trace
          -- stack trace:
          | github.com/cockroachdb/cockroach/pkg/sql.(*InternalExecutor).execInternal.func1.1

celiala · 2023-04-06T22:21:58Z

Fixes for failing tests have been backported 🎉 (#100685). Re-triggering CI.

This sets developmentBranch to false for the release branch. We plan to backport this commit as soon as the branch is cut. Release note: none. Epic: REL-283

celiala mentioned this pull request Mar 23, 2023

release-23.1: build: promote release candidate to beta.1 #99388

Merged

celiala changed the title ~~clusterversion: set developmentBranch to false~~ release-23.1: clusterversion: set developmentBranch to false Mar 23, 2023

celiala force-pushed the backport23.1-99128 branch from 7bfced2 to 6f75eed Compare March 23, 2023 17:53

celiala marked this pull request as ready for review March 23, 2023 20:14

celiala requested review from a team as code owners March 23, 2023 20:14

celiala requested review from dt, jlinder, rail and renatolabs March 23, 2023 20:14

celiala force-pushed the backport23.1-99128 branch from 6f75eed to e42af56 Compare March 23, 2023 22:13

jlinder approved these changes Mar 24, 2023

View reviewed changes

celiala mentioned this pull request Mar 24, 2023

release-23.1: build: promote release candidate to alpha.8 #99481

Merged

rail requested changes Mar 28, 2023

View reviewed changes

celiala force-pushed the backport23.1-99128 branch 3 times, most recently from 5dc7a43 to affbbb1 Compare April 4, 2023 17:38

celiala commented Apr 4, 2023

View reviewed changes

celiala requested a review from rail April 4, 2023 18:15

knz mentioned this pull request Apr 4, 2023

jobs: mixed-version testing reports unable to find job_info #100609

Closed

rail approved these changes Apr 4, 2023

View reviewed changes

knz mentioned this pull request Apr 5, 2023

upgrades: upgrades don't seem to run when developmentBranch is set to false #100685

Closed

2 tasks

celiala force-pushed the backport23.1-99128 branch from affbbb1 to d367519 Compare April 7, 2023 03:56

clusterversion: set developmentBranch to false

5fa823b

This sets developmentBranch to false for the release branch. We plan to backport this commit as soon as the branch is cut. Release note: none. Epic: REL-283

celiala force-pushed the backport23.1-99128 branch from d367519 to 5fa823b Compare April 7, 2023 04:54

celiala merged commit 6040672 into cockroachdb:release-23.1 Apr 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

release-23.1: clusterversion: set developmentBranch to false#99387

release-23.1: clusterversion: set developmentBranch to false#99387
celiala merged 1 commit intocockroachdb:release-23.1from
celiala:backport23.1-99128

celiala commented Mar 23, 2023 •

edited

Loading

Uh oh!

blathers-crl bot commented Mar 23, 2023

Uh oh!

cockroach-teamcity commented Mar 23, 2023

Uh oh!

celiala commented Mar 24, 2023 •

edited

Loading

Uh oh!

rail left a comment

Uh oh!

celiala left a comment

Uh oh!

celiala commented Apr 4, 2023 •

edited

Loading

Uh oh!

knz commented Apr 5, 2023

Uh oh!

celiala commented Apr 5, 2023

Uh oh!

celiala commented Apr 6, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

celiala commented Mar 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blathers-crl bot commented Mar 23, 2023

Uh oh!

cockroach-teamcity commented Mar 23, 2023

Uh oh!

celiala commented Mar 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rail left a comment

Choose a reason for hiding this comment

Uh oh!

celiala left a comment

Choose a reason for hiding this comment

Uh oh!

celiala commented Apr 4, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

knz commented Apr 5, 2023

Uh oh!

celiala commented Apr 5, 2023

Uh oh!

celiala commented Apr 6, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

celiala commented Mar 23, 2023 •

edited

Loading

celiala commented Mar 24, 2023 •

edited

Loading

celiala commented Apr 4, 2023 •

edited

Loading