-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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: set devBranch to false, version to beta.1 #121012
Conversation
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. |
2bef615
to
7d81fd9
Compare
These tests are failing Essential CI:
github.com/cockroachdb/cockroach/pkg/kv/kvserver: TestRangeMigration
github.com/cockroachdb/cockroach/pkg/upgrade/upgrades: TestStmtDiagForPlanGistMigration
github.com/cockroachdb/cockroach/pkg/server: TestSyncAllEngines
|
7d81fd9
to
5c87388
Compare
I can't figure out how to get these tests to pass after setting
any ideas much appreciated 🙇🏼 ! |
I will take a look, probably tomorrow. Just to double-check, this is intended for the release-24.1 branch (once that exists)? |
thank you! 🙇🏼
Correct: using master temporarily, to get tests to pass. But confirming that:
(updated description to clarify intent :) ) |
For --- a/pkg/upgrade/upgrades/v23_2_plan_gist_stmt_diagnostics_requests_test.go
+++ b/pkg/upgrade/upgrades/v23_2_plan_gist_stmt_diagnostics_requests_test.go
@@ -144,6 +144,7 @@ func getOldStmtDiagReqsDescriptor() *descpb.TableDescriptor {
KeyColumnNames: []string{"id"},
KeyColumnDirections: []catenumpb.IndexColumn_Direction{catenumpb.IndexColumn_ASC},
KeyColumnIDs: []descpb.ColumnID{1},
+ ConstraintID: 1,
},
Indexes: []descpb.IndexDescriptor{
{
@@ -158,9 +159,10 @@ func getOldStmtDiagReqsDescriptor() *descpb.TableDescriptor {
Version: descpb.StrictIndexColumnIDGuaranteesVersion,
},
},
- NextIndexID: 4,
- Privileges: catpb.NewCustomSuperuserPrivilegeDescriptor(privilege.ReadWriteData, username.NodeUserName()),
- NextMutationID: 1,
- FormatVersion: 3,
+ NextIndexID: 4,
+ Privileges: catpb.NewCustomSuperuserPrivilegeDescriptor(privilege.ReadWriteData, username.NodeUserName()),
+ NextMutationID: 1,
+ NextConstraintID: 2,
+ FormatVersion: 3,
}
} |
AFAICT --- a/pkg/server/migration_test.go
+++ b/pkg/server/migration_test.go
@@ -117,16 +117,10 @@ func TestSyncAllEngines(t *testing.T) {
storeSpec := base.DefaultTestStoreSpec
storeSpec.StickyVFSID = "sync-all-engines"
testServerArgs := base.TestServerArgs{
- Settings: cluster.MakeTestingClusterSettingsWithVersions(
- roachpb.Version{Major: 24, Minor: 1},
- roachpb.Version{Major: 23, Minor: 1},
- false, /* initializeVersion */
- ),
StoreSpecs: []base.StoreSpec{storeSpec},
Knobs: base.TestingKnobs{
Server: &TestingKnobs{
- BinaryVersionOverride: roachpb.Version{Major: 24, Minor: 1},
- StickyVFSRegistry: vfsRegistry,
+ StickyVFSRegistry: vfsRegistry,
},
},
} |
I think the problem is that the table descriptor returned by |
But why would the test pass on master and start failing just because we changed |
Hm, I don't have any ideas for that. |
5c87388
to
6ba7e44
Compare
Release note: None Epic: None
6ba7e44
to
f82a009
Compare
All tests pass 🎉 -- thanks for the help. I'll re-route this change to |
Now that tests pass and release-24.1 has been cut, closing this in favor of #121290 |
Notes:
master
, in order to get tests to pass. However, we plan to merge this PR ontorelease-24.1
once it is cut (i.e. not intended formaster
branch)v24.1.0-beta.1
release candidate (i.e. when release blockers are cleared, as per https://cockroachlabs.atlassian.net/jira/dashboards/10216)Putting runbook here for the next time:
1000023
and replace with23
, i.e.1000023.2
,1000023.1
prevSystemHash
)system hash
andtenant hash
)Release note: None
Epic: None