Skip to content

Commit ecaa62c

Browse files
authored
Merge branch 'main' into fix-version-search-discrepancy
2 parents 42f81bc + 848c47a commit ecaa62c

File tree

123 files changed

+3995
-1708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+3995
-1708
lines changed

src/current/_data/redirects.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,12 @@
299299
- destination: molt/migrate-data-load-and-replication.md
300300
sources: [':version/migrate-from-postgres.md']
301301

302+
- destination: molt/migrate-load-replicate.md
303+
sources: ['molt/migrate-data-load-replicate-only.md']
304+
305+
- destination: molt/migrate-resume-replication.md
306+
sources: ['molt/migrate-replicate-only.md']
307+
302308
- destination: molt/migration-overview.md
303309
sources: [':version/migration-overview.md']
304310

src/current/_data/releases.yml

Lines changed: 120 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1798,6 +1798,16 @@
17981798
source: true
17991799
previous_release: v19.1.10
18001800

1801+
- release_name: v19.2.0
1802+
major_version: v19.2
1803+
release_date: '2019-11-12'
1804+
release_type: Production
1805+
go_version: go1.12.12
1806+
sha: 338deb20a6e34750635d6be5385498d5871ff68c
1807+
windows: true
1808+
docker:
1809+
docker_image: cockroachdb/cockroach
1810+
source: true
18011811

18021812
- release_name: v20.2.0-alpha.2
18031813
major_version: v20.2
@@ -9645,13 +9655,6 @@
96459655
docker_arm_limited_access: false
96469656
source: true
96479657
previous_release: v24.1.24
9648-
cloud_only: true
9649-
cloud_only_message_short: 'Available only for select CockroachDB Cloud clusters'
9650-
cloud_only_message: >
9651-
This version is currently available only for select
9652-
CockroachDB Cloud clusters. To request to upgrade
9653-
a CockroachDB self-hosted cluster to this version,
9654-
[contact support](https://support.cockroachlabs.com/hc/requests/new).
96559658

96569659

96579660
- release_name: v24.3.21
@@ -9680,13 +9683,6 @@
96809683
docker_arm_limited_access: false
96819684
source: true
96829685
previous_release: v24.3.20
9683-
cloud_only: true
9684-
cloud_only_message_short: 'Available only for select CockroachDB Cloud clusters'
9685-
cloud_only_message: >
9686-
This version is currently available only for select
9687-
CockroachDB Cloud clusters. To request to upgrade
9688-
a CockroachDB self-hosted cluster to this version,
9689-
[contact support](https://support.cockroachlabs.com/hc/requests/new).
96909686

96919687

96929688
- release_name: v25.2.7
@@ -9715,15 +9711,8 @@
97159711
docker_arm_limited_access: false
97169712
source: true
97179713
previous_release: v25.2.6
9718-
cloud_only: true
9719-
cloud_only_message_short: 'Available only for select CockroachDB Cloud clusters'
9720-
cloud_only_message: >
9721-
This version is currently available only for select
9722-
CockroachDB Cloud clusters. To request to upgrade
9723-
a CockroachDB self-hosted cluster to this version,
9724-
[contact support](https://support.cockroachlabs.com/hc/requests/new).
97259714

9726-
9715+
97279716
- release_name: v25.3.3
97289717
major_version: v25.3
97299718
release_date: '2025-10-17'
@@ -9750,10 +9739,112 @@
97509739
docker_arm_limited_access: false
97519740
source: true
97529741
previous_release: v25.3.2
9753-
cloud_only: true
9754-
cloud_only_message_short: 'Available only for select CockroachDB Cloud clusters'
9755-
cloud_only_message: >
9756-
This version is currently available only for select
9757-
CockroachDB Cloud clusters. To request to upgrade
9758-
a CockroachDB self-hosted cluster to this version,
9759-
[contact support](https://support.cockroachlabs.com/hc/requests/new).
9742+
9743+
9744+
- release_name: v25.4.0-rc.1
9745+
major_version: v25.4
9746+
release_date: '2025-10-22'
9747+
release_type: Testing
9748+
go_version: go1.23.12
9749+
sha: 1de9c4bc217dca385a4f912dbdf828bc5629711a
9750+
has_sql_only: true
9751+
has_sha256sum: true
9752+
mac:
9753+
mac_arm: true
9754+
mac_arm_experimental: true
9755+
mac_arm_limited_access: false
9756+
windows: true
9757+
linux:
9758+
linux_arm: true
9759+
linux_arm_experimental: false
9760+
linux_arm_limited_access: false
9761+
linux_intel_fips: true
9762+
linux_arm_fips: false
9763+
docker:
9764+
docker_image: cockroachdb/cockroach-unstable
9765+
docker_arm: true
9766+
docker_arm_experimental: false
9767+
docker_arm_limited_access: false
9768+
source: true
9769+
previous_release: v25.4.0-beta.3
9770+
9771+
- release_name: v24.3.22
9772+
major_version: v24.3
9773+
release_date: '2025-10-30'
9774+
release_type: Production
9775+
go_version: go1.25.3
9776+
sha: 303aedc82bbb8ef1b70f10cd91fcfc01d967d799
9777+
has_sql_only: true
9778+
has_sha256sum: true
9779+
mac:
9780+
mac_arm: true
9781+
mac_arm_experimental: true
9782+
mac_arm_limited_access: false
9783+
windows: true
9784+
linux:
9785+
linux_arm: true
9786+
linux_arm_experimental: false
9787+
linux_arm_limited_access: false
9788+
linux_intel_fips: true
9789+
linux_arm_fips: false
9790+
docker:
9791+
docker_image: cockroachdb/cockroach
9792+
docker_arm: true
9793+
docker_arm_experimental: false
9794+
docker_arm_limited_access: false
9795+
source: true
9796+
previous_release: v24.3.21
9797+
9798+
- release_name: v25.2.8
9799+
major_version: v25.2
9800+
release_date: '2025-10-30'
9801+
release_type: Production
9802+
go_version: go1.25.3
9803+
sha: 74dbb7ba6b71f6d336334f8fa6f5d002506a49d4
9804+
has_sql_only: true
9805+
has_sha256sum: true
9806+
mac:
9807+
mac_arm: true
9808+
mac_arm_experimental: true
9809+
mac_arm_limited_access: false
9810+
windows: true
9811+
linux:
9812+
linux_arm: true
9813+
linux_arm_experimental: false
9814+
linux_arm_limited_access: false
9815+
linux_intel_fips: true
9816+
linux_arm_fips: false
9817+
docker:
9818+
docker_image: cockroachdb/cockroach
9819+
docker_arm: true
9820+
docker_arm_experimental: false
9821+
docker_arm_limited_access: false
9822+
source: true
9823+
previous_release: v25.2.7
9824+
9825+
- release_name: v25.3.4
9826+
major_version: v25.3
9827+
release_date: '2025-10-30'
9828+
release_type: Production
9829+
go_version: go1.25.3
9830+
sha: 1cddb3a22695e967197844b214115eb645473efe
9831+
has_sql_only: true
9832+
has_sha256sum: true
9833+
mac:
9834+
mac_arm: true
9835+
mac_arm_experimental: true
9836+
mac_arm_limited_access: false
9837+
windows: true
9838+
linux:
9839+
linux_arm: true
9840+
linux_arm_experimental: false
9841+
linux_arm_limited_access: false
9842+
linux_intel_fips: true
9843+
linux_arm_fips: false
9844+
docker:
9845+
docker_image: cockroachdb/cockroach
9846+
docker_arm: true
9847+
docker_arm_experimental: false
9848+
docker_arm_limited_access: false
9849+
source: true
9850+
previous_release: v25.3.3

src/current/_data/versions.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ v1.1,2017-10-12,2018-10-12,2019-04-12,N/A,N/A,N/A,N/A,N/A,v1.0,release-1.1,2024-
44
v2.0,2018-04-04,2019-04-04,2019-10-04,N/A,N/A,N/A,N/A,N/A,v1.1,release-2.0,2024-01-01
55
v2.1,2018-10-30,2019-10-30,2020-04-30,N/A,N/A,N/A,N/A,N/A,v2.0,release-2.1,2024-01-01
66
v19.1,2019-04-30,2020-04-30,2020-10-30,N/A,N/A,N/A,N/A,N/A,v2.1,release-19.1,2024-01-01
7+
v19.2,2019-11-12,2020-11-12,2021-05-12,N/A,N/A,N/A,N/A,N/A,v19.1,release-19.2,2024-01-01
78
v20.1,2020-05-12,2021-05-12,2021-11-12,N/A,N/A,N/A,N/A,N/A,v19.1,release-20.1,2025-05-12
89
v20.2,2020-11-10,2021-11-10,2022-05-10,N/A,N/A,N/A,N/A,N/A,v20.1,release-20.2,2025-05-12
910
v21.1,2021-05-18,2022-05-18,2022-11-18,N/A,N/A,N/A,N/A,N/A,v20.2,release-21.1,2025-05-18

src/current/_includes/common/upgrade/finalize-self-hosted.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ To finalize a major-version upgrade:
1313

1414
{% include_cached copy-clipboard.html %}
1515
~~~ sql
16-
SET CLUSTER SETTING version '{VERSION}';
16+
SET CLUSTER SETTING version = '{VERSION}';
1717
~~~
1818

1919
A series of migration jobs runs to enable certain types of features and changes in the new major version that cannot be rolled back. These include changes to system schemas, indexes, and descriptors, and enabling certain types of improvements and new features. Until the upgrade is finalized, these features and functions will not be available and the command `SHOW CLUSTER SETTING version` will return the previous version.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{{site.data.alerts.callout_info}}
2+
For CockroachDB-to-CockroachDB migrations, contact your account team for guidance.
3+
{{site.data.alerts.end}}

src/current/_includes/molt/fetch-data-load-output.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
1. Check the output to observe `fetch` progress.
22

3+
{% if page.name == "migrate-load-replicate.md" %}
4+
<section class="filter-content" markdown="1" data-scope="oracle">
5+
The following message shows the appropriate values for the `--backfillFromSCN` and `--scn` replication flags to use when [starting Replicator](#start-replicator):
6+
7+
{% include_cached copy-clipboard.html %}
8+
~~~
9+
replication-only mode should include the following replicator flags: --backfillFromSCN 26685444 --scn 26685786
10+
~~~
11+
</section>
12+
{% endif %}
13+
314
A `starting fetch` message indicates that the task has started:
415

516
<section class="filter-content" markdown="1" data-scope="postgres">
@@ -16,7 +27,7 @@
1627

1728
<section class="filter-content" markdown="1" data-scope="oracle">
1829
~~~ json
19-
{"level":"info","type":"summary","num_tables":3,"cdc_cursor":"2358840","time":"2025-02-10T14:28:11-05:00","message":"starting fetch"}
30+
{"level":"info","type":"summary","num_tables":3,"cdc_cursor":"26685786","time":"2025-02-10T14:28:11-05:00","message":"starting fetch"}
2031
~~~
2132
</section>
2233

@@ -68,7 +79,7 @@
6879
~~~
6980

7081
{% if page.name != "migrate-bulk-load.md" %}
71-
This message includes a `cdc_cursor` value. You must set the `--defaultGTIDSet` replication flag to this value when starting [`replication-only` mode](#replicate-changes-to-cockroachdb):
82+
This message includes a `cdc_cursor` value. You must set the `--defaultGTIDSet` replication flag to this value when [starting Replicator](#start-replicator):
7283

7384
{% include_cached copy-clipboard.html %}
7485
~~~
@@ -81,15 +92,4 @@
8192
~~~ json
8293
{"level":"info","type":"summary","fetch_id":"f5cb422f-4bb4-4bbd-b2ae-08c4d00d1e7c","num_tables":3,"tables":["migration_schema.employees","migration_schema.payments","migration_schema.payments"],"cdc_cursor":"2358840","net_duration_ms":6752.847625,"net_duration":"000h 00m 06s","time":"2024-03-18T12:30:37-04:00","message":"fetch complete"}
8394
~~~
84-
</section>
85-
86-
{% if page.name == "migrate-data-load-replicate-only.md" %}
87-
<section class="filter-content" markdown="1" data-scope="oracle">
88-
The following message shows the appropriate values for the `--backfillFromSCN` and `--scn` replication flags to use when [starting`replication-only` mode](#replicate-changes-to-cockroachdb):
89-
90-
{% include_cached copy-clipboard.html %}
91-
~~~
92-
replication-only mode should include the following replicator flags: --backfillFromSCN 26685444 --scn 26685786
93-
~~~
94-
</section>
95-
{% endif %}
95+
</section>

src/current/_includes/molt/fetch-metrics.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
### Fetch metrics
2+
13
By default, MOLT Fetch exports [Prometheus](https://prometheus.io/) metrics at `http://127.0.0.1:3030/metrics`. You can override the address with `--metrics-listen-addr '{host}:{port}'`, where the endpoint will be `http://{host}:{port}/metrics`.
24

35
Cockroach Labs recommends monitoring the following metrics during data load:

src/current/_includes/molt/fetch-replication-output.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
DEBUG [Jan 22 13:52:40] upserted rows conflicts=0 duration=7.620208ms proposed=1 target="\"molt\".\"migration_schema\".\"employees\"" upserted=1
2020
~~~
2121

22-
{% if page.name != "migrate-replicate-only.md" %}
22+
{% if page.name != "migrate-resume-replication.md" %}
2323
{{site.data.alerts.callout_success}}
24-
If replication is interrupted, you can [resume replication]({% link molt/migrate-replicate-only.md %}).
24+
If replication is interrupted, you can [resume replication]({% link molt/migrate-resume-replication.md %}).
2525
{{site.data.alerts.end}}
2626
{% endif %}

src/current/_includes/molt/fetch-replicator-flags.md

Lines changed: 0 additions & 92 deletions
This file was deleted.

0 commit comments

Comments
 (0)