Skip to content

Commit

Permalink
Merge #91604 #92010 #92280
Browse files Browse the repository at this point in the history 
91604: tenant: add support to Log endpoints to status server r=abarganier,knz a=dhartunian

Previously, the tenant status server did not support the log-file related
endpoints leading to missing logs in the debug.zip when generating for a tenant
server.

This commit migrates the implementations from the standard status server into
the tenant, adjusts for fanout to instances instead of nodes, and leaves the
rest as-is.

Resolves: #91992
Epic: CC-5168

Release note (ops change): generating a debug.zip for a tenant server will now
include logs in the zip file.

92010: systemschema: support rbr system.sql_instances r=JeffSwenson a=JeffSwenson

## instancestorage: clean up codec interface
Refactor the codec interface. The new codec interface will be used to
support the legacy index format and the RBR compatible index format.

Part of #85736

## systemschema: support rbr system.sql_instances
The sql_instances table now supports an index format compatible with
regional by row tables. This is building on the work from #90408.

```
$ COCKROACH_MR_SYSTEM_DATABASE=true ./cockroach-short demo
[email protected]:26257/movr> SELECT * FROM system.sql_instances LIMIT 2;
  id |      addr       |                session_id                |             locality              | crdb_region
-----+-----------------+------------------------------------------+-----------------------------------+--------------
   1 | 127.0.0.1:26257 | \x0101800c678f05d4114b3aa17bcd61d336308a | {"Tiers": "region=us-east1,az=b"} | \x80
   2 |                 | NULL                                     | NULL                              | \x80
(2 rows)

$ COCKROACH_MR_SYSTEM_DATABASE=false ./cockroach-short demo
[email protected]:26257/movr> SELECT * FROM system.sql_instances LIMIT 2;
  id |      addr       |                session_id                |             locality
-----+-----------------+------------------------------------------+------------------------------------
   1 | 127.0.0.1:26257 | \x010180fb9227b38ca9445ba27ac8b1f5a2204d | {"Tiers": "region=us-east1,az=b"}
   2 |                 | NULL                                     | NULL
(2 rows)
```

Part of #85736

92280: dev-inf: Add T-multitenant label to multi-tenant r=knz a=ajstorm

Added the t-multitenant lable to the multi-tenant section of TEAMS.yaml

Release note: None

Epic: None

Co-authored-by: David Hartunian <[email protected]>
Co-authored-by: Jeff <[email protected]>
Co-authored-by: Adam Storm <[email protected]>
  • Loading branch information
@dhartunian @jeffswenson @ajstorm
4 people committed Nov 21, 2022
4 parents 06ae228 + 8e31f56 + 654fa25 + 597c94f commit 0354b67
Show file tree
Hide file tree
Showing 26 changed files with 1,252 additions and 581 deletions.
2 changes: 1 addition & 1 deletion TEAMS.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ cockroachdb/cluster-ui:
cockroachdb/obs-inf-prs:
triage_column_id: 14196277
cockroachdb/multi-tenant:
triage_column_id: 16575985
label: T-multitenant
cockroachdb/jobs:
aliases:
cockroachdb/jobs-prs: other
Expand Down
2 changes: 1 addition & 1 deletion pkg/ccl/backupccl/system_schema.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ var systemTableBackupConfiguration = map[string]systemBackupConfiguration{
systemschema.TenantUsageTable.GetName(): {
shouldIncludeInClusterBackup: optOutOfClusterBackup,
},
systemschema.SQLInstancesTable.GetName(): {
systemschema.SQLInstancesTable().GetName(): {
shouldIncludeInClusterBackup: optOutOfClusterBackup,
},
systemschema.SpanConfigurationsTable.GetName(): {
Expand Down
10 changes: 5 additions & 5 deletions pkg/ccl/multiregionccl/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,35 +60,35 @@ go_test(
"//pkg/security/securitytest",
"//pkg/server",
"//pkg/server/serverpb",
"//pkg/settings/cluster",
"//pkg/sql",
"//pkg/sql/catalog",
"//pkg/sql/catalog/descpb",
"//pkg/sql/catalog/descs",
"//pkg/sql/catalog/desctestutils",
"//pkg/sql/enum",
"//pkg/sql/catalog/tabledesc",
"//pkg/sql/catalog/typedesc",
"//pkg/sql/execinfra",
"//pkg/sql/parser",
"//pkg/sql/rowenc",
"//pkg/sql/sem/tree",
"//pkg/sql/sqlliveness/slstorage",
"//pkg/sql/sqlliveness",
"//pkg/sql/sqltestutils",
"//pkg/sql/tests",
"//pkg/sql/types",
"//pkg/testutils",
"//pkg/testutils/serverutils",
"//pkg/testutils/skip",
"//pkg/testutils/sqlutils",
"//pkg/testutils/testcluster",
"//pkg/util",
"//pkg/util/envutil",
"//pkg/util/hlc",
"//pkg/util/leaktest",
"//pkg/util/log",
"//pkg/util/randutil",
"//pkg/util/syncutil",
"//pkg/util/timeutil",
"//pkg/util/tracing",
"//pkg/util/tracing/tracingpb",
"//pkg/util/uuid",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_cockroachdb_datadriven//:datadriven",
"@com_github_cockroachdb_errors//:errors",
Expand Down
276 changes: 186 additions & 90 deletions pkg/ccl/multiregionccl/multiregion_system_table_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,131 +10,227 @@ package multiregionccl

import (
"context"
"fmt"
gosql "database/sql"
"testing"
"time"

"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/base"
"github.com/cockroachdb/cockroach/pkg/ccl/multiregionccl/multiregionccltestutils"
"github.com/cockroachdb/cockroach/pkg/keys"
"github.com/cockroachdb/cockroach/pkg/kv"
"github.com/cockroachdb/cockroach/pkg/roachpb"
"github.com/cockroachdb/cockroach/pkg/settings/cluster"
"github.com/cockroachdb/cockroach/pkg/sql"
"github.com/cockroachdb/cockroach/pkg/sql/catalog"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
"github.com/cockroachdb/cockroach/pkg/sql/enum"
"github.com/cockroachdb/cockroach/pkg/sql/sqlliveness/slstorage"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descs"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/tabledesc"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/typedesc"
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
"github.com/cockroachdb/cockroach/pkg/sql/sqlliveness"
"github.com/cockroachdb/cockroach/pkg/sql/types"
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
"github.com/cockroachdb/cockroach/pkg/util/envutil"
"github.com/cockroachdb/cockroach/pkg/util/hlc"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
"github.com/cockroachdb/cockroach/pkg/util/log"
"github.com/cockroachdb/cockroach/pkg/util/timeutil"
"github.com/cockroachdb/cockroach/pkg/util/uuid"
"github.com/cockroachdb/errors"
"github.com/stretchr/testify/require"
)

func createSqllivenessTable(
t *testing.T, db *sqlutils.SQLRunner, dbName string,
) (tableID descpb.ID) {
t.Helper()
db.Exec(t, fmt.Sprintf(`
CREATE DATABASE IF NOT EXISTS "%s"
WITH PRIMARY REGION "us-east1"
REGIONS "us-east1", "us-east2", "us-east3"
`, dbName))

// expiration needs to be column 2. slstorage.Table assumes the column id.
// session_uuid and crdb_region are identified by their location in the
// primary key.
db.Exec(t, fmt.Sprintf(`
CREATE TABLE "%s".sqlliveness (
session_uuid BYTES NOT NULL,
expiration DECIMAL NOT NULL,
crdb_region "%s".public.crdb_internal_region,
PRIMARY KEY(crdb_region, session_uuid)
) LOCALITY REGIONAL BY ROW;
`, dbName, dbName))
db.QueryRow(t, `
select u.id
from system.namespace t
join system.namespace u
on t.id = u."parentID"
where t.name = $1 and u.name = $2`,
dbName, "sqlliveness").Scan(&tableID)
return tableID
}

func TestMrSystemDatabase(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)
defer envutil.TestSetEnv(t, "COCKROACH_MR_SYSTEM_DATABASE", "1")()
// alterCrdbRegionType converts the crdb_region []byte column in a system
// database table into the system database's enum type.
func alterCrdbRegionType(
ctx context.Context, tableID descpb.ID, db *kv.DB, executor descs.TxnManager,
) error {
flags := tree.CommonLookupFlags{
Required: true,
AvoidLeased: true,
}
objFlags := tree.ObjectLookupFlags{
CommonLookupFlags: flags,
}

_, sqlDB, cleanup := multiregionccltestutils.TestingCreateMultiRegionCluster(t, 3, base.TestingKnobs{})
defer cleanup()
getRegionEnum := func(systemDB catalog.DatabaseDescriptor, txn *kv.Txn, collection *descs.Collection) (*typedesc.Mutable, *types.T, error) {
enumID, err := systemDB.MultiRegionEnumID()
if err != nil {
return nil, nil, err
}
enumTypeDesc, err := collection.GetMutableTypeByID(ctx, txn, enumID, objFlags)
if err != nil {
return nil, nil, err
}
schema, err := collection.GetImmutableSchemaByID(ctx, txn, enumTypeDesc.GetParentSchemaID(), flags)
if err != nil {
return nil, nil, err
}
enumName := tree.MakeQualifiedTypeName(systemDB.GetName(), schema.GetName(), enumTypeDesc.GetName())
enumType, err := enumTypeDesc.MakeTypesT(ctx, &enumName, nil)
if err != nil {
return nil, nil, err
}
return enumTypeDesc, enumType, nil
}

tDB := sqlutils.MakeSQLRunner(sqlDB)
getMutableColumn := func(table *tabledesc.Mutable, name string) (*descpb.ColumnDescriptor, error) {
for i := range table.Columns {
if table.Columns[i].Name == name {
return &table.Columns[i], nil
}
}
return nil, errors.New("crdb_region column not found")
}

t.Run("Sqlliveness", func(t *testing.T) {
row := tDB.QueryRow(t, `SELECT crdb_region, session_uuid, expiration FROM system.sqlliveness LIMIT 1`)
var sessionUUID string
var crdbRegion string
var rawExpiration apd.Decimal
row.Scan(&crdbRegion, &sessionUUID, &rawExpiration)
err := executor.DescsTxn(ctx, db, func(ctx context.Context, txn *kv.Txn, collection *descs.Collection) error {
_, systemDB, err := collection.GetImmutableDatabaseByID(ctx, txn, keys.SystemDatabaseID, flags)
if err != nil {
return err
}

enumTypeDesc, enumType, err := getRegionEnum(systemDB, txn, collection)
if err != nil {
return err
}

// Change the crdb_region column's type to the enum
tableDesc, err := collection.GetMutableTableByID(ctx, txn, tableID, objFlags)
if err != nil {
return err
}
column, err := getMutableColumn(tableDesc, "crdb_region")
if err != nil {
return err
}
column.Type = enumType
if err := collection.WriteDesc(ctx, false, tableDesc, txn); err != nil {
return err
}

// Add a back reference to the enum
enumTypeDesc.AddReferencingDescriptorID(tableID)
return collection.WriteDesc(ctx, false, enumTypeDesc, txn)
})
if err != nil {
return errors.Wrapf(err, "unable to change crdb_region from []byte to the multi-region enum for table %d", tableID)
}
return err
}

func TestRbrSqllivenessTable(t *testing.T) {
func TestMrSystemDatabase(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)
defer envutil.TestSetEnv(t, "COCKROACH_MR_SYSTEM_DATABASE", "1")()

ctx := context.Background()
// Enable settings required for configuring a tenant's system database as multi-region.
cs := cluster.MakeTestingClusterSettings()
sql.SecondaryTenantsMultiRegionAbstractionsEnabled.Override(context.Background(), &cs.SV, true)
sql.SecondaryTenantZoneConfigsEnabled.Override(context.Background(), &cs.SV, true)

cluster, sqlDB, cleanup := multiregionccltestutils.TestingCreateMultiRegionCluster(t, 3, base.TestingKnobs{})
cluster, _, cleanup := multiregionccltestutils.TestingCreateMultiRegionCluster(t, 3, base.TestingKnobs{}, multiregionccltestutils.WithSettings(cs))
defer cleanup()
kvDB := cluster.Servers[0].DB()
settings := cluster.Servers[0].Cfg.Settings
stopper := cluster.Servers[0].Stopper()

tDB := sqlutils.MakeSQLRunner(sqlDB)

t0 := time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)
timeSource := timeutil.NewManualTime(t0)
clock := hlc.NewClock(timeSource, base.DefaultMaxClockOffset)

setup := func(t *testing.T) *slstorage.Storage {
dbName := t.Name()
tableID := createSqllivenessTable(t, tDB, dbName)
var ambientCtx log.AmbientContext
// rbrIndexID is the index id used to access the regional by row index in
// tests. In production it will be index 2, but the freshly created test table
// will have index 1.
const rbrIndexID = 1
return slstorage.NewTestingStorage(ambientCtx, stopper, clock, kvDB, keys.SystemSQLCodec, settings,
tableID, rbrIndexID, timeSource.NewTimer)

id, err := roachpb.MakeTenantID(11)
require.NoError(t, err)

tenantArgs := base.TestTenantArgs{
Settings: cs,
TenantID: id,
Locality: *cluster.Servers[0].Locality(),
}
tenantServer, tenantSQL := serverutils.StartTenant(t, cluster.Servers[0], tenantArgs)

t.Run("SqlRead", func(t *testing.T) {
storage := setup(t)
tDB := sqlutils.MakeSQLRunner(tenantSQL)

initialUUID := uuid.MakeV4()
session, err := slstorage.MakeSessionID(enum.One, initialUUID)
require.NoError(t, err)
tDB.Exec(t, `ALTER DATABASE system SET PRIMARY REGION "us-east1"`)
tDB.Exec(t, `ALTER DATABASE system ADD REGION "us-east2"`)
tDB.Exec(t, `ALTER DATABASE system ADD REGION "us-east3"`)

ctx := context.Background()
executor := tenantServer.ExecutorConfig().(sql.ExecutorConfig)

writeExpiration := clock.Now().Add(10, 00)
require.NoError(t, storage.Insert(ctx, session, writeExpiration))
// Changing the type of the crdb_region field is required to modify the
// types with SET LOCALITY REGIONAL BY ROW.
require.NoError(t, alterCrdbRegionType(ctx, keys.SqllivenessID, executor.DB, executor.InternalExecutorFactory))
require.NoError(t, alterCrdbRegionType(ctx, keys.SQLInstancesTableID, executor.DB, executor.InternalExecutorFactory))

// Run schema validations to ensure the manual descriptor modifications are
// okay.
tDB.CheckQueryResults(t, `SELECT * FROM crdb_internal.invalid_objects`, [][]string{})

t.Run("Sqlliveness", func(t *testing.T) {
// TODO(jeffswenson): Setting the locality does not work because it causes the schema
// changer to rewrite the primary key index.
// tDB.Exec(t, `ALTER TABLE system.sqlliveness SET LOCALITY REGIONAL BY ROW`)
row := tDB.QueryRow(t, `SELECT crdb_region, session_uuid, expiration FROM system.sqlliveness LIMIT 1`)
var sessionUUID string
var crdbRegion string
var rawExpiration apd.Decimal

row := tDB.QueryRow(t, fmt.Sprintf(`SELECT crdb_region, session_uuid, expiration FROM "%s".sqlliveness`, t.Name()))
row.Scan(&crdbRegion, &sessionUUID, &rawExpiration)
require.Equal(t, "us-east1", crdbRegion)
})

require.Contains(t, []string{"us-east1", "us-east2", "us-east3"}, crdbRegion)
require.Equal(t, sessionUUID, string(initialUUID.GetBytes()))

readExpiration, err := hlc.DecimalToHLC(&rawExpiration)
require.NoError(t, err)

require.Equal(t, writeExpiration, readExpiration)
t.Run("Sqlinstances", func(t *testing.T) {
// TODO(jeffswenson): Setting the locality does not work because it causes the schema
// changer to rewrite the primary key index.
// tDB.Exec(t, `ALTER TABLE system.sql_instances SET LOCALITY REGIONAL BY ROW`)

t.Run("InUse", func(t *testing.T) {
query := `
SELECT id, addr, session_id, locality, crdb_region
FROM system.sql_instances
WHERE session_id IS NOT NULL
`
rows := tDB.Query(t, query)
require.True(t, rows.Next())
for {
var id base.SQLInstanceID
var addr, locality string
var crdb_region string
var session sqlliveness.SessionID

require.NoError(t, rows.Scan(&id, &addr, &session, &locality, &crdb_region))

require.True(t, 0 < id)
require.NotEmpty(t, addr)
require.NotEmpty(t, locality)
require.NotEmpty(t, session)
require.NotEmpty(t, crdb_region)

require.Equal(t, "us-east1", crdb_region)

if !rows.Next() {
break
}
}
require.NoError(t, rows.Close())
})

t.Run("Preallocated", func(t *testing.T) {
query := `
SELECT id, addr, session_id, locality, crdb_region
FROM system.sql_instances
WHERE session_id IS NULL
`
rows := tDB.Query(t, query)
require.True(t, rows.Next())
for {
var id base.SQLInstanceID
var addr, locality, session gosql.NullString
var crdb_region string

require.NoError(t, rows.Scan(&id, &addr, &session, &locality, &crdb_region))

require.True(t, 0 < id)
require.False(t, addr.Valid)
require.False(t, locality.Valid)
require.False(t, session.Valid)
require.NotEmpty(t, crdb_region)

if !rows.Next() {
break
}
}
require.NoError(t, rows.Close())
})
})
}
1 change: 1 addition & 0 deletions pkg/ccl/multiregionccl/multiregionccltestutils/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ go_library(
deps = [
"//pkg/base",
"//pkg/roachpb",
"//pkg/settings/cluster",
"//pkg/testutils/testcluster",
"@com_github_cockroachdb_errors//:errors",
],
Expand Down
Loading

0 comments on commit 0354b67

Please sign in to comment.