From f1070771efabf38ce25888c487bdc649a30e1ca8 Mon Sep 17 00:00:00 2001
From: Alfonso Subiotto Marques <alfonso@cockroachlabs.com>
Date: Thu, 11 Jun 2020 13:34:11 +0200
Subject: [PATCH] logictest: triage tests that block 3node-tenant from running

This is done by adding an associated issue number to all directives that
block 3node-tenant.

Release note: None (testing change)
---
 pkg/sql/logictest/testdata/logic_test/alter_primary_key   | 4 +---
 pkg/sql/logictest/testdata/logic_test/builtin_function    | 8 +++-----
 pkg/sql/logictest/testdata/logic_test/cascade             | 3 +--
 pkg/sql/logictest/testdata/logic_test/cascade_opt         | 3 +--
 pkg/sql/logictest/testdata/logic_test/crdb_internal       | 2 +-
 pkg/sql/logictest/testdata/logic_test/delete              | 2 +-
 pkg/sql/logictest/testdata/logic_test/enums               | 2 +-
 pkg/sql/logictest/testdata/logic_test/event_log           | 2 +-
 pkg/sql/logictest/testdata/logic_test/family              | 2 +-
 pkg/sql/logictest/testdata/logic_test/fk                  | 2 +-
 pkg/sql/logictest/testdata/logic_test/interleaved         | 2 +-
 pkg/sql/logictest/testdata/logic_test/interleaved_join    | 2 +-
 pkg/sql/logictest/testdata/logic_test/lookup_join         | 2 +-
 pkg/sql/logictest/testdata/logic_test/run_control         | 2 +-
 .../logictest/testdata/logic_test/schema_change_in_txn    | 2 +-
 pkg/sql/logictest/testdata/logic_test/select_index        | 2 +-
 pkg/sql/logictest/testdata/logic_test/sqlsmith            | 2 +-
 pkg/sql/logictest/testdata/logic_test/system              | 2 +-
 pkg/sql/logictest/testdata/logic_test/system_namespace    | 4 +++-
 pkg/sql/logictest/testdata/logic_test/zone_config         | 2 +-
 20 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/pkg/sql/logictest/testdata/logic_test/alter_primary_key b/pkg/sql/logictest/testdata/logic_test/alter_primary_key
index 13236bd510d0..9d3033dc62e2 100644
--- a/pkg/sql/logictest/testdata/logic_test/alter_primary_key
+++ b/pkg/sql/logictest/testdata/logic_test/alter_primary_key
@@ -1,6 +1,4 @@
-# 3node-tenant fails due to
-# https://github.com/cockroachdb/cockroach/issues/47900.
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(50048)
 
 statement ok
 SET experimental_enable_hash_sharded_indexes = true
diff --git a/pkg/sql/logictest/testdata/logic_test/builtin_function b/pkg/sql/logictest/testdata/logic_test/builtin_function
index b5300cf80ae9..59e8f022cf43 100644
--- a/pkg/sql/logictest/testdata/logic_test/builtin_function
+++ b/pkg/sql/logictest/testdata/logic_test/builtin_function
@@ -1,8 +1,6 @@
-# 3node-tenant fails due to:
-# https://github.com/cockroachdb/cockroach/issues/48375
-# Specifically, a status server is unavailable when attempting to set a zone
-# config.
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(49854)
+# TODO(asubiotto): Possibly split out the test that attempts to set a zone
+# config in order to run the other ones.
 
 statement ok
 CREATE TABLE foo (a int)
diff --git a/pkg/sql/logictest/testdata/logic_test/cascade b/pkg/sql/logictest/testdata/logic_test/cascade
index d03dea7c1217..1d4774110eb9 100644
--- a/pkg/sql/logictest/testdata/logic_test/cascade
+++ b/pkg/sql/logictest/testdata/logic_test/cascade
@@ -1,5 +1,4 @@
-# This test times out when run with 3node-tenant.
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(50048)
 
 # The tests in this file target the legacy FK paths.
 statement ok
diff --git a/pkg/sql/logictest/testdata/logic_test/cascade_opt b/pkg/sql/logictest/testdata/logic_test/cascade_opt
index b86e186244e3..8389d7617af9 100644
--- a/pkg/sql/logictest/testdata/logic_test/cascade_opt
+++ b/pkg/sql/logictest/testdata/logic_test/cascade_opt
@@ -1,5 +1,4 @@
-# This test times out when run with 3node-tenant.
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(50048)
 
 # The tests in this file target the new optimizer-driven FK paths (with
 # fall back on the legacy paths for unsupported cases).
diff --git a/pkg/sql/logictest/testdata/logic_test/crdb_internal b/pkg/sql/logictest/testdata/logic_test/crdb_internal
index 6f7a1912b153..0bbc60e2c51c 100644
--- a/pkg/sql/logictest/testdata/logic_test/crdb_internal
+++ b/pkg/sql/logictest/testdata/logic_test/crdb_internal
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(47895)
 query error database "crdb_internal" does not exist
 ALTER DATABASE crdb_internal RENAME TO not_crdb_internal
 
diff --git a/pkg/sql/logictest/testdata/logic_test/delete b/pkg/sql/logictest/testdata/logic_test/delete
index c7fb25415ad5..927b1ba9f37c 100644
--- a/pkg/sql/logictest/testdata/logic_test/delete
+++ b/pkg/sql/logictest/testdata/logic_test/delete
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(50048)
 statement ok
 CREATE TABLE kv (
   k INT PRIMARY KEY,
diff --git a/pkg/sql/logictest/testdata/logic_test/enums b/pkg/sql/logictest/testdata/logic_test/enums
index c2a9ac8b267e..3fa329b467d9 100644
--- a/pkg/sql/logictest/testdata/logic_test/enums
+++ b/pkg/sql/logictest/testdata/logic_test/enums
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(50049)
 
 statement ok
 SET experimental_enable_enums=true;
diff --git a/pkg/sql/logictest/testdata/logic_test/event_log b/pkg/sql/logictest/testdata/logic_test/event_log
index bafe83090416..e7827c39f6fd 100644
--- a/pkg/sql/logictest/testdata/logic_test/event_log
+++ b/pkg/sql/logictest/testdata/logic_test/event_log
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(50047)
 ##################
 # TABLE DDL
 ##################
diff --git a/pkg/sql/logictest/testdata/logic_test/family b/pkg/sql/logictest/testdata/logic_test/family
index da6502d82731..acf23c704f48 100644
--- a/pkg/sql/logictest/testdata/logic_test/family
+++ b/pkg/sql/logictest/testdata/logic_test/family
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(50048)
 # a is the primary key so b gets optimized into a one column value. The c, d
 # family has two columns, so it's encoded as a tuple
 statement ok
diff --git a/pkg/sql/logictest/testdata/logic_test/fk b/pkg/sql/logictest/testdata/logic_test/fk
index 6b3aec41f747..a53c96ddbfcf 100644
--- a/pkg/sql/logictest/testdata/logic_test/fk
+++ b/pkg/sql/logictest/testdata/logic_test/fk
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(49582)
 # The tests in this file target the legacy FK paths.
 statement ok
 SET optimizer_foreign_keys = false
diff --git a/pkg/sql/logictest/testdata/logic_test/interleaved b/pkg/sql/logictest/testdata/logic_test/interleaved
index 8aa5cb1e90a0..4ba846c619ae 100644
--- a/pkg/sql/logictest/testdata/logic_test/interleaved
+++ b/pkg/sql/logictest/testdata/logic_test/interleaved
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(49854)
 # Grandparent table
 statement ok
 CREATE TABLE p2 (i INT PRIMARY KEY, s STRING)
diff --git a/pkg/sql/logictest/testdata/logic_test/interleaved_join b/pkg/sql/logictest/testdata/logic_test/interleaved_join
index 810efb5fbb7e..2e468e38f3de 100644
--- a/pkg/sql/logictest/testdata/logic_test/interleaved_join
+++ b/pkg/sql/logictest/testdata/logic_test/interleaved_join
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(50050)
 # The following tables form the interleaved hierarchy:
 #   name:             primary key:                # rows:   'a' = id mod X :
 #   parent1           (pid1)                      40        8
diff --git a/pkg/sql/logictest/testdata/logic_test/lookup_join b/pkg/sql/logictest/testdata/logic_test/lookup_join
index 012f5d992070..7ab7f7366685 100644
--- a/pkg/sql/logictest/testdata/logic_test/lookup_join
+++ b/pkg/sql/logictest/testdata/logic_test/lookup_join
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(49582)
 statement ok
 CREATE TABLE abc (a INT, b INT, c INT, PRIMARY KEY (a, c));
 INSERT INTO abc VALUES (1, 1, 2), (2, 1, 1), (2, NULL, 2)
diff --git a/pkg/sql/logictest/testdata/logic_test/run_control b/pkg/sql/logictest/testdata/logic_test/run_control
index c22b450a9f68..ec058644052f 100644
--- a/pkg/sql/logictest/testdata/logic_test/run_control
+++ b/pkg/sql/logictest/testdata/logic_test/run_control
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(47895)
 query error job with ID 1 does not exist
 PAUSE JOB 1
 
diff --git a/pkg/sql/logictest/testdata/logic_test/schema_change_in_txn b/pkg/sql/logictest/testdata/logic_test/schema_change_in_txn
index 3244147d46ce..a96ff6e57291 100644
--- a/pkg/sql/logictest/testdata/logic_test/schema_change_in_txn
+++ b/pkg/sql/logictest/testdata/logic_test/schema_change_in_txn
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(49854)
 # Disable automatic stats to avoid flakiness (sometimes causes retry errors).
 statement ok
 SET CLUSTER SETTING sql.stats.automatic_collection.enabled = false
diff --git a/pkg/sql/logictest/testdata/logic_test/select_index b/pkg/sql/logictest/testdata/logic_test/select_index
index 1631ec10798e..2d20ff37c8aa 100644
--- a/pkg/sql/logictest/testdata/logic_test/select_index
+++ b/pkg/sql/logictest/testdata/logic_test/select_index
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(49582)
 statement ok
 CREATE TABLE t (
   a INT PRIMARY KEY,
diff --git a/pkg/sql/logictest/testdata/logic_test/sqlsmith b/pkg/sql/logictest/testdata/logic_test/sqlsmith
index 7ffc142bf756..bea5a85ef6aa 100644
--- a/pkg/sql/logictest/testdata/logic_test/sqlsmith
+++ b/pkg/sql/logictest/testdata/logic_test/sqlsmith
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(47899)
 # This file contains regression tests discovered by sqlsmith.
 
 
diff --git a/pkg/sql/logictest/testdata/logic_test/system b/pkg/sql/logictest/testdata/logic_test/system
index 2b742303ad9a..259b2dad02dd 100644
--- a/pkg/sql/logictest/testdata/logic_test/system
+++ b/pkg/sql/logictest/testdata/logic_test/system
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(49854)
 query T
 SHOW DATABASES
 ----
diff --git a/pkg/sql/logictest/testdata/logic_test/system_namespace b/pkg/sql/logictest/testdata/logic_test/system_namespace
index 9ef4cca00a4e..27306b849793 100644
--- a/pkg/sql/logictest/testdata/logic_test/system_namespace
+++ b/pkg/sql/logictest/testdata/logic_test/system_namespace
@@ -1,4 +1,6 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(48778)
+# When run with a tenant, system.namespace has an extra entry for
+# descriptor_id_seq.
 query IITI rowsort
 SELECT * FROM system.namespace
 ----
diff --git a/pkg/sql/logictest/testdata/logic_test/zone_config b/pkg/sql/logictest/testdata/logic_test/zone_config
index 78e58a24b7f6..5d1d0f6bfc3b 100644
--- a/pkg/sql/logictest/testdata/logic_test/zone_config
+++ b/pkg/sql/logictest/testdata/logic_test/zone_config
@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant
+# LogicTest: !3node-tenant(49854)
 # Check that we can alter the default zone config.
 
 statement ok