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

完善_get_maat_redis_value中的出错处理。原逻辑中，写入重复配置id后，进行加载的maat无法获得redis value，一直加载失败。直到半小时后MAAT_UPDATE_STATUS中状态清理后，才能触发全量更新。

Browse Source
This commit is contained in:
zhengchao
2018-03-07 12:03:19 +08:00
parent 91a46e45bc
commit 8b04b408f4
2 changed files with 1587 additions and 1559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/entry/Maat_command.cpp
View File

@@ -582,15 +582,23 @@ int _get_maat_redis_value(redisContext *c,struct serial_rule_t* rule_list,int ru
,rule_list[idx].table_name ,rule_list[idx].table_name
,rule_list[idx].rule_id); ,rule_list[idx].rule_id);
reply=_wrap_redisCommand(c, redis_cmd); reply=_wrap_redisCommand(c, redis_cmd);
if(reply->type!=REDIS_REPLY_STRING)//Handle: "Loading Redis is loading the database in memory" or "nil" if(reply->type==REDIS_REPLY_STRING)
{
rule_list[idx].table_line=_maat_strdup(reply->str);
}
else if(reply->type==REDIS_REPLY_ERROR)//Handle: "Loading Redis is loading the database in memory"
{ {
MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_redis_monitor MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_redis_monitor
,"Redis cmd=%s Error, Reply type=%d, str=%s",redis_cmd, reply->type, reply->str); ,"Redis cmd=%s Error, Reply type=%d, str=%s",redis_cmd, reply->type, reply->str);
freeReplyObject(reply); freeReplyObject(reply);
free(retry_ids); free(retry_ids);
return -1; return -1;
} }
rule_list[idx].table_line=_maat_strdup(reply->str); else //Handle type "nil"
{
MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_redis_monitor
,"Redis cmd=%s Failed, Reply type=%d",redis_cmd, reply->type);
}
freeReplyObject(reply); freeReplyObject(reply);
} }
free(retry_ids); free(retry_ids);
@@ -1079,7 +1087,7 @@ void redis_monitor_traverse(long long version,redisContext *c,
const unsigned char* dec_key, const unsigned char* dec_key,
_Maat_feather_t* feather) _Maat_feather_t* feather)
{ {
int table_id=0,i=0,rule_num=0; int table_id=0,i=0,rule_num=0,empty_value_num=0;
int ret=0; int ret=0;
struct serial_rule_t* rule_list=NULL; struct serial_rule_t* rule_list=NULL;
int update_type=CM_UPDATE_TYPE_INC; int update_type=CM_UPDATE_TYPE_INC;
@@ -1105,10 +1113,30 @@ void redis_monitor_traverse(long long version,redisContext *c,
MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_redis_monitor,"Get Redis value failed, abandon update."); MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_redis_monitor,"Get Redis value failed, abandon update.");
goto clean_up; goto clean_up;
} }
for(i=0;i<rule_num;i++)
{
if(rule_list[i].table_line==NULL)
{
empty_value_num++;
}
}
if(empty_value_num==rule_num)
{
MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_redis_monitor,"All %d rules are empty, abandon update.",empty_value_num);
goto clean_up;
}
if(empty_value_num>0)
{
MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_redis_monitor,"%d of %d rules are empty.",empty_value_num,rule_num);
} }
} }
start(new_version,update_type,u_para); start(new_version,update_type,u_para);
for(i=0;i<rule_num;i++) for(i=0;i<rule_num;i++)
{
if(rule_list[i].table_line==NULL)
{
continue;
} }
ret=map_str2int(feather->map_tablename2id,rule_list[i].table_name,&table_id); ret=map_str2int(feather->map_tablename2id,rule_list[i].table_name,&table_id);
if(ret<0)//Unrecognized table. if(ret<0)//Unrecognized table.

2
src/entry/Maat_rule.cpp
View File

@@ -30,7 +30,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_1_20180227=1; int MAAT_FRAME_VERSION_2_1_20180307=1;
const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin", const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin",
"unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""}; "unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""};