Skip to content

Commit 1136c51

Browse files
committed
Merge branch 'main' into DOC-13052-jwt-oidc-authorization
2 parents c59be8a + 66da887 commit 1136c51

File tree

89 files changed

+684
-296
lines changed

Some content is hidden

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

89 files changed

+684
-296
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
baseurl: /docs
2-
current_cloud_version: v25.3
2+
current_cloud_version: v25.4
33
destination: _site/docs
44
homepage_title: CockroachDB Docs
55
versions:
6-
stable: v25.3
6+
stable: v25.4
77
dev: v25.4

src/current/_data/releases.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9848,3 +9848,35 @@
98489848
docker_arm_limited_access: false
98499849
source: true
98509850
previous_release: v25.3.3
9851+
9852+
- release_name: v25.4.0
9853+
major_version: v25.4
9854+
release_date: '2025-11-03'
9855+
release_type: Production
9856+
go_version: go1.23.12
9857+
sha: 4f4179243a351bc48c00dd9243dc56b8af98e210
9858+
has_sql_only: true
9859+
has_sha256sum: true
9860+
mac:
9861+
mac_arm: true
9862+
mac_arm_experimental: true
9863+
mac_arm_limited_access: false
9864+
windows: true
9865+
linux:
9866+
linux_arm: true
9867+
linux_arm_experimental: false
9868+
linux_arm_limited_access: false
9869+
linux_intel_fips: true
9870+
linux_arm_fips: false
9871+
docker:
9872+
docker_image: cockroachdb/cockroach
9873+
docker_arm: true
9874+
docker_arm_experimental: false
9875+
docker_arm_limited_access: false
9876+
source: true
9877+
previous_release: v25.4.0-rc.1
9878+
cloud_only: true
9879+
cloud_only_message_short: 'Currently available for CockroachDB Advanced only'
9880+
cloud_only_message: >
9881+
This version is currently available only for
9882+
CockroachDB Cloud clusters on the Advanced plan.

src/current/_data/v25.4/cluster-settings.csv

Lines changed: 11 additions & 7 deletions
Large diffs are not rendered by default.

src/current/_data/versions.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ v24.3,2024-11-18,2025-11-18,2026-05-18,24.3.11,24.3.12,2025-05-05,2026-05-05,202
1919
v25.1,2025-02-18,2025-08-18,N/A,N/A,N/A,N/A,N/A,N/A,v24.3,release-25.1,2029-02-18
2020
v25.2,2025-05-09,2026-05-12,2026-11-12,N/A,N/A,N/A,N/A,N/A,v25.1,release-25.2,2029-05-09
2121
v25.3,2025-08-04,2026-02-04,N/A,N/A,N/A,N/A,N/A,N/A,v25.2,release-25.3,2029-08-04
22-
v25.4,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,v25.3,release-25.4,N/A
22+
v25.4,2025-11-03,2026-11-03,2027-05-03,N/A,N/A,N/A,N/A,N/A,v25.3,release-25.4,2029-11-03

src/current/_includes/common/upgrade/major-version-upgrade-cloud.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This section shows how to perform a major-version upgrade for a cluster in Cockr
55
1. From the **Clusters** page, find the cluster by name. If the cluster is in a folder, click the name of the folder to find the cluster. The cluster's major version and patch are shown in the **Version** column.
66
1. Check which upgrades are available to the cluster, if any.
77

8-
Beginning with v24.1, major versions alternate in type between Regular releases, which are required, and Innovation releases, which can be skipped.
8+
Major versions alternate between Regular releases, which are required, and Innovation releases, which can be skipped in {{ site.data.products.advanced }} clusters and are unavailabile in {{ site.data.products.standard }} or {{ site.data.products.basic }}.
99

1010
From a Regular release, you can upgrade to the next major release (an Innovation release) or the subsequent major release (another Regular release). From an Innovation release, you must upgrade to the next Regular release.
1111

src/current/_includes/common/upgrade/overview.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
- **Major-version upgrades**: A [major-version upgrade]({% link releases/index.md %}#major-releases), such as from v24.2 to v24.3, may include new features, updates to cluster setting defaults, and backward-incompatible changes. Performing a major-version upgrade requires an additional step to finalize the upgrade.
44

55
{% if page.path contains "cockroachcloud" %}
6-
As of 2024, there are four major versions per year, where every second release is an [innovation release]({% link cockroachcloud/upgrade-policy.md %}#innovation-releases). For CockroachDB {{ site.data.products.standard }} and CockroachDB {{ site.data.products.advanced }}, innovation releases offer shorter [support windows]({% link cockroachcloud/upgrade-policy.md %}#cockroachdb-cloud-support-policy) and can be skipped. For CockroachDB {{ site.data.products.basic }}, all major version upgrades are applied automatically as they become available, including innovation releases.
6+
As of 2024, there are four major versions per year, where every second release is an [Innovation release]({% link cockroachcloud/upgrade-policy.md %}#innovation-releases). For CockroachDB {{ site.data.products.advanced }}, Innovation releases include all of the latest features but have shorter [support windows]({% link cockroachcloud/upgrade-policy.md %}#cockroachdb-cloud-support-policy) and can be skipped.
7+
8+
For CockroachDB {{ site.data.products.standard }} and {{ site.data.products.basic }}, only Regular releases are supported. Major version upgrades are applied automatically to {{ site.data.products.standard }} and {{ site.data.products.basic }} clusters as they become available, and {{ site.data.products.standard }} clusters have the option to turn off automatic updates.
79
{% else %}
810
As of 2024, every second major version is an [Innovation release]({% link releases/release-support-policy.md %}#innovation-releases). Innovation releases offer shorter support windows and can be skipped.
911
{% endif %}
@@ -12,7 +14,7 @@
1214
A major version of CockroachDB has two phases of patch releases: a series of **testing releases** (beta, alpha, and RC releases) followed by a series of **production releases** (vX.Y.0, vX.Y.1, and so on). A major version’s first production release (the .0 release) is also known as its GA release.
1315

1416
{% if page.path contains "cockroachcloud" %}
15-
For CockroachDB {{ site.data.products.advanced }}, {{ site.data.products.standard }}, and {{ site.data.products.basic }} clusters, all production patch releases for a major version are automatically applied, until the cluster is upgraded to a new major version.
17+
For all CockroachDB {{ site.data.products.cloud }} clusters, production patch releases for a major version are automatically applied until the cluster is upgraded to a new major version. On an {{ site.data.products.advanced }} cluster, you have the option to defer patch updates for 30, 60, or 90 days if you have a [maintenance window]({% link cockroachcloud/advanced-cluster-management.md %}#set-a-maintenance-window) configured.
1618
{% endif %}
1719

1820
To learn more about CockroachDB major versions and patches, refer to the [Releases Overview]({% link releases/index.md %}#overview).
@@ -22,8 +24,8 @@ To learn more about CockroachDB major versions and patches, refer to the [Releas
2224

2325
CockroachDB Cloud plan | Major version upgrades | Innovation releases
2426
---------------------- | ---------------------- | ----------------------
25-
Basic | Automatic | Required
26-
Standard | Automatic (default) or customer-initiated | Optional
27+
Basic | Automatic | Unavailable
28+
Standard | Automatic (default) or customer-initiated | Unavailable
2729
Advanced | Customer-initiated | Optional
2830

2931
{{site.data.alerts.callout_info}}
@@ -37,7 +39,7 @@ For all Cloud plans:
3739
{% endif %}
3840
### Compatible versions
3941

40-
A cluster may always be upgraded to the next major release{% if page.path contains "cockroachcloud" %} once it is made available in CockroachDB Cloud{% endif %}. As of v24.1{% if page.path contains "cockroachcloud" %}, for CockroachDB {{ site.data.products.standard }} and CockroachDB {{ site.data.products.advanced }} clusters{% endif %}, every second major verison is an Innovation release that can be skipped:
42+
A cluster may always be upgraded to the next major {% if page.path contains "cockroachcloud" %}Regular release once it is made available in CockroachDB Cloud{% else %}release{% endif %}. Every second major version is an Innovation release that can be deployed or skipped{% if page.path contains "cockroachcloud" %} on CockroachDB {{ site.data.products.advanced }} clusters{% endif %}:
4143

4244
- If your cluster is running a major version that is a Regular release, it can be upgraded to either:
4345
- the next major version (an Innovation release)

src/current/_includes/head.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
data-website-id="98d1a919-dfd3-4d54-a8a0-58c9094f57e5"
148148
data-project-name="CockroachDB"
149149
data-project-color="#6933FF"
150-
data-project-logo="https://upload.wikimedia.org/wikipedia/en/3/31/Cockroach_Labs_Logo.png"
150+
data-project-logo="https://www.cockroachlabs.com/img/ai-chat-logo-m.png"
151151
data-kapa-branding-hide="true"
152152
data-modal-title="CockroachDB AI"
153153
data-modal-disclaimer="This AI bot is experimental. Don't rely on it for production workloads. Always consult the official CockroachDB documentation. Interactions with this AI bot may be monitored or recorded, and your use of the AI bot is subject to the Cockroach Labs' [Terms of Use](https://www.cockroachlabs.com/website-terms-of-use/) and [Privacy policy](https://www.cockroachlabs.com/privacy/)."

src/current/_includes/releases/v25.2/v25.2.0-alpha.3.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ Release Date: April 7, 2025
2424
[#143588][#143588]
2525
- `like_regex` predicate evaluation is now supported in JSONPath queries. For example, `SELECT jsonb_path_query('{}', '"hello" like_regex "^he.*$"');`.
2626
[#143240][#143240]
27-
- Added the `EXPERIMENTAL COPY` option to `RESTORE`, which runs online `RESTORE`, but waits to publish the tables until all data is downloaded.
28-
[#143674][#143674]
2927

3028
<h3 id="v25-2-0-alpha-3-operational-changes">Operational changes</h3>
3129

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1-
- Bullet
1+
- `bulkio.backup.deprecated_full_backup_with_subdir.enabled`
2+
3+
Removed the `bulkio.backup.deprecated_full_backup_with_subdir.enabled` cluster setting. This optional ability to specify a target subdirectory with the `BACKUP` command when creating a full backup was deprecated in v22.1. [#153628][#153628]
4+
5+
- `sql.schema.approx_max_object_count` (default: `20000`)
6+
7+
Added cluster setting `sql.schema.approx_max_object_count` to prevent creation of new schema objects when the limit is exceeded. The check uses cached table statistics for performance and is approximate - it may not be immediately accurate until table statistics are updated by the background statistics refreshing job. Clusters that have been running stably with a larger object count should raise the limit or disable the limit by setting the value to `0`. In future releases, the default value for this setting will be raised as more CockroachDB features support larger object counts. [#154576][#154576]
8+
9+
[#153628]: https://github.com/cockroachdb/cockroach/pull/153628
10+
[#154576]: https://github.com/cockroachdb/cockroach/pull/154576
Lines changed: 75 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,80 @@
1-
Changes to [cluster settings]({% link v25.3/cluster-settings.md %}) should be reviewed prior to upgrading. New default cluster setting values will be used unless you have manually set a value for a setting. This can be confirmed by running the SQL statement `SELECT * FROM system.settings` to view the non-default settings.
1+
Changes to [cluster settings]({% link v25.4/cluster-settings.md %}) should be reviewed prior to upgrading. New default cluster setting values will be used unless you have manually set a value for a setting. This can be confirmed by running the SQL statement `SELECT * FROM system.settings` to view the non-default settings.
22

3-
<h5 id="v25-3-0-settings-added">New settings</h5>
3+
<h5 id="v25-4-0-settings-added">New settings</h5>
44

5-
- Bullet
6-
- Bullet
7-
- Bullet
8-
- Bullet
5+
- `changefeed.progress.frontier_persistence.interval` (default: `30s`)
96

10-
<h5 id="v25-3-0-settings-changed">Setting changes</h5>
7+
Changefeeds will now periodically persist their entire span frontiers so that fewer duplicates will need to be emitted during restarts. The default persistence interval is 30s, but this can be configured with the `changefeed.progress.frontier_persistence.interval` cluster setting. [#153491][#153491]
118

12-
- Bullet
13-
- Bullet
9+
- `log.channel_compatibility_mode.enabled` (default: `true`)
1410

15-
[#]: https://github.com/cockroachdb/cockroach/pull/
16-
[#]: https://github.com/cockroachdb/cockroach/pull/
17-
[#]: https://github.com/cockroachdb/cockroach/pull/
18-
[#]: https://github.com/cockroachdb/cockroach/pull/
11+
- In a future major release, changefeed events will be logged to the `CHANGEFEED` logging channel instead of `TELEMETRY`. To test the impact of this change before upgrading, set the cluster setting `log.channel_compatibility_mode.enabled` to `false`. This redirects changefeed logs to the `CHANGEFEED` channel and should be tested only in non-production environments. [#151807][#151807]
12+
- In a future major release, SQL performance events will be logged to the `SQL_EXEC` channel instead of the `SQL_PERF` and `SQL_INTERNAL_PERF` channels. To test the impact of this change, you can set the new cluster setting `log.channel_compatibility_mode.enabled` to `false`. This redirects SQL performance logs to the `SQL_EXEC` channel. This setting should not be used in production environments, as it may affect downstream logging pipelines. [#151827][#151827]
13+
- In a future major release, `sampled_query` and `sampled_transaction` events will move from the `TELEMETRY` channel to the `SQL_EXEC` logging channel. To test for potential logging pipeline impacts of these changes, set `log.channel_compatibility_mode.enabled` to `false`. Avoid testing in production, as this setting changes live log behavior. [#151949][#151949]
14+
15+
- `sql.catalog.allow_leased_descriptors.enabled` (default: `false`)
16+
17+
Added the `sql.catalog.allow_leased_descriptors.enabled` cluster setting, which is false by default. When set to true, queries that access the `pg_catalog` or `information_schema` can use cached leased descriptors to populate the data in those tables, with the tradeoff that some of the data could be stale. [#154491][#154491]
18+
19+
- `sql.log.scan_row_count_misestimate.enabled` (default: `false`)
20+
21+
Added a cluster setting (`sql.log.scan_row_count_misestimate.enabled`) that enables logging a warning on the gateway node when optimizer estimates for scans are inaccurate. The log message includes the table and index being scanned, the estimated and actual row counts, the time since the last table stats collection, and the table's estimated staleness. [#155123][#155123]
22+
23+
- `sql.stats.error_on_concurrent_create_stats.enabled` (default: `true`)
24+
25+
Introduced the cluster setting `sql.stats.error_on_concurrent_create_stats.enabled`, which modifies how CockroachDB reacts to concurrent auto stats jobs. The default, `true`, maintains the previous behavior. Setting `sql.stats.error_on_concurrent_create_stats.enabled` to `false` will cause the concurrent auto stats job to be skipped with just a log entry and no increased error counters. [#149538][#149538]
26+
27+
- `sql.trace.txn.include_internal.enabled` (default: `true`)
28+
29+
You can now exclude internal transactions from probabilistic transaction tracing and latency-based logging by setting the `sql.trace.txn.include_internal.enabled` cluster setting to false. This setting is enabled by default to preserve the current behavior, but disabling it is recommended when debugging customer workloads to reduce noise in trace output. [#151433][#151433]
30+
31+
- `sql.trace.txn.jaeger_json_output.enabled` (default: `false`)
32+
33+
You can now output transaction traces to the logs in Jaeger-compatible JSON format. This is controlled by the `sql.trace.txn.jaeger_json_output.enabled` cluster setting, which is disabled by default. When enabled, traces triggered by probabilistic sampling or statement latency thresholds will be formatted for easier ingestion by tools that support the Jaeger tracing format. [#151414][#151414]
34+
35+
- `storage.unhealthy_write_duration` (default: `20s`)
36+
37+
Added the cluster setting `storage.unhealthy_write_duration` (defaults to 20s), which is used to indicate to the allocator that a store's disk is unhealthy. The cluster setting `kv.allocator.disk_unhealthy_io_overload_score` controls the overload score assigned to a store with an unhealthy disk, where a higher score results in preventing lease or replica transfers to the store, or shedding of leases by the store. The default value of that setting is 0, so the allocator behavior is unaffected. [#154459][#154459]
38+
39+
<h5 id="v25-4-0-settings-changed-default">Settings with changed defaults</h5>
40+
41+
- `feature.vector_index.enabled` now defaults to `true`. Vector indexing is now enabled by default. [#155561][#155561]
42+
43+
- `storage.value_separation.enabled` now defaults to `true`. This enables [value separation]({% link v25.4/architecture/storage-layer.md %}#value-separation) for SSTables, where values exceeding a certain size threshold are stored in separate blob files rather than inline in the SSTable. This helps improve write performance (write amplification) by avoiding rewriting such values during compactions. [#148857][#148857]
44+
45+
<h5 id="v25-4-0-settings-removed">Removed settings</h5>
46+
47+
- `bulkio.backup.deprecated_full_backup_with_subdir.enabled`
48+
49+
Removed the `bulkio.backup.deprecated_full_backup_with_subdir.enabled` cluster setting. This optional ability to specify a target subdirectory with the `BACKUP` command when creating a full backup was deprecated in v22.1. [#153628][#153628]
50+
51+
- `storage.columnar_blocks.enabled` {% comment %}TODO: Verify with jbowens - Is this backward-incompatible since it can't be disabled anymore?{% endcomment %}
52+
53+
Removed the `storage.columnar_blocks.enabled` cluster setting; columnar blocks are always enabled. [#149371][#149371]
54+
55+
<h5 id="v25-4-0-settings-other-changes">Other setting changes</h5>
56+
57+
- `sql.ttl.replan_flow_threshold` {% comment %}Verify with spilchen{% endcomment %}
58+
59+
Updated TTL job replanning to be less sensitive by focusing specifically on detecting when nodes become unavailable rather than reacting to all plan differences. The cluster setting `sql.ttl.replan_flow_threshold` may have been set to `0` to work around the TTL replanner being too sensitive; this fix will alleviate that and any instance that had set `replan_flow_threshold` to `0` can be reset back to the default. [#150771][#150771]
60+
61+
- Updated the redaction policy for cluster settings in `debug zip` output. All "sensitive" settings are now redacted in all debug zips, whether or not redaction is explicitly requested. In redacted debug zips, both "sensitive" and "non-reportable" settings are redacted. This replaces the previous behavior, which redacted all string-type settings only in redacted debug zips. [#150364][#150364]
62+
63+
- Added a new file, `cluster_settings_history.txt`, to debug zips. This file contains a history of cluster setting changes based on the system event log table. The history is only available while the corresponding events remain in the table. Sensitive settings are always redacted, and non-reportable settings are redacted when the debug zip is generated with redaction enabled. [#151066][#151066]
64+
65+
[#149371]: https://github.com/cockroachdb/cockroach/pull/149371
66+
[#149538]: https://github.com/cockroachdb/cockroach/pull/149538
67+
[#150364]: https://github.com/cockroachdb/cockroach/pull/150364
68+
[#150771]: https://github.com/cockroachdb/cockroach/pull/150771
69+
[#151066]: https://github.com/cockroachdb/cockroach/pull/151066
70+
[#151414]: https://github.com/cockroachdb/cockroach/pull/151414
71+
[#151433]: https://github.com/cockroachdb/cockroach/pull/151433
72+
[#151807]: https://github.com/cockroachdb/cockroach/pull/151807
73+
[#151827]: https://github.com/cockroachdb/cockroach/pull/151827
74+
[#151949]: https://github.com/cockroachdb/cockroach/pull/151949
75+
[#153491]: https://github.com/cockroachdb/cockroach/pull/153491
76+
[#153628]: https://github.com/cockroachdb/cockroach/pull/153628
77+
[#154459]: https://github.com/cockroachdb/cockroach/pull/154459
78+
[#154491]: https://github.com/cockroachdb/cockroach/pull/154491
79+
[#155123]: https://github.com/cockroachdb/cockroach/pull/155123
80+
[#155561]: https://github.com/cockroachdb/cockroach/pull/155561

0 commit comments

Comments
 (0)