diff options
| author | Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com> | 2022-01-07 13:53:40 +0300 |
|---|---|---|
| committer | Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com> | 2022-01-07 13:55:01 +0300 |
| commit | e2f30c6c11d30bf15a6bb5264dc5402723e9f956 (patch) | |
| tree | 98b7b278a9ea253455b7c7f04ad1510f4fa2c420 | |
| parent | 3e9408e1cf7876f182045d691e3c57c35c7b3fd2 (diff) | |
........S. [ZBXNEXT-2485] fixed subissue 1
| -rw-r--r-- | conf/zabbix_proxy.conf | 2 | ||||
| -rw-r--r-- | conf/zabbix_server.conf | 2 | ||||
| -rw-r--r-- | src/zabbix_proxy/proxy.c | 12 | ||||
| -rw-r--r-- | src/zabbix_server/server.c | 12 |
4 files changed, 4 insertions, 24 deletions
diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf index 30402090d19..577640c1ece 100644 --- a/conf/zabbix_proxy.conf +++ b/conf/zabbix_proxy.conf @@ -530,7 +530,7 @@ Timeout=4 # Mandatory: no # Range: 0-1000 # Default: -# StartODBCPollers=0 +# StartODBCPollers=5 ### Option: ExternalScripts # Full path to location of external scripts. diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf index ce72a8ba82a..1873ea3a904 100644 --- a/conf/zabbix_server.conf +++ b/conf/zabbix_server.conf @@ -949,7 +949,7 @@ StatsAllowedIP=127.0.0.1 # Mandatory: no # Range: 0-1000 # Default: -# StartODBCPollers=0 +# StartODBCPollers=5 ####### For advanced users - TCP-related fine-tuning parameters ####### diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c index 7270708de0f..eb37d25bf35 100644 --- a/src/zabbix_proxy/proxy.c +++ b/src/zabbix_proxy/proxy.c @@ -213,7 +213,7 @@ int CONFIG_VMWARE_FREQUENCY = 60; int CONFIG_VMWARE_PERF_FREQUENCY = 60; int CONFIG_VMWARE_TIMEOUT = 10; -int CONFIG_ODBCPOLLER_FORKS = 0; +int CONFIG_ODBCPOLLER_FORKS = 5; zbx_uint64_t CONFIG_CONF_CACHE_SIZE = 8 * ZBX_MEBIBYTE; zbx_uint64_t CONFIG_HISTORY_CACHE_SIZE = 16 * ZBX_MEBIBYTE; @@ -1307,14 +1307,6 @@ int MAIN_ZABBIX_ENTRY(int flags) } } -#ifndef HAVE_UNIXODBC - if (0 < CONFIG_ODBCPOLLER_FORKS) - { - zabbix_log(LOG_LEVEL_ERR, "ODBC support is not compiled in, but ODBC polling is enabled."); - return FAIL; - } -#endif - #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) zbx_tls_init_parent(); #endif @@ -1416,13 +1408,11 @@ int MAIN_ZABBIX_ENTRY(int flags) threads_flags[i] = ZBX_THREAD_PRIORITY_FIRST; zbx_thread_start(availability_manager_thread, &thread_args, &threads[i]); break; -#ifdef HAVE_UNIXODBC case ZBX_PROCESS_TYPE_ODBCPOLLER: poller_type = ZBX_POLLER_TYPE_ODBC; thread_args.args = &poller_type; zbx_thread_start(poller_thread, &thread_args, &threads[i]); break; -#endif } } diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 195be73e3ef..98ed91111c3 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -221,7 +221,7 @@ int CONFIG_REPORTMANAGER_FORKS = 0; int CONFIG_REPORTWRITER_FORKS = 0; int CONFIG_SERVICEMAN_FORKS = 1; int CONFIG_PROBLEMHOUSEKEEPER_FORKS = 1; -int CONFIG_ODBCPOLLER_FORKS = 0; +int CONFIG_ODBCPOLLER_FORKS = 5; int CONFIG_LISTEN_PORT = ZBX_DEFAULT_SERVER_PORT; char *CONFIG_LISTEN_IP = NULL; @@ -1253,14 +1253,6 @@ static int server_startup(zbx_socket_t *listen_sock, zbx_rtc_t *rtc) } } -#ifndef HAVE_UNIXODBC - if (0 < CONFIG_ODBCPOLLER_FORKS) - { - zabbix_log(LOG_LEVEL_ERR, "ODBC support is not compiled in, but ODBC polling is enabled."); - return FAIL; - } -#endif - threads_num = CONFIG_CONFSYNCER_FORKS + CONFIG_POLLER_FORKS + CONFIG_UNREACHABLE_POLLER_FORKS + CONFIG_TRAPPER_FORKS + CONFIG_PINGER_FORKS + CONFIG_ALERTER_FORKS + CONFIG_HOUSEKEEPER_FORKS + CONFIG_TIMER_FORKS @@ -1437,13 +1429,11 @@ static int server_startup(zbx_socket_t *listen_sock, zbx_rtc_t *rtc) case ZBX_PROCESS_TYPE_PROBLEMHOUSEKEEPER: zbx_thread_start(trigger_housekeeper_thread, &thread_args, &threads[i]); break; -#ifdef HAVE_UNIXODBC case ZBX_PROCESS_TYPE_ODBCPOLLER: poller_type = ZBX_POLLER_TYPE_ODBC; thread_args.args = &poller_type; zbx_thread_start(poller_thread, &thread_args, &threads[i]); break; -#endif } } |