Skip to content

Commit 6dca2bf

Browse files
authored
[CBRD-26010] Fix backup hang with different max_clients settings in [common] and [@db] sections in conf file (#6102)
http://jira.cubrid.org/browse/CBRD-26010
1 parent 955a751 commit 6dca2bf

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

src/communication/network_sr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,7 @@ net_server_start (const char *server_name)
11171117
goto end;
11181118
}
11191119

1120-
sysprm_load_and_init (NULL, NULL, SYSPRM_LOAD_ALL);
1120+
sysprm_load_and_init (server_name, NULL, SYSPRM_LOAD_ALL);
11211121
sysprm_set_er_log_file (server_name);
11221122

11231123
if (sync_initialize_sync_stats () != NO_ERROR)

src/transaction/boot_sr.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2104,7 +2104,7 @@ boot_restart_server (THREAD_ENTRY * thread_p, bool print_restart, const char *db
21042104
}
21052105

21062106
#if defined(SERVER_MODE)
2107-
if (sysprm_load_and_init (NULL, NULL, SYSPRM_LOAD_ALL) != NO_ERROR)
2107+
if (sysprm_load_and_init (db_name, NULL, SYSPRM_LOAD_ALL) != NO_ERROR)
21082108
{
21092109
er_set (ER_ERROR_SEVERITY, ARG_FILE_LINE, ER_BO_CANT_LOAD_SYSPRM, 0);
21102110
error_code = ER_BO_CANT_LOAD_SYSPRM;
@@ -2222,13 +2222,6 @@ boot_restart_server (THREAD_ENTRY * thread_p, bool print_restart, const char *db
22222222
* recovery managers
22232223
*/
22242224
#if defined(SERVER_MODE)
2225-
if (sysprm_load_and_init (boot_Db_full_name, NULL, SYSPRM_LOAD_ALL) != NO_ERROR)
2226-
{
2227-
er_set (ER_ERROR_SEVERITY, ARG_FILE_LINE, ER_BO_CANT_LOAD_SYSPRM, 0);
2228-
error_code = ER_BO_CANT_LOAD_SYSPRM;
2229-
goto error;
2230-
}
2231-
22322225
if (common_ha_mode != prm_get_integer_value (PRM_ID_HA_MODE) && !HA_DISABLED ())
22332226
{
22342227
er_set (ER_ERROR_SEVERITY, ARG_FILE_LINE, ER_PRM_CONFLICT_EXISTS_ON_MULTIPLE_SECTIONS, 6, "cubrid.conf", "common",

0 commit comments

Comments
 (0)