From da31af81a61d0f37a3b1c0b6cbde3fed91fbf661 Mon Sep 17 00:00:00 2001 From: Ryan Leung Date: Fri, 19 Jul 2024 11:45:01 +0800 Subject: [PATCH] executor: improve set config error message for ms (#52910) close pingcap/tidb#52912 --- pkg/executor/set_config.go | 5 ++++- pkg/executor/set_test.go | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/executor/set_config.go b/pkg/executor/set_config.go index 0b9541acbc093..7ed6aa119c45a 100644 --- a/pkg/executor/set_config.go +++ b/pkg/executor/set_config.go @@ -49,12 +49,15 @@ type SetConfigExec struct { func (s *SetConfigExec) Open(context.Context) error { if s.p.Type != "" { s.p.Type = strings.ToLower(s.p.Type) - if s.p.Type != "tikv" && s.p.Type != "tidb" && s.p.Type != "pd" && s.p.Type != "tiflash" { + if s.p.Type != "tikv" && s.p.Type != "tidb" && s.p.Type != "pd" && s.p.Type != "tiflash" && s.p.Type != "tso" && s.p.Type != "scheduling" { return errors.Errorf("unknown type %v", s.p.Type) } if s.p.Type == "tidb" { return errors.Errorf("TiDB doesn't support to change configs online, please use SQL variables") } + if s.p.Type == "tso" || s.p.Type == "scheduling" { + return errors.Errorf("%s doesn't support to change configs online", s.p.Type) + } } if s.p.Instance != "" { s.p.Instance = strings.ToLower(s.p.Instance) diff --git a/pkg/executor/set_test.go b/pkg/executor/set_test.go index 112913b3735ab..9068a1a195c04 100644 --- a/pkg/executor/set_test.go +++ b/pkg/executor/set_test.go @@ -1626,6 +1626,8 @@ func TestSetClusterConfig(t *testing.T) { {ServerType: "tikv", Address: "127.0.0.1:5555", StatusAddr: "127.0.0.1:5555"}, {ServerType: "tikv", Address: "127.0.0.1:6666", StatusAddr: "127.0.0.1:6666"}, {ServerType: "tiflash", Address: "127.0.0.1:3933", StatusAddr: "127.0.0.1:7777"}, + {ServerType: "tso", Address: "127.0.0.1:22379", StatusAddr: "127.0.0.1:22379"}, + {ServerType: "scheduling", Address: "127.0.0.1:22479", StatusAddr: "127.0.0.1:22479"}, } var serverInfoErr error serverInfoFunc := func(sessionctx.Context) ([]infoschema.ServerInfo, error) { @@ -1635,6 +1637,8 @@ func TestSetClusterConfig(t *testing.T) { require.EqualError(t, tk.ExecToErr("set config xxx log.level='info'"), "unknown type xxx") require.EqualError(t, tk.ExecToErr("set config tidb log.level='info'"), "TiDB doesn't support to change configs online, please use SQL variables") + require.EqualError(t, tk.ExecToErr("set config tso log.level='info'"), "tso doesn't support to change configs online") + require.EqualError(t, tk.ExecToErr("set config scheduling log.level='info'"), "scheduling doesn't support to change configs online") require.EqualError(t, tk.ExecToErr("set config '127.0.0.1:1111' log.level='info'"), "TiDB doesn't support to change configs online, please use SQL variables") require.EqualError(t, tk.ExecToErr("set config '127.a.b.c:1234' log.level='info'"), "invalid instance 127.a.b.c:1234") // name doesn't resolve. require.EqualError(t, tk.ExecToErr("set config 'example.com:1111' log.level='info'"), "instance example.com:1111 is not found in this cluster") // name resolves.