diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2021-05-08 16:19:43 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2021-05-08 16:19:43 +0300 |
| commit | 06eaf6a228c873786c636d40c0844380d882abe8 (patch) | |
| tree | 3fd761d06906d8eba9979b29740e111c9a96a098 /src | |
| parent | 8d6efed708192f06f9305b039dfbc05ff896d6e3 (diff) | |
| parent | b721229ef17af5008fe018d74f245bedd277bfbd (diff) | |
........S. [ZBXNEXT-6452] fixed timer queue leaking triggers
Merge in ZBX/zabbix from feature/ZBXNEXT-6452-5.3 to master
* commit 'b721229ef17af5008fe018d74f245bedd277bfbd':
........S. [ZBXNEXT-6452] fixed trigger queue update
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zbxdbcache/dbconfig.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libs/zbxdbcache/dbconfig.c b/src/libs/zbxdbcache/dbconfig.c index ccb6990c5d7..b0312c908c2 100644 --- a/src/libs/zbxdbcache/dbconfig.c +++ b/src/libs/zbxdbcache/dbconfig.c @@ -3690,6 +3690,7 @@ static void DCsync_triggers(zbx_dbsync_t *sync) ZBX_STR2UCHAR(trigger->state, row[7]); trigger->lastchange = atoi(row[8]); trigger->locked = 0; + trigger->timer_revision = 0; zbx_vector_ptr_create_ext(&trigger->tags, __config_mem_malloc_func, __config_mem_realloc_func, __config_mem_free_func); @@ -4196,6 +4197,9 @@ static void dc_schedule_trigger_timers(zbx_hashset_t *trend_queue, int now) if (ZBX_TRIGGER_TIMER_DEFAULT == trigger->timer) continue; + if (trigger->timer_revision == trigger->revision) + continue; + if (NULL == (timer = dc_trigger_timer_create(trigger))) continue; |