Skip to content

Commit c9e4b25

Browse files
committed
clusterversion: move WriteInitialTruncStateBeforeSplitApplication to 25.4
This cluster version was intended for v25.3, but [we raced with branch cut](#149494 (comment)) and this didn't make it to the release branch. The least risky thing to do is to move this to 25.4 instead of a late stage backport, so let's do that. Epic: none Release note: None
1 parent 9919801 commit c9e4b25

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

docs/generated/settings/settings-for-tenants.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,4 +418,4 @@ trace.zipkin.collector string the address of a Zipkin instance to receive trace
418418
ui.database_locality_metadata.enabled boolean true if enabled shows extended locality data about databases and tables in DB Console which can be expensive to compute application
419419
ui.default_timezone string the default timezone used to format timestamps in the ui application
420420
ui.display_timezone enumeration etc/utc the timezone used to format timestamps in the ui. This setting is deprecatedand will be removed in a future version. Use the 'ui.default_timezone' setting instead. 'ui.default_timezone' takes precedence over this setting. [etc/utc = 0, america/new_york = 1] application
421-
version version 1000025.3-upgrading-to-1000025.4-step-002 set the active cluster version in the format '<major>.<minor>' application
421+
version version 1000025.3-upgrading-to-1000025.4-step-004 set the active cluster version in the format '<major>.<minor>' application

docs/generated/settings/settings.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,6 @@
376376
<tr><td><div id="setting-ui-database-locality-metadata-enabled" class="anchored"><code>ui.database_locality_metadata.enabled</code></div></td><td>boolean</td><td><code>true</code></td><td>if enabled shows extended locality data about databases and tables in DB Console which can be expensive to compute</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
377377
<tr><td><div id="setting-ui-default-timezone" class="anchored"><code>ui.default_timezone</code></div></td><td>string</td><td><code></code></td><td>the default timezone used to format timestamps in the ui</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
378378
<tr><td><div id="setting-ui-display-timezone" class="anchored"><code>ui.display_timezone</code></div></td><td>enumeration</td><td><code>etc/utc</code></td><td>the timezone used to format timestamps in the ui. This setting is deprecatedand will be removed in a future version. Use the &#39;ui.default_timezone&#39; setting instead. &#39;ui.default_timezone&#39; takes precedence over this setting. [etc/utc = 0, america/new_york = 1]</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
379-
<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.3-upgrading-to-1000025.4-step-002</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
379+
<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.3-upgrading-to-1000025.4-step-004</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
380380
</tbody>
381381
</table>

pkg/clusterversion/cockroach_versions.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -199,17 +199,17 @@ const (
199199

200200
V25_3_AddHotRangeLoggerJob
201201

202-
// V25_3_WriteInitialTruncStateBeforeSplitApplication is the version above
203-
// which we write the initial truncated state before applying a split. By
204-
// extension, we no longer need to replicate the truncated state when
205-
// constructing the split write batch.
206-
V25_3_WriteInitialTruncStateBeforeSplitApplication
207-
208202
// V25_3 is CockroachDB v25.3. It's used for all v25.3.x patch releases.
209203
V25_3
210204

211205
V25_4_Start
212206

207+
// V25_4_WriteInitialTruncStateBeforeSplitApplication is the version above
208+
// which we write the initial truncated state before applying a split. By
209+
// extension, we no longer need to replicate the truncated state when
210+
// constructing the split write batch.
211+
V25_4_WriteInitialTruncStateBeforeSplitApplication
212+
213213
// *************************************************
214214
// Step (1) Add new versions above this comment.
215215
// Do not add new versions to a patch release.
@@ -257,12 +257,13 @@ var versionTable = [numKeys]roachpb.Version{
257257

258258
V25_3_AddHotRangeLoggerJob: {Major: 25, Minor: 2, Internal: 8},
259259

260-
V25_3_WriteInitialTruncStateBeforeSplitApplication: {Major: 25, Minor: 2, Internal: 10},
261-
262260
V25_3: {Major: 25, Minor: 3, Internal: 0},
263261

264262
// v25.4 versions. Internal versions must be even.
265263
V25_4_Start: {Major: 25, Minor: 3, Internal: 2},
264+
265+
V25_4_WriteInitialTruncStateBeforeSplitApplication: {Major: 25, Minor: 3, Internal: 4},
266+
266267
// *************************************************
267268
// Step (2): Add new versions above this comment.
268269
// Do not add new versions to a patch release.

pkg/kv/kvserver/batcheval/cmd_end_transaction.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1482,11 +1482,11 @@ func splitTriggerHelper(
14821482
return enginepb.MVCCStats{}, result.Result{}, errors.Wrap(err, "unable to write initial Replica state")
14831483
}
14841484
// TODO(arulajmani): This can be removed once all nodes are past the
1485-
// V25_3_WriteInitialTruncStateBeforeSplitApplication cluster version.
1485+
// V25_4_WriteInitialTruncStateBeforeSplitApplication cluster version.
14861486
// At that point, we'll no longer need to replicate the truncated state
14871487
// as all replicas will be responsible for writing it locally before
14881488
// applying the split.
1489-
if !rec.ClusterSettings().Version.IsActive(ctx, clusterversion.V25_3_WriteInitialTruncStateBeforeSplitApplication) {
1489+
if !rec.ClusterSettings().Version.IsActive(ctx, clusterversion.V25_4_WriteInitialTruncStateBeforeSplitApplication) {
14901490
if err := stateloader.WriteInitialTruncState(ctx, batch, split.RightDesc.RangeID); err != nil {
14911491
return enginepb.MVCCStats{}, result.Result{}, errors.Wrap(err, "unable to write initial Replica state")
14921492
}

0 commit comments

Comments
 (0)