Unified way to disable resource group (pingcap#350)

* Revert "disable resource group sql interface (pingcap#309)" This reverts commit 1582986. * new way to disable resource group Signed-off-by: zeminzhou <[email protected]> --------- Signed-off-by: zeminzhou <[email protected]>
iosmanthus · Apr 12, 2023 · e8fcf67 · e8fcf67
1 parent 21b0a17
commit e8fcf67
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/executor/infoschema_reader.go b/executor/infoschema_reader.go
@@ -182,7 +182,7 @@ func (e *memtableRetriever) retrieve(ctx context.Context, sctx sessionctx.Contex
 		case infoschema.ClusterTableMemoryUsageOpsHistory:
 			err = e.setDataForClusterMemoryUsageOpsHistory(sctx)
 		case infoschema.TableResourceGroups:
-			// err = e.setDataFromResourceGroups() // Serverless: hides resource groups from users.
+			err = e.setDataFromResourceGroups()
 		}
 		if err != nil {
 			return nil, err

diff --git a/sessionctx/variable/sysvar.go b/sessionctx/variable/sysvar.go
@@ -2334,10 +2334,6 @@ var defaultSysVars = []*SysVar{
 		},
 	},
 	{Scope: ScopeGlobal, Name: TiDBEnableResourceControl, Value: BoolToOnOff(DefTiDBEnableResourceControl), Type: TypeBool, SetGlobal: func(ctx context.Context, vars *SessionVars, s string) error {
-		if TiDBOptOn(s) {
-			logutil.BgLogger().Info("refuse to enable resource control")
-			return errors.New("serverless clusters do not support resource control configurations")
-		}
 		if TiDBOptOn(s) != EnableResourceControl.Load() {
 			EnableResourceControl.Store(TiDBOptOn(s))
 			(*SetGlobalResourceControl.Load())(TiDBOptOn(s))

diff --git a/util/sem/sem.go b/util/sem/sem.go
@@ -200,6 +200,7 @@ func IsInvisibleSysVar(varNameInLower string) bool {
 		variable.TiDBStmtSummaryFilename,
 		tidbAuditRetractLog,
 		variable.TiDBEnableAsyncCommit,
+		variable.TiDBEnableResourceControl,
 		variable.DataDir:
 		return true
 	}