From 53527b4a6be412cc71188d1c73a49ed6dba091ff Mon Sep 17 00:00:00 2001 From: Bram Gruneir Date: Mon, 22 Apr 2019 15:30:32 -0400 Subject: [PATCH] settings/cluster: Add a version to denote work on v19.2. Also shrink the name in the upgrade test so that it fits within our cluster name requirements. Release note: None --- docs/generated/settings/settings.html | 4 ++-- pkg/cmd/roachtest/acceptance.go | 2 +- pkg/cmd/roachtest/test.go | 2 +- pkg/settings/cluster/cockroach_versions.go | 7 ++++++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/docs/generated/settings/settings.html b/docs/generated/settings/settings.html index d8feb45db1d6..ef3b3c2b7400 100644 --- a/docs/generated/settings/settings.html +++ b/docs/generated/settings/settings.html @@ -2,7 +2,7 @@ SettingTypeDefaultDescription changefeed.experimental_poll_intervalduration1spolling interval for the prototype changefeed implementation (WARNING: may compromise cluster stability or correctness; do not edit without supervision) -changefeed.push.enabledbooleantrueif set, changed are pushed instead of pulled. This requires the kv.rangefeed.enabled setting. See https://www.cockroachlabs.com/docs/v19.1/change-data-capture.html#enable-rangefeeds-to-reduce-latency +changefeed.push.enabledbooleantrueif set, changed are pushed instead of pulled. This requires the kv.rangefeed.enabled setting. See https://www.cockroachlabs.com/docs/v19.2/change-data-capture.html#enable-rangefeeds-to-reduce-latency cloudstorage.gs.default.keystringif set, JSON key to use during Google Cloud Storage operations cloudstorage.http.custom_castringcustom root CA (appended to system's default CAs) for verifying certificates when interacting with HTTPS storage cloudstorage.timeoutduration10m0sthe timeout for import/export storage operations @@ -121,6 +121,6 @@ trace.debug.enablebooleanfalseif set, traces for recent requests can be seen in the /debug page trace.lightstep.tokenstringif set, traces go to Lightstep using this token trace.zipkin.collectorstringif set, traces go to the given Zipkin instance (example: '127.0.0.1:9411'); ignored if trace.lightstep.token is set -versioncustom validation19.1set the active cluster version in the format '.' +versioncustom validation19.1-1set the active cluster version in the format '.' diff --git a/pkg/cmd/roachtest/acceptance.go b/pkg/cmd/roachtest/acceptance.go index bd31ae3ebfb4..3ffc3cf618aa 100644 --- a/pkg/cmd/roachtest/acceptance.go +++ b/pkg/cmd/roachtest/acceptance.go @@ -51,7 +51,7 @@ func registerAcceptance(r *registry) { {name: "gossip/locality-address", fn: runCheckLocalityIPAddress}, {name: "rapid-restart", fn: runRapidRestart}, {name: "status-server", fn: runStatusServer}, - {name: "version-upgrade", fn: runVersionUpgrade, minVersion: "v19.1.0"}, + {name: "version-upgrade", fn: runVersionUpgrade, minVersion: "v19.2.0"}, } tags := []string{"default", "quick"} const numNodes = 4 diff --git a/pkg/cmd/roachtest/test.go b/pkg/cmd/roachtest/test.go index 486313f2ffab..95283d85927d 100644 --- a/pkg/cmd/roachtest/test.go +++ b/pkg/cmd/roachtest/test.go @@ -293,7 +293,7 @@ func (r *registry) PredecessorVersion() string { // This makes sure the map gets updated. An empty string often means // "use the main binary", and can mean that tests pass even though they // don't test what they want to test. - return "no-predecessor-found" + return "no-pred" } return v } diff --git a/pkg/settings/cluster/cockroach_versions.go b/pkg/settings/cluster/cockroach_versions.go index 008e9e5bce21..854f240b1dce 100644 --- a/pkg/settings/cluster/cockroach_versions.go +++ b/pkg/settings/cluster/cockroach_versions.go @@ -68,6 +68,7 @@ const ( VersionPushTxnToInclusive VersionSnapshotsWithoutLog Version19_1 + VersionStart19_2 // Add new versions here (step one of two). @@ -453,6 +454,10 @@ var versionsSingleton = keyedVersions([]keyedVersion{ // Version19_1 is CockroachDB v19.1. It's used for all v19.1.x patch releases. Key: Version19_1, Version: roachpb.Version{Major: 19, Minor: 1}, + }, { + // Version19_2_Start demarcates work towards CockroachDB v19.2. + Key: VersionStart19_2, + Version: roachpb.Version{Major: 19, Minor: 1, Unstable: 1}, }, // Add new versions here (step two of two). @@ -464,7 +469,7 @@ var ( // this binary. If this binary is started using a store marked with an older // version than BinaryMinimumSupportedVersion, then the binary will exit with // an error. - BinaryMinimumSupportedVersion = VersionByKey(Version2_1) + BinaryMinimumSupportedVersion = VersionByKey(Version19_1) // BinaryServerVersion is the version of this binary. //