diff options
| author | Aleksejs Sestakovs <aleksejs.sestakovs@zabbix.com> | 2022-11-09 12:47:48 +0300 |
|---|---|---|
| committer | Aleksejs Sestakovs <aleksejs.sestakovs@zabbix.com> | 2022-11-09 12:54:10 +0300 |
| commit | 8979160c194d661ebe0d93ba300aa9c65345e1f6 (patch) | |
| tree | 7dba250b548ab02792f03a827ba92c9aaf65caec | |
| parent | 4c6bd126e61a207af016c037841053ea2b0e75f7 (diff) | |
.......PS. [ZBX-21786] fixed 'invalid timeout' error occurring after script item parameters removal
* commit '0362810fddc3a412fc08a3cf9c2bb3e3d1db178f':
.......PS. [ZBX-21786] fixed 'invalid timeout' error occurring after script item parameters removal
(cherry picked from commit a4afd0a56adc59628728b210b8faeb1258ed888a)
(cherry picked from commit 17ff81f9b4d32f8b667faedf4077119e70859e62)
| -rw-r--r-- | ChangeLog.d/bugfix/ZBX-21786 | 1 | ||||
| -rw-r--r-- | src/libs/zbxcacheconfig/dbconfig.c | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-21786 b/ChangeLog.d/bugfix/ZBX-21786 new file mode 100644 index 00000000000..b49e12c1d14 --- /dev/null +++ b/ChangeLog.d/bugfix/ZBX-21786 @@ -0,0 +1 @@ +.......PS. [ZBX-21786] fixed 'invalid timeout' error occurring after script item parameters removal (asestakovs) diff --git a/src/libs/zbxcacheconfig/dbconfig.c b/src/libs/zbxcacheconfig/dbconfig.c index dd550a688b1..73098113be7 100644 --- a/src/libs/zbxcacheconfig/dbconfig.c +++ b/src/libs/zbxcacheconfig/dbconfig.c @@ -5487,12 +5487,7 @@ static void DCsync_itemscript_param(zbx_dbsync_t *sync, zbx_uint64_t revision) if (NULL != (dc_item = (ZBX_DC_ITEM *)zbx_hashset_search(&config->items, &scriptitem->itemid))) dc_item_update_revision(dc_item, revision); - if (0 == scriptitem->params.values_num) - { - zbx_vector_ptr_destroy(&scriptitem->params); - zbx_hashset_remove_direct(&config->scriptitems, scriptitem); - } - else + if (0 < scriptitem->params.values_num) zbx_vector_ptr_sort(&scriptitem->params, dc_compare_itemscript_param); } |