Merge #156371

156371: roachtest: remove kv/quiescence/nodes=3 test r=tbg a=tbg

See #156370. The test was already skipped in preparation for removal.
Epic: none



Co-authored-by: Tobias Grieger <tobias.b.grieger@gmail.com>

Author: craig[bot]

pkg/cmd/roachtest/tests/kv.go

@@ -457,81 +457,6 @@ func registerKVContention(r registry.Registry) {
 	})
 }
 
-func registerKVQuiescenceDead(r registry.Registry) {
-	r.Add(registry.TestSpec{
-		Name:                "kv/quiescence/nodes=3",
-		Skip:                "https://github.com/cockroachdb/cockroach/issues/156357",
-		Owner:               registry.OwnerKV,
-		Cluster:             r.MakeClusterSpec(4, spec.WorkloadNode()),
-		CompatibleClouds:    registry.AllExceptAWS,
-		Suites:              registry.Suites(registry.Nightly),
-		Leases:              registry.EpochLeases,
-		SkipPostValidations: registry.PostValidationNoDeadNodes,
-		Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-			settings := install.MakeClusterSettings(install.ClusterSettingsOption{
-				"sql.stats.automatic_collection.enabled": "false",
-			})
-			c.Start(ctx, t.L(), option.NewStartOpts(option.NoBackupSchedule), settings, c.CRDBNodes())
-			m := c.NewDeprecatedMonitor(ctx, c.CRDBNodes())
-
-			db := c.Conn(ctx, t.L(), 1)
-			defer db.Close()
-
-			err := roachtestutil.WaitFor3XReplication(ctx, t.L(), db)
-			require.NoError(t, err)
-
-			qps := func(f func()) float64 {
-
-				numInserts := func() float64 {
-					var v float64
-					if err = db.QueryRowContext(
-						ctx, `SELECT value FROM crdb_internal.node_metrics WHERE name = 'sql.insert.count'`,
-					).Scan(&v); err != nil {
-						t.Fatal(err)
-					}
-					return v
-				}
-
-				tBegin := timeutil.Now()
-				before := numInserts()
-				f()
-				after := numInserts()
-				return (after - before) / timeutil.Since(tBegin).Seconds()
-			}
-
-			const kv = "./cockroach workload run kv --duration=10m --read-percent=0"
-
-			// Initialize the database with ~10k ranges so that the absence of
-			// quiescence hits hard once a node goes down.
-			c.Run(ctx, option.WithNodes(c.WorkloadNode()), "./cockroach workload run kv --init --max-ops=1 --splits 10000 --concurrency 100 {pgurl:1}")
-			c.Run(ctx, option.WithNodes(c.WorkloadNode()), kv+" --seed 0 {pgurl:1}")
-			// Measure qps with all nodes up (i.e. with quiescence).
-			qpsAllUp := qps(func() {
-				c.Run(ctx, option.WithNodes(c.WorkloadNode()), kv+" --seed 1 {pgurl:1}")
-			})
-			// Graceful shut down third node.
-			m.ExpectDeath()
-			c.Stop(
-				ctx, t.L(), option.NewStopOpts(option.Graceful(30)), c.Node(len(c.CRDBNodes())),
-			)
-			// Measure qps with node down (i.e. without quiescence).
-			qpsOneDown := qps(func() {
-				// Use a different seed to make sure it's not just stepping into the
-				// other earlier kv invocation's footsteps.
-				c.Run(ctx, option.WithNodes(c.WorkloadNode()), kv+" --seed 2 {pgurl:1}")
-			})
-
-			if minFrac, actFrac := 0.8, qpsOneDown/qpsAllUp; actFrac < minFrac {
-				t.Fatalf(
-					"QPS dropped from %.2f to %.2f (factor of %.2f, min allowed %.2f)",
-					qpsAllUp, qpsOneDown, actFrac, minFrac,
-				)
-			}
-			t.L().Printf("QPS went from %.2f to %2.f with one node down\n", qpsAllUp, qpsOneDown)
-		},
-	})
-}
-
 func registerKVGracefulDraining(r registry.Registry) {
 	r.Add(registry.TestSpec{
 		Name:             "kv/gracefuldraining",

pkg/cmd/roachtest/tests/registry.go

@@ -89,7 +89,6 @@ func RegisterTests(r registry.Registry) {
 	registerKVBench(r)
 	registerKVContention(r)
 	registerKVGracefulDraining(r)
-	registerKVQuiescenceDead(r)
 	registerKVRangeLookups(r)
 	registerKVScalability(r)
 	registerKVSplits(r)