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

configprofiles: emphasize "cluster virtualization" #106116

Merged
merged 1 commit into from
Jul 6, 2023

Conversation

knz
Copy link
Contributor

@knz knz commented Jul 4, 2023

Informs #106068.
Epic: CRDB-29380

Before this patch:

$ cockroach start-single-node --config-profile=help
...
replication-source                  configuration suitable for a replication source cluster (alias for "multitenant+app+sharedservice+repl")
replication-target                  configuration suitable for a replication target cluster (alias for "multitenant+noapp+repl")`
multitenant+app+sharedservice       multi-tenant cluster with one secondary tenant configured to serve SQL application traffic
multitenant+app+sharedservice+repl  multi-tenant cluster with one secondary tenant configured to serve SQL application traffic, with replication enabled
multitenant+noapp                   multi-tenant cluster with no secondary tenant defined yet
multitenant+noapp+repl              multi-tenant cluster with no secondary tenant defined yet, with replication enabled

After this patch:

replication-source              configuration suitable for a replication source cluster (alias for "virtual+app+sharedservice+repl")
replication-target              configuration suitable for a replication target cluster (alias for "virtual+noapp+repl")
virtual+app+sharedservice       one virtual cluster configured to serve SQL application traffic
virtual+app+sharedservice+repl  one virtual cluster configured to serve SQL application traffic, with replication enabled
virtual+noapp                   virtualization enabled but no virtual cluster defined yet
virtual+noapp+repl              virtualization enabled but no virtual cluster defined yet, with replication enabled

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@knz knz force-pushed the 20230704-rename-config-profiles branch from 78f940e to f1c6c52 Compare July 4, 2023 15:46
@knz knz added A-multitenancy Related to multi-tenancy backport-23.1.x Flags PRs that need to be backported to 23.1 labels Jul 4, 2023
@knz knz marked this pull request as ready for review July 4, 2023 17:45
@knz knz requested review from a team as code owners July 4, 2023 17:45
Copy link
Member

@yuzefovich yuzefovich left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 8 of 8 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @knz and @stevendanna)


pkg/configprofiles/profiles.go line 35 at r1 (raw file):

		description: "configuration suitable for a replication target cluster",
	},
	"multitenant+app+sharedservice+repl": {aliasTarget: "virtual+app+sharedservice+repl", hidden: true},

What's the thinking behind keeping these two particular aliases? Is it for backwards-compatibility? Are the config profiles being used somewhere so that we need backwards-compatibility?

Copy link
Contributor Author

@knz knz left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @stevendanna and @yuzefovich)


pkg/configprofiles/profiles.go line 35 at r1 (raw file):

Previously, yuzefovich (Yahor Yuzefovich) wrote…

What's the thinking behind keeping these two particular aliases? Is it for backwards-compatibility? Are the config profiles being used somewhere so that we need backwards-compatibility?

Let's simplify. Thanks.

@knz knz force-pushed the 20230704-rename-config-profiles branch from f1c6c52 to ed1714b Compare July 6, 2023 10:10
Before this patch:
```
$ cockroach start-single-node --config-profile=help
...
replication-source                  configuration suitable for a replication source cluster (alias for "multitenant+app+sharedservice+repl")
replication-target                  configuration suitable for a replication target cluster (alias for "multitenant+noapp+repl")`
multitenant+app+sharedservice       multi-tenant cluster with one secondary tenant configured to serve SQL application traffic
multitenant+app+sharedservice+repl  multi-tenant cluster with one secondary tenant configured to serve SQL application traffic, with replication enabled
multitenant+noapp                   multi-tenant cluster with no secondary tenant defined yet
multitenant+noapp+repl              multi-tenant cluster with no secondary tenant defined yet, with replication enabled
```

After this patch:
```
replication-source              configuration suitable for a replication source cluster (alias for "virtual+app+sharedservice+repl")
replication-target              configuration suitable for a replication target cluster (alias for "virtual+noapp+repl")
virtual+app+sharedservice       one virtual cluster configured to serve SQL application traffic
virtual+app+sharedservice+repl  one virtual cluster configured to serve SQL application traffic, with replication enabled
virtual+noapp                   virtualization enabled but no virtual cluster defined yet
virtual+noapp+repl              virtualization enabled but no virtual cluster defined yet, with replication enabled
```

Release note: None
@knz knz force-pushed the 20230704-rename-config-profiles branch from ed1714b to 8b7f893 Compare July 6, 2023 10:36
@knz
Copy link
Contributor Author

knz commented Jul 6, 2023

TFYR

bors r=yuzefovich

@craig
Copy link
Contributor

craig bot commented Jul 6, 2023

Build succeeded:

@craig craig bot merged commit 6578cef into cockroachdb:master Jul 6, 2023
@blathers-crl
Copy link

blathers-crl bot commented Jul 6, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 8b7f893 to blathers/backport-release-23.1-106116: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-multitenancy Related to multi-tenancy backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants