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

clusterversion: mint 25.1 #140412

Merged
merged 1 commit into from
Feb 6, 2025
Merged

Conversation

celiala
Copy link
Collaborator

@celiala celiala commented Feb 3, 2025

This PR:

  • mints release-25.1
  • bumps version.txt to rc.1

checklist for next time:

  • confirm that any outstanding version gates for blockers have merged
  • set SystemDatabaseSchemaBootstrapVersion to V25_1
  • ./dev test pkg/sql/catalog/bootstrap --rewrite -f TestInitialValuesToString
  • bump version.txt to rc.1

Release note: None
Epic: REL-1751
Release justification: release-process change: mints 25.1.

Copy link

blathers-crl bot commented Feb 3, 2025

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
Copy link
Member

This change is Reviewable

@celiala celiala force-pushed the mint-25.1 branch 2 times, most recently from 5df5f83 to 1c39c18 Compare February 5, 2025 02:55
@celiala
Copy link
Collaborator Author

celiala commented Feb 5, 2025

[updated Feb 6, 1:15p PST]


resolved / no longer errors:

  1. pkg/upgrade/upgrademanager/upgrademanager_test: TestPauseMigration (should be fixed by release-25.1: upgrade_manager: fix ListBetweenOverride for some tests #140570)
  2. pkg/backup: TestDataDriven_restore_validation_only (same error as backup: TestDataDriven_restore_validation_only failed #140550) (should no longer be an issue )
  3. pkg/ccl/testccl/workload/schemachange/schemachange_test: TestWorkload (should be fixed by release-25.1: workload/schemachanger: set session variables on all connections #140598)
  4. pkg/upgrade/upgrademanager/upgrademanager_test: TestConcurrentMigrationAttempts -- same error as TestPauseMigration (should be fixed by release-25.1: upgrade_manager: fix ListBetweenOverride for some tests #140570)
  5. pkg/ccl/kvccl/kvtenantccl/upgradeccl/upgradeccl_test: TestTenantUpgradeFailure (added patch from clusterversion: mint 25.1 #140412 (comment))
  6. github.com/cockroachdb/cockroach/pkg/server: TestJoinVersionGate fixed via #140499
  7. github.com/cockroachdb/cockroach/pkg/server: TestClusterVersionUpgrade fixed via #140499
  8. pkg/ccl/cloudccl/cloudprivilege failures are the same as pkg/ccl/cloudccl/cloudprivilege/cloudprivilege_test: TestURIRequiresAdminOrPrivilege failed #140524

https://mesolite.cluster.engflow.com/invocations/default/67888c1f-bbcd-4811-8147-66736ae9313d?treeFilterStatus=failed#targets-Ly9wa2cvY2NsL2Nsb3VkY2NsL2Nsb3VkcHJpdmlsZWdlOmNsb3VkcHJpdmlsZWdlX3Rlc3Q=

@celiala
Copy link
Collaborator Author

celiala commented Feb 5, 2025

test failure 1 [of 4] is because endCV is greater than V25_1:

--- FAIL: TestPauseMigration (0.44s)
    test_log_scope.go:165: test logs captured to: /tmp/cockroach/_tmp/b105ec692cb73561b99946781063daad/logTestPauseMigration2970154246
    test_log_scope.go:76: use -show-logs to present logs inline
    test_server_shim.go:88: cluster virtualization disabled due to issue: #107393 (expected label: C-bug)
    manager_external_test.go:675:
        	Error Trace:	pkg/upgrade/upgrademanager/manager_external_test.go:675
        	Error:      	Received unexpected error:
        	            	pq: internal error: new system schema version (25.1) is lower than previous system schema version (25.1-upgrading-step-002)
        	Test:       	TestPauseMigration
    panic.go:626: -- test log scope end --
FAIL
I250205 05:36:52.082345 1 (gostd) testmain.go:99  [-] 1  Test //pkg/upgrade/upgrademanager:upgrademanager_test exited with error code 1

@celiala
Copy link
Collaborator Author

celiala commented Feb 5, 2025

UPDATE: resolved ✅

test 2 [of 4] TestTenantUpgradeFailure/upgrade_tenant_have_it_crash_then_resume Failure

=== RUN   TestTenantUpgradeFailure/upgrade_tenant_have_it_crash_then_resume
    tenant_upgrade_test.go:468: create a tenant before upgrading anything
    tenant_upgrade_test.go:473: ensure that the tenant works and verify its version
    tenant_upgrade_test.go:489: upgrade the storage cluster to v2
    tenant_upgrade_test.go:492: ensure that the tenant still works
    tenant_upgrade_test.go:495: upgrade the tenant cluster, expecting the upgrade to fail on v1
    tenant_upgrade_test.go:425: v1 migration running
    tenant_upgrade_test.go:496: expected query 'SET CLUSTER SETTING version = $1' to return a non-nil error
    --- FAIL: TestTenantUpgradeFailure/upgrade_tenant_have_it_crash_then_resume (2.39s)

@celiala
Copy link
Collaborator Author

celiala commented Feb 5, 2025

UPDATE: resolved ✅

TestJoinVersionGate and TestClusterVersionUpgrade have the same error, which will be fixed by #140499

@celiala
Copy link
Collaborator Author

celiala commented Feb 5, 2025

@dt @RaduBerinde - I could use your help figuring out why these version-related failures are happening, when I try to mint 25.1 - thank you!

Tests are in these comments:

@celiala
Copy link
Collaborator Author

celiala commented Feb 5, 2025

UPDATE: resolved ✅

new pkg/ccl/cloudccl/cloudprivilege failures are the same as #140524

@RaduBerinde
Copy link
Member

The TestTenantUpgradeFailure failure is fixed by this diff:

--- a/pkg/ccl/kvccl/kvtenantccl/upgradeccl/tenant_upgrade_test.go
+++ b/pkg/ccl/kvccl/kvtenantccl/upgradeccl/tenant_upgrade_test.go
@@ -355,7 +355,7 @@ func TestTenantUpgradeFailure(t *testing.T) {
                        break
                }
        }
-       if v1 == (roachpb.Version{}) {
+       if v1 == (roachpb.Version{}) || v1 == v2 {
                // There is no in-between version supported; skip this test.
                skip.IgnoreLint(t, "test can only run when we support two previous releases")
        }

craig bot pushed a commit that referenced this pull request Feb 6, 2025
140479: admission: fix shutdown logic for store grant coordinator r=RaduBerinde a=aadityasondhi

We were incorrectly waiting on the ticker outside of the select statement, which would inherently cause a delay in case of the stopping sequence being initiated.

Informs #140454.

Release note: None

140486: quantize: optimize single vector quantized sets r=andy-kimball a=andy-kimball

Allocate array memory in-line for quantized sets that contain only a single vector.

Epic: CRDB-42943

Release note: None

140489: roachpb: add pretty-printing for three remaining value tags r=rickystewart a=yuzefovich

TIMETZ, GEO, and BOX2D value tags were missing support for pretty-printing.

Epic: None
Release note: None

140498: server: update `prev()` logic to account for more releases per year r=RaduBerinde a=celiala

This fix is needed to unblock the minting of 25.1, see #140412 (comment).

This PR adjusts `prev()` to account for the shift to more releases per year, where we followed this release cadence:
- Before 2024, we shipped 2 releases a year. 
- In 2024, we shipped 3 releases. 
- And 2025 onwards, we will be shipping 4 releases a year.

Release note: None
Epic: REL-1751
Release justification: test-only fix, to unblock release-process.

Co-authored-by: Aaditya Sondhi <[email protected]>
Co-authored-by: Andrew Kimball <[email protected]>
Co-authored-by: Yahor Yuzefovich <[email protected]>
Co-authored-by: Celia La <[email protected]>
Copy link
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

Release note: None
Epic: REL-1751
Release justification: release-process change: mints 25.1.
@celiala
Copy link
Collaborator Author

celiala commented Feb 6, 2025

I'm going to skip this failing test:

Test run details:
https://mesolite.cluster.engflow.com/invocations/default/13e6038b-576a-49a2-9a7f-f87db70e1999?treeFilterStatus=failed&testReportShard=37&testReportAttempt=0#highlights

@celiala celiala marked this pull request as ready for review February 6, 2025 21:21
@celiala celiala requested review from a team as code owners February 6, 2025 21:21
@celiala celiala requested review from a team as code owners February 6, 2025 21:21
@celiala celiala merged commit 8395437 into cockroachdb:release-25.1 Feb 6, 2025
19 of 20 checks passed
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.

4 participants