Skip to content

Commit

Permalink
clusterversion: introduce 22.1 development versions
Browse files Browse the repository at this point in the history
Release justification: Non-production code change.
Release note: None
  • Loading branch information
celiala committed Sep 3, 2021
1 parent 3fc6605 commit a5635bd
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/generated/settings/settings-for-tenants.txt
Original file line number Diff line number Diff line change
Expand Up @@ -165,4 +165,4 @@ trace.datadog.project string CockroachDB the project under which traces will be
trace.debug.enable boolean false if set, traces for recent requests can be seen at https://<ui>/debug/requests
trace.lightstep.token string if set, traces go to Lightstep using this token
trace.zipkin.collector string if set, traces go to the given Zipkin instance (example: '127.0.0.1:9411'). Only one tracer can be configured at a time.
version version 21.2 set the active cluster version in the format '<major>.<minor>'
version version 21.2-1 set the active cluster version in the format '<major>.<minor>'
2 changes: 1 addition & 1 deletion docs/generated/settings/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,6 @@
<tr><td><code>trace.debug.enable</code></td><td>boolean</td><td><code>false</code></td><td>if set, traces for recent requests can be seen at https://<ui>/debug/requests</td></tr>
<tr><td><code>trace.lightstep.token</code></td><td>string</td><td><code></code></td><td>if set, traces go to Lightstep using this token</td></tr>
<tr><td><code>trace.zipkin.collector</code></td><td>string</td><td><code></code></td><td>if set, traces go to the given Zipkin instance (example: '127.0.0.1:9411'). Only one tracer can be configured at a time.</td></tr>
<tr><td><code>version</code></td><td>version</td><td><code>21.2</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
<tr><td><code>version</code></td><td>version</td><td><code>21.2-1</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
</tbody>
</table>
21 changes: 21 additions & 0 deletions pkg/clusterversion/cockroach_versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,11 @@ const (
DateAndIntervalStyle
// V21_2 is CockroachDB v21.2. It's used for all v21.2.x patch releases.
V21_2

// v22.1 versions.
//
// Start22_1 demarcates work towards CockroachDB v22.1.
Start22_1
// Step (1): Add new versions here.
)

Expand Down Expand Up @@ -514,6 +519,22 @@ var versionsSingleton = keyedVersions{
Key: V21_2,
Version: roachpb.Version{Major: 21, Minor: 2},
},

// v21.2 versions.
{
Key: Start21_2,

// TODO(celia) - what should `Internal` be?
// - 162 <== {160, the last_value} + 2?
// - or should I jump up a few numbers (like 200?), to leave space for 21.1.x patch key/values?
Version: roachpb.Version{Major: 21, Minor: 1, Internal: 200},
},

// TODO(celia) - should I be making a Start21_2PLUS, similar to
// Start21_1PLUS, for internal serverless offerings?
// (Start21_1PLUS is a v21.1PLUS version: a special v21.1.x release
// with extra changes, used internally for the 2021 Serverless offering.)

// Step (2): Add new versions here.
}

Expand Down

0 comments on commit a5635bd

Please sign in to comment.