summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZheng Chao <[email protected]>2023-09-18 10:27:22 +0800
committerZheng Chao <[email protected]>2023-09-18 10:27:22 +0800
commit0e520dfebcf49d8ebffd98070a7079c78acf22c0 (patch)
tree84dab77b05453c2469bbebfd985da347660d893e
parenta4c39feb5011463f24c59602211a83b681e81385 (diff)
Don't override cluster port when dry run
-rw-r--r--src/swarmkv_api.c1
-rw-r--r--tools/swarmkv_cli.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/swarmkv_api.c b/src/swarmkv_api.c
index 5855afb..97e0552 100644
--- a/src/swarmkv_api.c
+++ b/src/swarmkv_api.c
@@ -128,7 +128,6 @@ int swarmkv_options_set_consul_port(struct swarmkv_options *opts, unsigned int c
int swarmkv_options_set_dryrun(struct swarmkv_options *opts)
{
opts->dryrun=1;
- opts->cluster_port=15210;//overrides default p2p port
return 0;
}
int swarmkv_options_set_caller_thread_number(struct swarmkv_options *opts, int nr_caller_threads)
diff --git a/tools/swarmkv_cli.c b/tools/swarmkv_cli.c
index 58c42fc..5bf8e38 100644
--- a/tools/swarmkv_cli.c
+++ b/tools/swarmkv_cli.c
@@ -1258,7 +1258,8 @@ int main(int argc, char * argv[])
struct log_handle * logger=log_handle_create("swarmkv-cli.log", 0);
struct swarmkv_options *opts=swarmkv_options_new();
swarmkv_options_set_dryrun(opts);
- swarmkv_options_set_cluster_port(opts, g_config.cluster_port);//listen on random port
+ //If g_config.cluster_port is not specified (cluster_port==0), listen on random port.
+ swarmkv_options_set_cluster_port(opts, g_config.cluster_port);
swarmkv_options_set_consul_host(opts, g_config.consul_host);
swarmkv_options_set_consul_port(opts, g_config.consul_port);
swarmkv_options_set_worker_thread_number(opts, 1);