gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

可以正确处理redis中配置版本号回绕。

Browse Source
This commit is contained in:
zhengchao
2017-08-31 15:17:36 +08:00
parent cdba1add45
commit 0a399b0555
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/entry/Maat_command.cpp
View File

@@ -381,7 +381,6 @@ int get_rm_key_list(unsigned int version,redisContext *c,struct serial_rule_t**
return -1; return -1;
} }
version_in_redis=read_redis_integer(reply); version_in_redis=read_redis_integer(reply);
assert(version_in_redis>=version);
freeReplyObject(reply); freeReplyObject(reply);
if(version_in_redis==version) 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; *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; goto FULL_UPDATE;
} }

2
src/entry/Maat_rule.cpp
View File

@@ -28,7 +28,7 @@
#include "stream_fuzzy_hash.h" #include "stream_fuzzy_hash.h"
#include "gram_index_engine.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 *maat_module="MAAT Frame";
const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin", const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin",