diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2022-09-09 11:39:22 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2022-09-09 11:39:22 +0300 |
| commit | 7fa2abdcdb40b5d0d960ede3257564eaf8ecdf05 (patch) | |
| tree | 87d381520c72fc0efc9a43a8face696d40779f9b | |
| parent | 804e1aba348e9cac560dbc9b4b67d9ec1f74a77d (diff) | |
| parent | f5de08e62fc404c5bdf94276216f623c3df3f497 (diff) | |
........S. [ZBX-21416] fixed check now not working on calculated items, aggregate checks and some internal items
Merge in ZBX/zabbix from feature/ZBX-21416-4.0 to release/4.0
* commit 'f5de08e62fc404c5bdf94276216f623c3df3f497':
.D........ [ZBX-21416] added changelog entry
........S. [ZBX-21416] fixed 'check now' not working on calculated items, aggregate checks and some internal items
| -rw-r--r-- | ChangeLog.d/bugfix/ZBX-21416 | 1 | ||||
| -rw-r--r-- | src/libs/zbxdbcache/dbconfig.c | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-21416 b/ChangeLog.d/bugfix/ZBX-21416 new file mode 100644 index 00000000000..c4071f4aa18 --- /dev/null +++ b/ChangeLog.d/bugfix/ZBX-21416 @@ -0,0 +1 @@ +........S. [ZBX-21416] fixed check now not working on calculated items, aggregate checks and some internal items (wiper) diff --git a/src/libs/zbxdbcache/dbconfig.c b/src/libs/zbxdbcache/dbconfig.c index 0fcb1664bfd..23934fa7925 100644 --- a/src/libs/zbxdbcache/dbconfig.c +++ b/src/libs/zbxdbcache/dbconfig.c @@ -11573,9 +11573,15 @@ void zbx_dc_reschedule_items(const zbx_vector_uint64_t *itemids, int nextcheck, proxy_hostid = 0; } - else if (0 == (proxy_hostid = dc_host->proxy_hostid)) + else if (0 == (proxy_hostid = dc_host->proxy_hostid) || + SUCCEED == is_item_processed_by_server(dc_item->type, dc_item->key)) + { dc_requeue_item_at(dc_item, dc_host, nextcheck); + /* force item to be processed on server */ + proxy_hostid = 0; + } + if (NULL != proxy_hostids) proxy_hostids[i] = proxy_hostid; } |