Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cli/demo: sanitize the creation of secondary tenants
Prior to this patch, `cockroach demo --multitenant=true --nodes N` was creating N different secondary tenants, with one SQL server per tenant. This was totally besides the point -- to show multi-node scalability, we want N different SQL servers _for the same tenant_. This commit fixes that. Before: ``` system tenant (webui) http://127.0.0.1:8083/demologin?password=demo36514&username=demo (sql) postgresql://demo:demo36514@127.0.0.1:26260/defaultdb?sslmode=require&sslrootcert=%2Ftmp%2Fdemo1584871889%2Fca.crt (sql/jdbc) jdbc:postgresql://127.0.0.1:26260/defaultdb?password=demo36514&sslmode=require&sslrootcert=%2Ftmp%2Fdemo1584871889%2Fca.crt&user=demo (sql/unix) postgresql://demo:demo36514@/defaultdb?host=%2Ftmp%2Fdemo1584871889&port=26260 tenant 1: (webui) https://127.0.0.1:8080/demologin?password=demo36514&username=demo (sql) postgresql://demo:demo36514@127.0.0.1:26257/movr?sslmode=require&sslrootcert=%2Ftmp%2Fdemo1584871889%2Fca-client-tenant.crt (sql/jdbc) jdbc:postgresql://127.0.0.1:26257/movr?password=demo36514&sslmode=require&sslrootcert=%2Ftmp%2Fdemo1584871889%2Fca-client-tenant.crt&user=demo tenant 2: (webui) https://127.0.0.1:8081/demologin?password=demo36514&username=demo (sql) postgresql://demo:demo36514@127.0.0.1:26258/movr?sslmode=require&sslrootcert=%2Ftmp%2Fdemo1584871889%2Fca-client-tenant.crt (sql/jdbc) jdbc:postgresql://127.0.0.1:26258/movr?password=demo36514&sslmode=require&sslrootcert=%2Ftmp%2Fdemo1584871889%2Fca-client-tenant.crt&user=demo tenant 3: ... ``` After: ``` Application tenant: (webui) https://127.0.0.1:8080/demologin?password=demo41322&username=demo (sql) postgresql://demo:demo41322@127.0.0.1:26257/movr?sslmode=require&sslrootcert=%2Ftmp%2Fdemo3364057791%2Fca-client-tenant.crt (sql/jdbc) jdbc:postgresql://127.0.0.1:26257/movr?password=demo41322&sslmode=require&sslrootcert=%2Ftmp%2Fdemo3364057791%2Fca-client-tenant.crt&user=demo System tenant: (webui) http://127.0.0.1:8083/demologin?password=demo41322&username=demo (sql) postgresql://demo:demo41322@127.0.0.1:26260/defaultdb?sslmode=require&sslrootcert=%2Ftmp%2Fdemo3364057791%2Fca.crt (sql/jdbc) jdbc:postgresql://127.0.0.1:26260/defaultdb?password=demo41322&sslmode=require&sslrootcert=%2Ftmp%2Fdemo3364057791%2Fca.crt&user=demo (sql/unix) postgresql://demo:demo41322@/defaultdb?host=%2Ftmp%2Fdemo3364057791&port=26260 ``` Note: this output will be further simplified once we use a single SQL listener for multiple tenants; see cockroachdb#92580; and also when we support using a shared HTTP listener for the demo servers (i.e. when the work from PR cockroachdb#91744 is extended to `cockroach demo`). (no release note since this functionality is not yet exposed to end-users) Release note: None
- Loading branch information