Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

executor: add tiproxy in cluster_config #47785

Merged
merged 3 commits into from
Oct 31, 2023
Merged

executor: add tiproxy in cluster_config #47785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
489d338
executor: add tiproxy in cluster_config
xhebox Oct 19, 2023
a28ff0e
add tests
xhebox Oct 19, 2023
d2a0bb5
fix test
xhebox Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/executor/memtable_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ func fetchClusterConfig(sctx sessionctx.Context, nodeTypes, nodeAddrs set.String
url = fmt.Sprintf("%s://%s%s", util.InternalHTTPSchema(), statusAddr, pdapi.Config)
case "tikv", "tidb", "tiflash":
url = fmt.Sprintf("%s://%s/config", util.InternalHTTPSchema(), statusAddr)
case "tiproxy":
url = fmt.Sprintf("%s://%s/api/admin/config?format=json", util.InternalHTTPSchema(), statusAddr)
default:
ch <- result{err: errors.Errorf("currently we do not support get config from node type: %s(%s)", typ, address)}
return
Expand Down
28 changes: 22 additions & 6 deletions pkg/executor/memtable_reader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,12 @@ func TestTiDBClusterConfig(t *testing.T) {
router.Handle(pdapi.Config, fn.Wrap(mockConfig))
// TiDB/TiKV config
router.Handle("/config", fn.Wrap(mockConfig))
// Tiproxy config
router.Handle("/api/admin/config", fn.Wrap(mockConfig))

// mock servers
var servers []string
for _, typ := range []string{"tidb", "tikv", "tiflash", "pd"} {
for _, typ := range []string{"tidb", "tikv", "tiflash", "tiproxy", "pd"} {
for _, server := range testServers {
servers = append(servers, strings.Join([]string{typ, server.address, server.address}, ","))
}
Expand Down Expand Up @@ -195,6 +197,15 @@ func TestTiDBClusterConfig(t *testing.T) {
"tiflash key1 value1",
"tiflash key2.nest1 n-value1",
"tiflash key2.nest2 n-value2",
"tiproxy key1 value1",
"tiproxy key2.nest1 n-value1",
"tiproxy key2.nest2 n-value2",
"tiproxy key1 value1",
"tiproxy key2.nest1 n-value1",
"tiproxy key2.nest2 n-value2",
"tiproxy key1 value1",
"tiproxy key2.nest1 n-value1",
"tiproxy key2.nest2 n-value2",
"pd key1 value1",
"pd key2.nest1 n-value1",
"pd key2.nest2 n-value2",
Expand All @@ -207,7 +218,7 @@ func TestTiDBClusterConfig(t *testing.T) {
))
warnings := tk.Session().GetSessionVars().StmtCtx.GetWarnings()
require.Len(t, warnings, 0, fmt.Sprintf("unexpected warnings: %+v", warnings))
require.Equal(t, int32(12), requestCounter)
require.Equal(t, int32(15), requestCounter)

// TODO: we need remove it when index usage is GA.
rs := tk.MustQuery("show config").Rows()
Expand All @@ -224,7 +235,7 @@ func TestTiDBClusterConfig(t *testing.T) {

// type => server index => row
rows := map[string][][]string{}
for _, typ := range []string{"tidb", "tikv", "tiflash", "pd"} {
for _, typ := range []string{"tidb", "tikv", "tiflash", "tiproxy", "pd"} {
for _, server := range testServers {
rows[typ] = append(rows[typ], []string{
fmt.Sprintf("%s %s key1 value1", typ, server.address),
Expand All @@ -247,7 +258,7 @@ func TestTiDBClusterConfig(t *testing.T) {
}{
{
sql: "select * from information_schema.cluster_config",
reqCount: 12,
reqCount: 15,
rows: flatten(
rows["tidb"][0],
rows["tidb"][1],
Expand All @@ -258,6 +269,9 @@ func TestTiDBClusterConfig(t *testing.T) {
rows["tiflash"][0],
rows["tiflash"][1],
rows["tiflash"][2],
rows["tiproxy"][0],
rows["tiproxy"][1],
rows["tiproxy"][2],
rows["pd"][0],
rows["pd"][1],
rows["pd"][2],
Expand All @@ -277,11 +291,12 @@ func TestTiDBClusterConfig(t *testing.T) {
},
{
sql: "select * from information_schema.cluster_config where type='pd' or instance='" + testServers[0].address + "'",
reqCount: 12,
reqCount: 15,
rows: flatten(
rows["tidb"][0],
rows["tikv"][0],
rows["tiflash"][0],
rows["tiproxy"][0],
rows["pd"][0],
rows["pd"][1],
rows["pd"][2],
Expand Down Expand Up @@ -357,11 +372,12 @@ func TestTiDBClusterConfig(t *testing.T) {
{
sql: fmt.Sprintf(`select * from information_schema.cluster_config where instance='%s'`,
testServers[0].address),
reqCount: 4,
reqCount: 5,
rows: flatten(
rows["tidb"][0],
rows["tikv"][0],
rows["tiflash"][0],
rows["tiproxy"][0],
rows["pd"][0],
),
},
Expand Down