diff --git a/tests/cases/distributed/information_schema/cluster_info.result b/tests/cases/distributed/information_schema/cluster_info.result index a59d59ee60..9f19362591 100644 --- a/tests/cases/distributed/information_schema/cluster_info.result +++ b/tests/cases/distributed/information_schema/cluster_info.result @@ -20,52 +20,52 @@ DESC TABLE CLUSTER_INFO; -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time +-- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO ORDER BY peer_type; -+++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|1|DATANODE|127.0.0.1:4101|Version|Hash|Start_time|Duration|Duration||2|DATANODE|127.0.0.1:4102|Version|Hash|Start_time|Duration|Duration||3|DATANODE|127.0.0.1:4103|Version|Hash|Start_time|Duration|Duration||0|FLOWNODE|127.0.0.1:6800|Version|Hash|Start_time|Duration|Duration||1|FRONTEND|127.0.0.1:4001|Version|Hash|Start_time|Duration|Duration||1|METASRV|127.0.0.1:3002|Version|Hash|Start_time|Duration||+++++++++ ++++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|1|DATANODE|127.0.0.1:29411|Version|Hash|Start_time|Duration|Duration||2|DATANODE|127.0.0.1:29412|Version|Hash|Start_time|Duration|Duration||3|DATANODE|127.0.0.1:29413|Version|Hash|Start_time|Duration|Duration||0|FLOWNODE|127.0.0.1:29680|Version|Hash|Start_time|Duration|Duration||1|FRONTEND|127.0.0.1:29401|Version|Hash|Start_time|Duration|Duration||1|METASRV|127.0.0.1:29302|Version|Hash|Start_time|Duration||+++++++++ -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time +-- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'METASRV' ORDER BY peer_type; -+++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|1|METASRV|127.0.0.1:3002|Version|Hash|Start_time|Duration||+++++++++ ++++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|1|METASRV|127.0.0.1:29302|Version|Hash|Start_time|Duration||+++++++++ -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time +-- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'FRONTEND' ORDER BY peer_type; -+++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|1|FRONTEND|127.0.0.1:4001|Version|Hash|Start_time|Duration|Duration|+++++++++ ++++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|1|FRONTEND|127.0.0.1:29401|Version|Hash|Start_time|Duration|Duration|+++++++++ -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time +-- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'FRONTEND' ORDER BY peer_type; -+++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|1|DATANODE|127.0.0.1:4101|Version|Hash|Start_time|Duration|Duration||2|DATANODE|127.0.0.1:4102|Version|Hash|Start_time|Duration|Duration||3|DATANODE|127.0.0.1:4103|Version|Hash|Start_time|Duration|Duration||0|FLOWNODE|127.0.0.1:6800|Version|Hash|Start_time|Duration|Duration||1|METASRV|127.0.0.1:3002|Version|Hash|Start_time|Duration||+++++++++ ++++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|1|DATANODE|127.0.0.1:29411|Version|Hash|Start_time|Duration|Duration||2|DATANODE|127.0.0.1:29412|Version|Hash|Start_time|Duration|Duration||3|DATANODE|127.0.0.1:29413|Version|Hash|Start_time|Duration|Duration||0|FLOWNODE|127.0.0.1:29680|Version|Hash|Start_time|Duration|Duration||1|METASRV|127.0.0.1:29302|Version|Hash|Start_time|Duration||+++++++++ -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time +-- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_ID > 1 ORDER BY peer_type; -+++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|2|DATANODE|127.0.0.1:4102|Version|Hash|Start_time|Duration|Duration||3|DATANODE|127.0.0.1:4103|Version|Hash|Start_time|Duration|Duration|+++++++++ ++++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|2|DATANODE|127.0.0.1:29412|Version|Hash|Start_time|Duration|Duration||3|DATANODE|127.0.0.1:29413|Version|Hash|Start_time|Duration|Duration|+++++++++ USE PUBLIC; diff --git a/tests/cases/distributed/information_schema/cluster_info.sql b/tests/cases/distributed/information_schema/cluster_info.sql index f017e2f7fd..ec0f3bb273 100644 --- a/tests/cases/distributed/information_schema/cluster_info.sql +++ b/tests/cases/distributed/information_schema/cluster_info.sql @@ -5,7 +5,7 @@ DESC TABLE CLUSTER_INFO; -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time +-- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO ORDER BY peer_type; @@ -13,7 +13,7 @@ SELECT * FROM CLUSTER_INFO ORDER BY peer_type; -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time +-- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'METASRV' ORDER BY peer_type; @@ -21,7 +21,7 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'METASRV' ORDER BY peer_type; -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time +-- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'FRONTEND' ORDER BY peer_type; @@ -29,7 +29,7 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'FRONTEND' ORDER BY peer_type; -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time +-- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'FRONTEND' ORDER BY peer_type; @@ -37,7 +37,7 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'FRONTEND' ORDER BY peer_type; -- SQLNESS REPLACE version node_version -- SQLNESS REPLACE (\s\d\.\d\.\d\s) Version -- SQLNESS REPLACE (\s[a-z0-9]{7,8}\s) Hash --- SQLNESS REPLACE (\s[\-0-9T:\.]{15,}) Start_time +-- SQLNESS REPLACE (\s[\-0-9T:\.]{19,}) Start_time -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration -- SQLNESS REPLACE [\s\-]+ SELECT * FROM CLUSTER_INFO WHERE PEER_ID > 1 ORDER BY peer_type; diff --git a/tests/conf/datanode-test.toml.template b/tests/conf/datanode-test.toml.template index 04968bc956..5ed5352124 100644 --- a/tests/conf/datanode-test.toml.template +++ b/tests/conf/datanode-test.toml.template @@ -1,7 +1,7 @@ node_id = 1 mode = 'distributed' require_lease_before_startup = true -rpc_addr = '127.0.0.1:4100' +rpc_addr = '127.0.0.1:29410' rpc_hostname = '127.0.0.1' rpc_runtime_size = 8 @@ -24,7 +24,7 @@ type = 'File' data_home = '{data_home}' [meta_client_options] -metasrv_addrs = ['127.0.0.1:3002'] +metasrv_addrs = ['127.0.0.1:29302'] timeout_millis = 3000 connect_timeout_millis = 5000 tcp_nodelay = false diff --git a/tests/conf/standalone-test.toml.template b/tests/conf/standalone-test.toml.template index f96a815762..da51f3b3f4 100644 --- a/tests/conf/standalone-test.toml.template +++ b/tests/conf/standalone-test.toml.template @@ -20,13 +20,13 @@ linger = "5ms" type = 'File' data_home = '{data_home}' -[grpc_options] -addr = '127.0.0.1:4001' +[grpc] +addr = '127.0.0.1:29401' runtime_size = 8 [mysql] enable = true -addr = "127.0.0.1:4002" +addr = "127.0.0.1:29402" runtime_size = 2 [mysql.tls] @@ -34,7 +34,7 @@ mode = "disable" [postgres] enable = true -addr = "127.0.0.1:4003" +addr = "127.0.0.1:29403" runtime_size = 2 [procedure] diff --git a/tests/runner/src/env.rs b/tests/runner/src/env.rs index 0dc0e3a9e8..bb5d74a267 100644 --- a/tests/runner/src/env.rs +++ b/tests/runner/src/env.rs @@ -47,10 +47,10 @@ use tokio_postgres::{Client as PgClient, SimpleQueryMessage as PgRow}; use crate::protocol_interceptor::{MYSQL, PROTOCOL_KEY}; use crate::{util, ServerAddr}; -const METASRV_ADDR: &str = "127.0.0.1:3002"; -const GRPC_SERVER_ADDR: &str = "127.0.0.1:4001"; -const MYSQL_SERVER_ADDR: &str = "127.0.0.1:4002"; -const POSTGRES_SERVER_ADDR: &str = "127.0.0.1:4003"; +const METASRV_ADDR: &str = "127.0.0.1:29302"; +const GRPC_SERVER_ADDR: &str = "127.0.0.1:29401"; +const MYSQL_SERVER_ADDR: &str = "127.0.0.1:29402"; +const POSTGRES_SERVER_ADDR: &str = "127.0.0.1:29403"; const DEFAULT_LOG_LEVEL: &str = "--log-level=debug,hyper=warn,tower=warn,datafusion=warn,reqwest=warn,sqlparser=warn,h2=info,opendal=info"; #[derive(Clone)] @@ -305,34 +305,55 @@ impl Env { ), "-c".to_string(), self.generate_config_file(subcommand, db_ctx), - "--http-addr=127.0.0.1:5002".to_string(), + "--http-addr=127.0.0.1:29502".to_string(), ]; - (args, vec![GRPC_SERVER_ADDR.to_string()]) + ( + args, + vec![ + GRPC_SERVER_ADDR.to_string(), + MYSQL_SERVER_ADDR.to_string(), + POSTGRES_SERVER_ADDR.to_string(), + ], + ) } "frontend" => { let args = vec![ DEFAULT_LOG_LEVEL.to_string(), subcommand.to_string(), "start".to_string(), - "--metasrv-addrs=127.0.0.1:3002".to_string(), - "--http-addr=127.0.0.1:5003".to_string(), + "--metasrv-addrs=127.0.0.1:29302".to_string(), + "--http-addr=127.0.0.1:29503".to_string(), + format!("--rpc-addr={}", GRPC_SERVER_ADDR), + format!("--mysql-addr={}", MYSQL_SERVER_ADDR), + format!("--postgres-addr={}", POSTGRES_SERVER_ADDR), format!( "--log-dir={}/greptimedb-frontend/logs", self.sqlness_home.display() ), ]; - (args, vec![GRPC_SERVER_ADDR.to_string()]) + ( + args, + vec![ + GRPC_SERVER_ADDR.to_string(), + MYSQL_SERVER_ADDR.to_string(), + POSTGRES_SERVER_ADDR.to_string(), + ], + ) } "metasrv" => { let args = vec![ DEFAULT_LOG_LEVEL.to_string(), subcommand.to_string(), "start".to_string(), + "--bind-addr".to_string(), + "127.0.0.1:29302".to_string(), + "--server-addr".to_string(), + "127.0.0.1:29302".to_string(), "--backend".to_string(), "memory-store".to_string(), "--enable-region-failover".to_string(), "false".to_string(), - "--http-addr=127.0.0.1:5002".to_string(), + "--http-addr=127.0.0.1:29502".to_string(), format!( "--log-dir={}/greptimedb-metasrv/logs", self.sqlness_home.display() @@ -396,15 +417,15 @@ impl Env { subcommand.to_string(), "start".to_string(), ]; - args.push(format!("--rpc-addr=127.0.0.1:410{id}")); - args.push(format!("--http-addr=127.0.0.1:430{id}")); + args.push(format!("--rpc-addr=127.0.0.1:2941{id}")); + args.push(format!("--http-addr=127.0.0.1:2943{id}")); args.push(format!("--data-home={}", data_home.display())); args.push(format!("--log-dir={}/logs", data_home.display())); args.push(format!("--node-id={id}")); args.push("-c".to_string()); args.push(self.generate_config_file(subcommand, db_ctx)); - args.push("--metasrv-addrs=127.0.0.1:3002".to_string()); - (args, format!("127.0.0.1:410{id}")) + args.push("--metasrv-addrs=127.0.0.1:29302".to_string()); + (args, format!("127.0.0.1:2941{id}")) } fn flownode_start_args( @@ -420,14 +441,14 @@ impl Env { subcommand.to_string(), "start".to_string(), ]; - args.push(format!("--rpc-addr=127.0.0.1:680{id}")); + args.push(format!("--rpc-addr=127.0.0.1:2968{id}")); args.push(format!("--node-id={id}")); args.push(format!( "--log-dir={}/greptimedb-flownode/logs", sqlness_home.display() )); - args.push("--metasrv-addrs=127.0.0.1:3002".to_string()); - (args, format!("127.0.0.1:680{id}")) + args.push("--metasrv-addrs=127.0.0.1:29302".to_string()); + (args, format!("127.0.0.1:2968{id}")) } /// stop and restart the server process