diff --git a/src/current/_includes/v24.2/sidebar-data/cloud-deployments.json b/src/current/_includes/v24.2/sidebar-data/cloud-deployments.json index 9887a885f81..4ee6a8fd60a 100644 --- a/src/current/_includes/v24.2/sidebar-data/cloud-deployments.json +++ b/src/current/_includes/v24.2/sidebar-data/cloud-deployments.json @@ -58,6 +58,12 @@ "urls": [ "/cockroachcloud/provision-a-cluster-with-terraform.html" ] + }, + { + "title": "Change a Cluster's Plan Between Basic and Standard", + "urls": [ + "/cockroachcloud/change-plan-between-basic-and-standard.html" + ] } ] }, @@ -107,9 +113,15 @@ ] }, { - "title": "Migrate from Standard or Basic to Advanced", - "urls": [ - "/cockroachcloud/migrate-from-standard-to-advanced.html" + "title": "Migrate from Standard to Advanced", + "urls": [ + "/cockroachcloud/migrate-from-standard-to-advanced.html" + ] + }, + { + "title": "Change a Cluster's Plan Between Basic and Standard", + "urls": [ + "/cockroachcloud/change-plan-between-basic-and-standard.html" ] } ] @@ -160,9 +172,9 @@ ] }, { - "title": "Migrate from Standard or Basic to Advanced", - "urls": [ - "/cockroachcloud/migrate-from-standard-to-advanced.html" + "title": "Migrate from Standard to Advanced", + "urls": [ + "/cockroachcloud/migrate-from-standard-to-advanced.html" ] } ] diff --git a/src/current/_includes/v24.3/sidebar-data/cloud-deployments.json b/src/current/_includes/v24.3/sidebar-data/cloud-deployments.json index 5615c443dcb..e950f73f63e 100644 --- a/src/current/_includes/v24.3/sidebar-data/cloud-deployments.json +++ b/src/current/_includes/v24.3/sidebar-data/cloud-deployments.json @@ -58,6 +58,12 @@ "urls": [ "/cockroachcloud/provision-a-cluster-with-terraform.html" ] + }, + { + "title": "Change a Cluster's Plan Between Basic and Standard", + "urls": [ + "/cockroachcloud/change-plan-between-basic-and-standard.html" + ] } ] }, @@ -107,9 +113,15 @@ ] }, { - "title": "Migrate from Standard or Basic to Advanced", - "urls": [ - "/cockroachcloud/migrate-from-standard-to-advanced.html" + "title": "Migrate from Standard to Advanced", + "urls": [ + "/cockroachcloud/migrate-from-standard-to-advanced.html" + ] + }, + { + "title": "Change a Cluster's Plan Between Basic and Standard", + "urls": [ + "/cockroachcloud/change-plan-between-basic-and-standard.html" ] } ] @@ -160,9 +172,9 @@ ] }, { - "title": "Migrate from Standard or Basic to Advanced", - "urls": [ - "/cockroachcloud/migrate-from-standard-to-advanced.html" + "title": "Migrate from Standard to Advanced", + "urls": [ + "/cockroachcloud/migrate-from-standard-to-advanced.html" ] } ] diff --git a/src/current/_includes/v25.1/sidebar-data/cloud-deployments.json b/src/current/_includes/v25.1/sidebar-data/cloud-deployments.json index 5615c443dcb..6eeec003a17 100644 --- a/src/current/_includes/v25.1/sidebar-data/cloud-deployments.json +++ b/src/current/_includes/v25.1/sidebar-data/cloud-deployments.json @@ -58,6 +58,12 @@ "urls": [ "/cockroachcloud/provision-a-cluster-with-terraform.html" ] + }, + { + "title": "Change a Cluster's Plan Between Basic and Standard", + "urls": [ + "/cockroachcloud/change-plan-between-basic-and-standard.html" + ] } ] }, @@ -107,10 +113,16 @@ ] }, { - "title": "Migrate from Standard or Basic to Advanced", + "title": "Migrate from Standard to Advanced", "urls": [ "/cockroachcloud/migrate-from-standard-to-advanced.html" ] + }, + { + "title": "Change a Cluster's Plan Between Basic and Standard", + "urls": [ + "/cockroachcloud/change-plan-between-basic-and-standard.html" + ] } ] }, @@ -160,7 +172,7 @@ ] }, { - "title": "Migrate from Standard or Basic to Advanced", + "title": "Migrate from Standard to Advanced", "urls": [ "/cockroachcloud/migrate-from-standard-to-advanced.html" ] diff --git a/src/current/cockroachcloud/basic-cluster-management.md b/src/current/cockroachcloud/basic-cluster-management.md index a142fea76b8..e2e43756ee0 100644 --- a/src/current/cockroachcloud/basic-cluster-management.md +++ b/src/current/cockroachcloud/basic-cluster-management.md @@ -85,6 +85,12 @@ A CockroachDB {{ site.data.products.basic }} cluster cannot be moved from one re 1. [Create a new CockroachDB {{ site.data.products.basic }} cluster]({% link cockroachcloud/create-a-basic-cluster.md %}) in the desired region. 1. Once the new cluster is set up, [restore your data]({% link cockroachcloud/take-and-restore-self-managed-backups.md %}) from the backup into the new cluster. +## Change a cluster's plan + +To change your cluster's plan between {{ site.data.products.basic }} and {{ site.data.products.standard }}, refer to [Change a Cluster's Plan Between Standard and Basic]({% link cockroachcloud/change-plan-between-basic-and-standard.md %}). + +To change from {{ site.data.products.basic }} to {{ site.data.products.advanced }}, refer to [Migrate from Standard or Basic to Advanced]({% link cockroachcloud/migrate-from-standard-to-advanced.md %}). + ## Restore data from a backup Use the [Managed Backups]({% link cockroachcloud/managed-backups.md %}) to restore your cluster from automatic full cluster backups. diff --git a/src/current/cockroachcloud/change-plan-between-basic-and-standard.md b/src/current/cockroachcloud/change-plan-between-basic-and-standard.md new file mode 100644 index 00000000000..59afe964f38 --- /dev/null +++ b/src/current/cockroachcloud/change-plan-between-basic-and-standard.md @@ -0,0 +1,48 @@ +--- +title: Change a Cluster's Plan Between Basic and Standard +summary: Learn how to change a cluster's plan between a CockroachDB Basic cluster and a CockroachDB Standard cluster. +toc: true +--- + +{{site.data.alerts.callout_info}} +CockroachDB {{ site.data.products.standard }}, our new, enterprise-ready plan, is currently in [Preview]({% link {{ site.current_cloud_version }}/cockroachdb-feature-availability.md %}). +{{site.data.alerts.end}} + +This page describes how to change a cluster's [plan]({% link cockroachcloud/index.md %}#plans) between CockroachDB {{ site.data.products.standard }} and CockroachDB {{ site.data.products.basic }} using the [{{ site.data.products.cloud }} Console](https://cockroachlabs.cloud/). + +To use the CockroachDB Cloud API to change your cluster's plan, refer to [Use the CockroachDB Cloud API]({% link cockroachcloud/cloud-api.md %}#change-a-clusters-plan). + +## Before you begin + +You'll need the [Cluster Administrator]({% link cockroachcloud/authorization.md %}#cluster-administrator) or [Cluster Operator]({% link cockroachcloud/authorization.md %}#cluster-operator) role on the running {{ site.data.products.standard }} or {{ site.data.products.basic }} cluster in order to change the cluster's [plan]({% link cockroachcloud/index.md %}#plans). + +For changing plans from {{ site.data.products.standard }} to {{ site.data.products.basic }}, you must disable {{ site.data.products.standard }}-only features before starting the plan change. + +### Considerations + +- If the option to Change Plan Type is unavailable, hovering your mouse on this option may display a note that the cluster was created on legacy architecture and, therefore, its plan cannot be changed in the Cloud Console. Such a cluster will not support multi-region features or private connections on any plan. To use these features, you must take a [backup]({% link cockroachcloud/backup-and-restore-overview.md %}) and restore into a new cluster. Alternatively, to change the plan for your current cluster despite these feature limitations, you can use the [Cloud API]({% link cockroachcloud/cloud-api.md %}#change-a-clusters-plan). +- The plan change will take up to 5 minutes. +- The cluster will remain operational under the current plan during the switching period. +- You can change back the plan if needed. However, when you change from {{ site.data.products.standard }} to {{ site.data.products.basic }}, you will need to wait 48 hours before being able to change back to {{ site.data.products.standard }}. + +## Change a cluster's plan + +{{site.data.alerts.callout_info}} +When you change from {{ site.data.products.standard }} to {{ site.data.products.basic }}, you will not be able to change the plan back to {{ site.data.products.standard }} for 48 hours. +{{site.data.alerts.end}} + +1. On the [**Clusters** page]({% link cockroachcloud/cluster-management.md %}#view-clusters-page), select the cluster that requires a plan change. +1. On the [**Cluster Overview** page]({% link cockroachcloud/cluster-overview-page.md %}), select the **Action** dropdown in the top-right corner, and then **Change plan type**. If this option is unavailable, refer to [Considerations](#considerations). +1. Choose a [plan]({% link cockroachcloud/index.md %}#plans) from {{ site.data.products.standard }} or {{ site.data.products.basic }} to change to. The current plan of the cluster will be labeled, while the other plan type will be highlighted. Select **Next: Capacity**. +1. For capacity: + - If you are changing to a {{ site.data.products.standard }} plan, choose the amount of [provisioned capacity]({% link cockroachcloud/plan-your-cluster.md %}#provisioned-capacity) you want for your cluster. The Cloud Console provides a suggestion for provisioned vCPU, we recommend monitoring CPU utilization and adjusting the cluster's compute capacity as necessary. For additional information, refer to [Recommended provisioned capacity when changing cluster plan]({% link cockroachcloud/plan-your-cluster.md %}#recommended-provisioned-capacity-when-changing-cluster-plan). Select **Next: Finalize**. + - If you are changing to a [{{ site.data.products.basic }} plan]({% link cockroachcloud/create-a-basic-cluster.md %}#step-4-configure-cluster-capacity), choose whether the cluster should have **Unlimited** capacity to scale, or **Set a monthly limit**. Select **Next: Finalize**. +1. Review the changes and then **Update cluster**. + +## See more + +- [CockroachDB Cloud Documentation]({% link cockroachcloud/index.md %}) +- [Use the CockroachDB Cloud API]({% link cockroachcloud/cloud-api.md %}) + + + diff --git a/src/current/cockroachcloud/cluster-management.md b/src/current/cockroachcloud/cluster-management.md index ad037c902cf..6b6d22ad8b3 100644 --- a/src/current/cockroachcloud/cluster-management.md +++ b/src/current/cockroachcloud/cluster-management.md @@ -106,11 +106,17 @@ When the upgrade occurs, your cluster status will be listed as `Available (Maint For manual upgrades to a newer major version of CockroachDB, refer to [Upgrade a cluster in CockroachDB Cloud]({% link cockroachcloud/upgrade-cockroach-version.md %}). +## Change a cluster's plan + +To change your cluster's plan between {{ site.data.products.basic }} and {{ site.data.products.standard }}, refer to [Change a Cluster's Plan Between Standard and Basic]({% link cockroachcloud/change-plan-between-basic-and-standard.md %}). + +To change from {{ site.data.products.standard }} to {{ site.data.products.advanced }}, refer to [Migrate from Standard or Basic to Advanced]({% link cockroachcloud/migrate-from-standard-to-advanced.md %}). + ## Restore data from a backup Refer to [Managed Backups]({% link cockroachcloud/managed-backups.md %}) for instructions to restore your cluster from an automatic cluster backup. -You can also [back up and restore]({% link cockroachcloud/take-and-restore-self-managed-backups.md %}) your CockroachDB {{ site.data.products.serverless }} cluster manually. You can take [backups locally]({% link cockroachcloud/take-and-restore-self-managed-backups.md %}) to [`userfile`](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/use-userfile-storage) or [back up to cloud storage]({% link cockroachcloud/take-and-restore-self-managed-backups.md %}). +You can also [back up and restore]({% link cockroachcloud/take-and-restore-self-managed-backups.md %}) your CockroachDB {{ site.data.products.basic }} or {{ site.data.products.standard }} cluster manually. You can take [backups locally]({% link cockroachcloud/take-and-restore-self-managed-backups.md %}) to [`userfile`](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/use-userfile-storage) or [back up to cloud storage]({% link cockroachcloud/take-and-restore-self-managed-backups.md %}). ## Enable deletion protection diff --git a/src/current/cockroachcloud/migrate-from-standard-to-advanced.md b/src/current/cockroachcloud/migrate-from-standard-to-advanced.md index 42c6434c434..7b5f22dbb11 100644 --- a/src/current/cockroachcloud/migrate-from-standard-to-advanced.md +++ b/src/current/cockroachcloud/migrate-from-standard-to-advanced.md @@ -9,23 +9,23 @@ docs_area: migrate CockroachDB Standard, our new, enterprise-ready plan, is currently in [Preview]({% link {{ site.current_cloud_version }}/cockroachdb-feature-availability.md %}). {{site.data.alerts.end}} -This page has instructions for migrating data from a CockroachDB {{ site.data.products.standard }} or {{ site.data.products.basic }} cluster to a CockroachDB {{ site.data.products.advanced }} cluster, by exporting to CSV and using [`IMPORT INTO`]({% link {{site.current_cloud_version}}/import-into.md %}). You may want to migrate to CockroachDB {{ site.data.products.advanced }} if you want a single-tenant cluster with no shared resources. +This page has instructions for migrating data from a CockroachDB {{ site.data.products.standard }} cluster to a CockroachDB {{ site.data.products.advanced }} cluster, by exporting to CSV and using [`IMPORT INTO`]({% link {{site.current_cloud_version}}/import-into.md %}). You may want to migrate to CockroachDB {{ site.data.products.advanced }} if you want a single-tenant cluster with no shared resources. -The steps below use sample data from the [`tpcc` workload]({% link {{site.current_cloud_version}}/cockroach-workload.md %}#workloads). +The following steps use sample data from the [`tpcc` workload]({% link {{site.current_cloud_version}}/cockroach-workload.md %}#workloads). -## Before you start +## Before you begin These instructions assume you already have the following: -- A [CockroachDB {{ site.data.products.standard }} or {{ site.data.products.basic }} cluster]({% link cockroachcloud/quickstart.md %}) from which you want to migrate data. -- A [paid CockroachDB {{ site.data.products.advanced }} cluster]({% link cockroachcloud/quickstart-trial-cluster.md %}). Your first paid CockroachDB {{ site.data.products.advanced }} cluster is free for a 30-day trial. +- A [CockroachDB {{ site.data.products.standard }} cluster]({% link cockroachcloud/quickstart.md %}) from which you want to migrate data. +- A [CockroachDB {{ site.data.products.advanced }} cluster]({% link cockroachcloud/quickstart-trial-cluster.md %}). - [Cloud storage]({% link {{site.current_cloud_version}}/use-cloud-storage.md %}). ## Step 1. Export data to cloud storage -First, upload your CockroachDB {{ site.data.products.standard }} or {{ site.data.products.basic }} data to a cloud storage location where the CockroachDB {{ site.data.products.advanced }} cluster can access it. +First, upload your CockroachDB {{ site.data.products.standard }} data to a cloud storage location where the CockroachDB {{ site.data.products.advanced }} cluster can access it. -1. [Connect to your CockroachDB {{ site.data.products.basic }} cluster]({% link cockroachcloud/connect-to-a-basic-cluster.md %}) and run the [`EXPORT`]({% link {{site.current_cloud_version}}/export.md %}) statement for each table you need to migrate. For example, the following statement exports the `warehouse` table from the [`tpcc`]({% link {{site.current_cloud_version}}/cockroach-workload.md %}#workloads) database to an Amazon S3 bucket: +1. [Connect to your CockroachDB {{ site.data.products.standard }} cluster]({% link cockroachcloud/connect-to-your-cluster.md %}) and run the [`EXPORT`]({% link {{site.current_cloud_version}}/export.md %}) statement for each table you need to migrate. For example, the following statement exports the `warehouse` table from the [`tpcc`]({% link {{site.current_cloud_version}}/cockroach-workload.md %}#workloads) database to an Amazon S3 bucket: {% include copy-clipboard.html %} ~~~ sql @@ -34,7 +34,7 @@ First, upload your CockroachDB {{ site.data.products.standard }} or {{ site.data FROM TABLE tpcc.warehouse; ~~~ - Note that we uploaded the table in CSV format to a `migration-data` directory in the S3 bucket. + This command uploads the table in CSV format to a `migration-data` directory in the S3 bucket. The output shows the programmatically generated filename, which you'll reference when you [import the CSV](#step-2-import-the-csv): @@ -50,7 +50,7 @@ First, upload your CockroachDB {{ site.data.products.standard }} or {{ site.data 0,8,17,13,11,SF,640911111,0.0806,300000.00 ~~~ -1. Repeat this step for each table you want to migrate. For example, let's export one more table (`district`) from the `tpcc` database: +1. Repeat this step for each table you want to migrate. For example, export one more table (`district`) from the `tpcc` database: {% include copy-clipboard.html %} ~~~ sql @@ -81,26 +81,26 @@ First, upload your CockroachDB {{ site.data.products.standard }} or {{ site.data ~~~ {{site.data.alerts.callout_success}} - For more information about using cloud storage with CockroachDB, see [Use Cloud Storage]({% link {{site.current_cloud_version}}/use-cloud-storage.md %}). + For more information about using cloud storage with CockroachDB, refer to [Use Cloud Storage]({% link {{site.current_cloud_version}}/use-cloud-storage.md %}). {{site.data.alerts.end}} ## Step 2. Import the CSV {{site.data.alerts.callout_success}} -For best practices for optimizing import performance in CockroachDB, see [Import Performance Best Practices]({% link {{site.current_cloud_version}}/import-performance-best-practices.md %}). +For best practices for optimizing import performance in CockroachDB, refer to [Import Performance Best Practices]({% link {{site.current_cloud_version}}/import-performance-best-practices.md %}). {{site.data.alerts.end}} 1. [Connect to your CockroachDB {{ site.data.products.advanced }} cluster]({% link cockroachcloud/connect-to-your-cluster.md %}) and [create the database]({% link {{site.current_cloud_version}}/create-database.md %}) you want to import the tables into. For example: {% include copy-clipboard.html %} ~~~ sql - > CREATE DATABASE tpcc; + CREATE DATABASE tpcc; ~~~ 1. Write a [`CREATE TABLE`]({% link {{site.current_cloud_version}}/create-table.md %}) statement that matches the schema of the table data you're importing. {{site.data.alerts.callout_success}} - You can use the [`SHOW CREATE TABLE`]({% link {{site.current_cloud_version}}/show-create.md %}#show-the-create-table-statement-for-a-table) statement in the CockroachDB {{ site.data.products.standard }} or {{ site.data.products.basic }} cluster to view the `CREATE` statement for the table you're migrating. + You can use the [`SHOW CREATE TABLE`]({% link {{site.current_cloud_version}}/show-create.md %}#show-the-create-table-statement-for-a-table) statement in the CockroachDB {{ site.data.products.standard }} cluster to view the `CREATE` statement for the table you're migrating. {{site.data.alerts.end}} {% include v20.2/misc/csv-import-callout.md %} @@ -139,7 +139,7 @@ For best practices for optimizing import performance in CockroachDB, see [Import (1 row) ~~~ -1. Repeat the above for each CSV file you want to import. For example, let's import the `tpcc.district` data: +1. Repeat the previous command for each CSV file you want to import. For example, import the `tpcc.district` data: Issue the following statement to create a new `district` table: @@ -167,7 +167,7 @@ For best practices for optimizing import performance in CockroachDB, see [Import {% include copy-clipboard.html %} ~~~ sql IMPORT INTO tpcc.district (d_id, d_w_id, d_name, d_street_1, d_street_2, d_city, d_state, d_zip, d_tax, d_ytd, d_next_o_id) - CSV DATA ('s3://{BUCKET NAME}/migration-data/{EXPORT FILENAME}?AWS_ACCESS_KEY_ID={ACCESS_KEY}&AWS_SECRET_ACCESS_KEY={SECRET_KEY}') + CSV DATA ('s3://{BUCKET NAME}/migration-data/{EXPORT FILENAME}?AWS_ACCESS_KEY_ID={ACCESS_KEY}&AWS_SECRET_ACCESS_KEY={SECRET_KEY}'); ~~~ ~~~ @@ -177,11 +177,11 @@ For best practices for optimizing import performance in CockroachDB, see [Import (1 row) ~~~ -1. _(Optional)_ To verify that the data was imported, use [`SHOW TABLES`]({% link {{site.current_cloud_version}}/show-tables.md %}): +1. **(Optional)** To verify that the data was imported, use [`SHOW TABLES`]({% link {{site.current_cloud_version}}/show-tables.md %}): {% include copy-clipboard.html %} ~~~ sql - > SHOW TABLES FROM tpcc; + SHOW TABLES FROM tpcc; ~~~ ~~~ @@ -201,13 +201,9 @@ Once all of the tables you want to migrate have been imported into the Cockroach ALTER TABLE tpcc.district ADD CONSTRAINT fk_d_w_id_ref_warehouse FOREIGN KEY (d_w_id) REFERENCES tpcc.warehouse(w_id); ~~~ -~~~ -ALTER TABLE -~~~ - ## See also -- [`IMPORT`]({% link {{site.current_cloud_version}}/import-into.md %}) +- [`IMPORT INTO`]({% link {{site.current_cloud_version}}/import-into.md %}) - [Migration Overview]({% link {{site.current_cloud_version}}/migration-overview.md %}) - [Migrate from CSV]({% link {{site.current_cloud_version}}/migrate-from-csv.md %}) - [Import Performance Best Practices]({% link {{site.current_cloud_version}}/import-performance-best-practices.md %}) diff --git a/src/current/cockroachcloud/plan-your-cluster.md b/src/current/cockroachcloud/plan-your-cluster.md index c12b5a530b0..7de8c80ae02 100644 --- a/src/current/cockroachcloud/plan-your-cluster.md +++ b/src/current/cockroachcloud/plan-your-cluster.md @@ -43,6 +43,10 @@ You can decrease the provisioned capacity only three times within a 7-day period The CockroachDB {{ site.data.products.cloud }} Console provides insight into your cluster's compute usage relative to its provisioned capacity on a monthly basis. We recommend that you maintain at minimum a 40% capacity buffer over time, and that you increase this buffer if the workload is unpredictable or highly sensitive to query latency. You now have the advantage of historical data about the cluster's performance to help you maintain and improve the cluster's performance over time. +### Recommended provisioned capacity when changing cluster plan + +If you change your cluster's plan from {{ site.data.products.basic }} to {{ site.data.products.standard }}, the Cloud Console will provide a suggested provisioned capacity. This is calculated based on your [peak request units (RU/sec)]({% link cockroachcloud/plan-your-cluster-basic.md %}) in the last 30 days on the {{ site.data.products.basic }} cluster plan. The vCPU suggestion is based on the 30-day peak RU/sec with an additional 40% buffer. 500 RU/sec equates to 1 vCPU. There is a 10-minute roll-up period for the peak RU/sec. If the estimate is beyond the {{ site.data.products.standard }} plan's maximum supported vCPU, you may experience performance issues if your cluster's workload consistently spikes above that level. + ### Capacity pricing policies Important capacity and pricing policies mentioned elsewhere are summarized here: diff --git a/src/current/releases/cloud.md b/src/current/releases/cloud.md index 7f5c24144a8..98dd2a607b6 100644 --- a/src/current/releases/cloud.md +++ b/src/current/releases/cloud.md @@ -14,6 +14,10 @@ Get future release notes emailed to you: {% include marketo.html formId=1083 %} +## April 3, 2025 + +You can now [change cluster plans between {{ site.data.products.basic }} and {{ site.data.products.standard }}]({% link cockroachcloud/change-plan-between-basic-and-standard.md %}) from the CockroachDB {{ site.data.products.cloud }} Console. + ## February 18, 2025 CockroachDB v25.1 is now generally available for select CockroachDB Cloud {{ site.data.products.advanced }} clusters. CockroachDB v25.1 is an [Innovation release]({% link releases/release-support-policy.md %}#innovation-releases). Refer to [Create a CockroachDB {{ site.data.products.advanced }} cluster]({% link cockroachcloud/create-an-advanced-cluster.md %}) or [Upgrade to v25.1]({% link cockroachcloud/upgrade-cockroach-version.md %}).