Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport changes from #19002 #19138

Merged

Conversation

rmloveland
Copy link
Contributor

Addresses DOC-11674

Backport changes from #19002

@rmloveland rmloveland marked this pull request as draft November 14, 2024 21:59
Copy link

netlify bot commented Nov 14, 2024

Netlify Preview

Name Link
🔨 Latest commit 313d450
🔍 Latest deploy log https://app.netlify.com/sites/cockroachdb-docs/deploys/6737af78efe08c00088d109a
😎 Deploy Preview https://deploy-preview-19138--cockroachdb-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@rmloveland rmloveland force-pushed the 20241114-DOC-11674-backport-19002 branch from 55ab610 to dc7e870 Compare November 15, 2024 17:20
@rmloveland rmloveland marked this pull request as ready for review November 15, 2024 17:20
@rmloveland rmloveland requested a review from taroface November 15, 2024 17:20
Copy link

github-actions bot commented Nov 15, 2024

Files changed:

@taroface
Copy link
Contributor

@rmloveland There's a missing link breaking the build -- can you fix the link and redeploy so that I can check the previews?

@rmloveland rmloveland force-pushed the 20241114-DOC-11674-backport-19002 branch from dc7e870 to 8c39381 Compare November 15, 2024 19:55
@rmloveland
Copy link
Contributor Author

@taroface sorry about that, i think there was a bit of skew from #19142 that added back a few enterprise licensing things that were removed in #19126 and its backport (this is why Eng team uses Bors for example)

hope build goes green now 🙏

Copy link
Contributor

@taroface taroface left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, one comment

@@ -248,7 +248,7 @@ The multiple active portals feature of the Postgres wire protocol (pgwire) is av

### Physical Cluster Replication

{% include_cached new-in.html version="v23.2" %}[Physical cluster replication]({% link {{ page.version.version }}/physical-cluster-replication-overview.md %}) continuously sends all data at the byte level from a primary cluster to an independent standby cluster. Existing data and ongoing changes on the active primary cluster, which is serving application data, replicate asynchronously to the passive standby cluster. In a disaster recovery scenario, you can cut over from the unavailable primary cluster to the standby cluster. This will stop the replication stream, reset the standby cluster to a point in time where all ingested data is consistent, and mark the standby as ready to accept application traffic. Physical cluster replication is in preview for CockroachDB Self-Hosted, and is an [enterprise-only]({% link {{ page.version.version }}/enterprise-licensing.md %}) feature. To share feedback and/or issues, contact [Support](https://support.cockroachlabs.com/hc).
{% include_cached new-in.html version="v23.2" %}[Physical cluster replication]({% link {{ page.version.version }}/physical-cluster-replication-overview.md %}) continuously sends all data at the byte level from a primary cluster to an independent standby cluster. Existing data and ongoing changes on the active primary cluster, which is serving application data, replicate asynchronously to the passive standby cluster. In a disaster recovery scenario, you can cut over from the unavailable primary cluster to the standby cluster. This will stop the replication stream, reset the standby cluster to a point in time where all ingested data is consistent, and mark the standby as ready to accept application traffic. Physical cluster replication is in preview for CockroachDB Self-Hosted.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to use the liquid var for "self-hosted" (and maybe append "clusters"). Sorry if I missed this in another PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no you didn't miss anything, i think it was introduced by the merge skew because we already fixed this in #19083 and now it's back 👻

"Self-Hosted" came back even though it was killed in

#19083
@rmloveland rmloveland merged commit fce2415 into 20241029-DOC-10624-backports Nov 15, 2024
4 checks passed
@rmloveland rmloveland deleted the 20241114-DOC-11674-backport-19002 branch November 15, 2024 20:43
rmloveland added a commit that referenced this pull request Nov 18, 2024
* Backport changes from #19008 (#19106)

Addresses DOC-11674

Summary of changes:

- Backport changes from #19008 to v23.1, v23.2, v24.1,
  and v24.2

* Backport changes from #19072 (#19109)

* Backport changes from #19072

Addresses DOC-11674

Summary of changes:

- Backport #19072 to v23.1, v23.2, v24.1, v24.2

* Backport changes from #19031 (#19108)

Addresses DOC-11674

Summary of changes:

- Backport #19031 to v23.1, v23.2, v24.1, v24.2

* Backport changes from #19001 (#19103)

Addresses DOC-10665, DOC-11674

Summary of changes:

- Backport changes from #19001; a few manual edits were
  required due to a few patches that didn't merge automagically

* Backport changes from #19126 (#19133)

Addresses DOC-11674, DOC-11692

* Merge origin/main into 20241029-DOC-10624-backports (#19140)

* Merge origin/main back into core relicensing backport branch (#19142)

* Backport changes from #19002 (#19138)

* Backport changes from #19002

Addresses DOC-11674

* Backport telemetry docs from #19131 (#19145)

Addresses DOC-11051

* Backport upgrade license info from #19125 (#19146)

Addresses DOC-11693

* Fix broken link on upgrade page include

---------

Co-authored-by: Rich Loveland <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants