diff options
| author | zhengchao <[email protected]> | 2017-08-31 15:17:36 +0800 |
|---|---|---|
| committer | zhengchao <[email protected]> | 2017-08-31 15:17:36 +0800 |
| commit | 0a399b0555f0ff35baa65d21d1f16f01dd5c5cb6 (patch) | |
| tree | ab9dec67d5c16bd0f038763db7ee64004ed51688 | |
| parent | cdba1add45704ff3a3020ff07f3ebbffd092bb66 (diff) | |
可以正确处理redis中配置版本号回绕。v2.1
| -rw-r--r-- | src/entry/Maat_command.cpp | 5 | ||||
| -rw-r--r-- | src/entry/Maat_rule.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/entry/Maat_command.cpp b/src/entry/Maat_command.cpp index 1482f70..9e3b606 100644 --- a/src/entry/Maat_command.cpp +++ b/src/entry/Maat_command.cpp @@ -381,7 +381,6 @@ int get_rm_key_list(unsigned int version,redisContext *c,struct serial_rule_t** return -1; } version_in_redis=read_redis_integer(reply); - assert(version_in_redis>=version); freeReplyObject(reply); if(version_in_redis==version) { @@ -389,8 +388,10 @@ int get_rm_key_list(unsigned int version,redisContext *c,struct serial_rule_t** } *new_version=version_in_redis; - if(version==0) + if(version_in_redis<version) { + MESA_handle_runtime_log(logger, RLOG_LV_INFO, maat_redis_monitor, + "VERSION roll back MAAT: %d -> Redis: %lld.",version,version_in_redis); goto FULL_UPDATE; } diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index 28e5931..e2115c4 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -28,7 +28,7 @@ #include "stream_fuzzy_hash.h" #include "gram_index_engine.h" -int MAAT_FRAME_VERSION_2_0_20170829=1; +int MAAT_FRAME_VERSION_2_0_20170831=1; const char *maat_module="MAAT Frame"; const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin", |