diff options
| author | Zheng Chao <[email protected]> | 2022-10-28 16:46:31 +0800 |
|---|---|---|
| committer | Zheng Chao <[email protected]> | 2022-10-28 16:46:31 +0800 |
| commit | 8a4d2aa885f518a8cd211c8bd78aecd0a9ef779a (patch) | |
| tree | c55e62070ca592d3fb613e3210fe6e9df1310d24 /tools | |
| parent | 8f097942c8d1e6923cdfbeb20b8fdad73059a139 (diff) | |
Bugfix: sdscatvprintf() doesn't support "%I". Typos in key_entry_merge().
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/swarmkv_cli.c | 10 | ||||
| -rw-r--r-- | tools/swarmkv_simple_node.cpp | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/tools/swarmkv_cli.c b/tools/swarmkv_cli.c index 78de058..db0f73f 100644 --- a/tools/swarmkv_cli.c +++ b/tools/swarmkv_cli.c @@ -29,7 +29,6 @@ struct config struct swarmkv *db; struct cluster_manager_command cluster_mgr_cmd; }; - struct attach_target { int attached; @@ -157,20 +156,19 @@ struct swarmkv_reply *cluster_create_command(struct swarmkv* db, char *argv[], s struct swarmkv_reply *cluster_nodes_command(struct swarmkv* db, char *argv[], size_t argc) { struct swarmkv_reply *reply=NULL; - int ret=0; + int ret=0, no_leader=1; struct swarmkv_node leader; struct swarmkv_node nodes[SWARMKV_NODE_MAX]; size_t n_node=SWARMKV_NODE_MAX; ret=consul_get_cluster_leader_block(g_config.db_name, g_config.consul_port, &leader); if(ret<0) { - reply=swarmkv_reply_new_error(error_cluster_leader_not_found); - return reply; + no_leader=1; } ret=consul_list_health_nodes_block(g_config.db_name, g_config.consul_port, nodes, &n_node); if(ret<0) { - reply=swarmkv_reply_new_error(error_cluster_leader_not_found); + reply=swarmkv_reply_new_error(error_cluster_no_node); return reply; } size_t i=0; @@ -180,7 +178,7 @@ struct swarmkv_reply *cluster_nodes_command(struct swarmkv* db, char *argv[], si for(i=0; i<n_node; i++) { uuid_unparse_lower(nodes[i].bin_uuid, uuid_str); - if(0==swarmkv_node_compare(&leader, nodes+i)) + if(!no_leader && 0==swarmkv_node_compare(&leader, nodes+i)) { is_leader=1; } diff --git a/tools/swarmkv_simple_node.cpp b/tools/swarmkv_simple_node.cpp index c465325..53a3816 100644 --- a/tools/swarmkv_simple_node.cpp +++ b/tools/swarmkv_simple_node.cpp @@ -81,6 +81,7 @@ int main(int argc, char ** argv) return -1; } struct timeval start, end; + long long eplapsed_second=0; gettimeofday(&start, NULL); struct swarmkv_reply *reply=NULL; if(key_number>0) @@ -99,7 +100,9 @@ int main(int argc, char ** argv) } } gettimeofday(&end, NULL); - printf("> 100%%\nUse %lld seconds, %lld cmd/s.\n", (long long) end.tv_sec-start.tv_sec, key_number/(end.tv_sec-start.tv_sec)); + eplapsed_second=end.tv_sec-start.tv_sec; + if(eplapsed_second==0){ eplapsed_second=1;} + printf("> 100%%\nUse %lld seconds, %lld cmd/s.\n", (long long) end.tv_sec-start.tv_sec, key_number/eplapsed_second); } FOREVER { |