summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangchengwei <[email protected]>2019-03-28 12:43:36 +0800
committerzhangchengwei <[email protected]>2019-03-28 12:43:36 +0800
commitbfdf8867c8aedd659508d3909e98626b425d092f (patch)
tree32b95d36f4bdc21e60e991864b2899d20a9d0d3e
parent774164ac95f053e7c9b4d56e56110a4444678cd0 (diff)
单机模式下redis宕机不重启feature-seperate-related-unblock
-rw-r--r--src/lib/libc3client.sobin0 -> 116112 bytes
-rw-r--r--src/pg_valve_c3.cpp2
-rw-r--r--src/pg_valve_main.cpp2
3 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libc3client.so b/src/lib/libc3client.so
new file mode 100644
index 0000000..1bcc959
--- /dev/null
+++ b/src/lib/libc3client.so
Binary files differ
diff --git a/src/pg_valve_c3.cpp b/src/pg_valve_c3.cpp
index 9ffdda8..85a373d 100644
--- a/src/pg_valve_c3.cpp
+++ b/src/pg_valve_c3.cpp
@@ -347,7 +347,7 @@ int do_dispatch_config_to_c3(grule_t &grule, int *errcode)
return DISP_RETRY;
}
- while((send_num = grule_send(g_grule_handle.grule_handle, &grule, 1, 0))==0 && retry_num<10)
+ while((send_num = grule_send(g_grule_handle.grule_handle, &grule, 1, 0))==0 && retry_num<50)
{
retry_num++;
usleep(10000);
diff --git a/src/pg_valve_main.cpp b/src/pg_valve_main.cpp
index ca49b3a..6eb18e8 100644
--- a/src/pg_valve_main.cpp
+++ b/src/pg_valve_main.cpp
@@ -849,7 +849,7 @@ retry_check:
retry = 1;
goto retry_check;
}
- else
+ else if(g_pgvalve_info.consul_sw)
{
MESA_HANDLE_RUNTIME_LOGV2(g_pgvalve_info.log_runtime, RLOG_LV_FATAL, MODULE_NAME, "redis check failed, restart to become slave now.");
exit(21);