diff options
| author | zhengchao <[email protected]> | 2021-05-13 17:51:23 +0800 |
|---|---|---|
| committer | zhengchao <[email protected]> | 2021-05-13 17:51:23 +0800 |
| commit | 85daf06a79884ac013d1c1cad8f7a4ccc9de7d88 (patch) | |
| tree | 302d0b80c0b0fd28020975aad0410144d5660993 | |
| parent | f2fac87894d1dbf077641dc89fd1f88c1d6a59ca (diff) | |
TSG-6345 redis断开期间redis内的数据发生变化，且版本号未发生回滚，导致maat无法加载新配置。 修复方法： 重连redis后，触发全量配置更新。v3.1.20
| -rw-r--r-- | src/entry/Maat_command.cpp | 4 | ||||
| -rw-r--r-- | src/entry/Maat_rule.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/entry/Maat_command.cpp b/src/entry/Maat_command.cpp index abba07e..df16fcd 100644 --- a/src/entry/Maat_command.cpp +++ b/src/entry/Maat_command.cpp @@ -1733,6 +1733,10 @@ void redis_monitor_traverse(long long version, struct source_redis_ctx* m {
return;
}
+ else
+ {
+ version=0;//Trigger full update when reconnect to redis.
+ }
}
rule_num=get_rm_key_list(mr_ctx->read_ctx, version, feather->load_version_from, &new_version, feather->table_mgr, &rule_list, &update_type, logger, feather->cumulative_update_off);
diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index 4b9054d..8027645 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -57,7 +57,7 @@ extern "C" } #endif -int MAAT_FRAME_VERSION_3_1_20_20210513=1; +int MAAT_FRAME_VERSION_3_1_21_20210513=1; int is_valid_table_name(const char* str) { |