diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2022-07-12 13:13:30 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2022-07-12 13:28:33 +0300 |
| commit | a72d53063249105ce631c6eef7d9de90b4226795 (patch) | |
| tree | 2b26117a5f1d3e80fec052469cb3f5770aa73973 | |
| parent | 1bbe355cb8f454e001a14afd09175e7f601e1ec0 (diff) | |
........S. [ZBX-21218] fixed deadloks betwen server and frontend when discovering items with LLD
Merge in ZBX/zabbix from feature/ZBX-21218-5.0 to release/5.0
* commit 'd00bdc0cdebb490e117b83a42c2d8a67b134a457':
.D........ [ZBX-21218] added changelog entry
........S. [ZBX-21218] changed order of item related table inserts/updates in LLD
(cherry picked from commit 9bde07fed1fb2cc82f002befcc1dcc25e1ed3786)
| -rw-r--r-- | ChangeLog.d/bugfix/ZBX-21218 | 1 | ||||
| -rw-r--r-- | src/zabbix_server/lld/lld_item.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-21218 b/ChangeLog.d/bugfix/ZBX-21218 new file mode 100644 index 00000000000..e0d8b37081d --- /dev/null +++ b/ChangeLog.d/bugfix/ZBX-21218 @@ -0,0 +1 @@ +........S. [ZBX-21218] fixed deadloks betwen server and frontend when discovering items with LLD (wiper) diff --git a/src/zabbix_server/lld/lld_item.c b/src/zabbix_server/lld/lld_item.c index 8813fc12054..2566c3652b0 100644 --- a/src/zabbix_server/lld/lld_item.c +++ b/src/zabbix_server/lld/lld_item.c @@ -4448,8 +4448,8 @@ int lld_update_items(zbx_uint64_t hostid, zbx_uint64_t lld_ruleid, zbx_vector_pt DBbegin(); if (SUCCEED == lld_items_save(hostid, &item_prototypes, &items, &items_index, &host_record_is_locked) && - SUCCEED == lld_items_preproc_save(hostid, &items, &host_record_is_locked) && SUCCEED == lld_items_param_save(hostid, &items, &host_record_is_locked) && + SUCCEED == lld_items_preproc_save(hostid, &items, &host_record_is_locked) && SUCCEED == lld_items_tags_save(hostid, &items, &host_record_is_locked)) { if (ZBX_DB_OK != DBcommit()) @@ -4460,7 +4460,6 @@ int lld_update_items(zbx_uint64_t hostid, zbx_uint64_t lld_ruleid, zbx_vector_pt } else { - ret = FAIL; DBrollback(); goto clean; } |