From d304ae5a79b4770b6b1c450ad72b52f0cfea268b Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Tue, 9 Dec 2008 08:53:06 +0000 Subject: [PATCH] ebl Add new Director->MaxConsoleConnections directive git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8120 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/dird/dird_conf.c | 7 ++++--- bacula/src/dird/dird_conf.h | 1 + bacula/src/dird/ua_server.c | 4 ++-- bacula/technotes-2.5 | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c index 80d7c77df3..6595c7d2e8 100644 --- a/bacula/src/dird/dird_conf.c +++ b/bacula/src/dird/dird_conf.c @@ -114,11 +114,12 @@ static RES_ITEM dir_items[] = { {"diraddresses",store_addresses, ITEM(res_dir.DIRaddrs), 0, ITEM_DEFAULT, 9101}, {"queryfile", store_dir, ITEM(res_dir.query_file), 0, ITEM_REQUIRED, 0}, {"workingdirectory", store_dir, ITEM(res_dir.working_directory), 0, ITEM_REQUIRED, 0}, - {"plugindirectory", store_dir, ITEM(res_dir.plugin_directory), 0, 0, 0}, + {"plugindirectory", store_dir, ITEM(res_dir.plugin_directory), 0, 0, 0}, {"scriptsdirectory", store_dir, ITEM(res_dir.scripts_directory), 0, 0, 0}, - {"piddirectory",store_dir, ITEM(res_dir.pid_directory), 0, ITEM_REQUIRED, 0}, - {"subsysdirectory", store_dir, ITEM(res_dir.subsys_directory), 0, 0, 0}, + {"piddirectory", store_dir, ITEM(res_dir.pid_directory), 0, ITEM_REQUIRED, 0}, + {"subsysdirectory", store_dir, ITEM(res_dir.subsys_directory), 0, 0, 0}, {"maximumconcurrentjobs", store_pint32, ITEM(res_dir.MaxConcurrentJobs), 0, ITEM_DEFAULT, 1}, + {"maximumconsoleconnections", store_pint32, ITEM(res_dir.MaxConsoleConnect), 0, ITEM_DEFAULT, 20}, {"password", store_password, ITEM(res_dir.password), 0, ITEM_REQUIRED, 0}, {"fdconnecttimeout", store_time,ITEM(res_dir.FDConnectTimeout), 0, ITEM_DEFAULT, 3 * 60}, {"sdconnecttimeout", store_time,ITEM(res_dir.SDConnectTimeout), 0, ITEM_DEFAULT, 30 * 60}, diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h index c4279f3d6b..222afb9b7e 100644 --- a/bacula/src/dird/dird_conf.h +++ b/bacula/src/dird/dird_conf.h @@ -115,6 +115,7 @@ public: char *subsys_directory; /* SubsysDirectory */ MSGS *messages; /* Daemon message handler */ uint32_t MaxConcurrentJobs; /* Max concurrent jobs for whole director */ + uint32_t MaxConsoleConnect; /* Max concurrent console session */ utime_t FDConnectTimeout; /* timeout for connect in seconds */ utime_t SDConnectTimeout; /* timeout in seconds */ utime_t heartbeat_interval; /* Interval to send heartbeats */ diff --git a/bacula/src/dird/ua_server.c b/bacula/src/dird/ua_server.c index 89b8aa45c5..257a23de51 100644 --- a/bacula/src/dird/ua_server.c +++ b/bacula/src/dird/ua_server.c @@ -78,8 +78,8 @@ void *connect_thread(void *arg) pthread_detach(pthread_self()); set_jcr_in_tsd(INVALID_JCR); - /* Permit 20 console connections */ - bnet_thread_server((dlist*)arg, 20, &ua_workq, handle_UA_client_request); + /* Permit MaxConsoleConnect console connections */ + bnet_thread_server((dlist*)arg, director->MaxConsoleConnect, &ua_workq, handle_UA_client_request); return NULL; } diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5 index ec31d8b5f3..e335f96545 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -10,6 +10,8 @@ filepattern (restore with regex in bsr) mixed priorities General: +09Dec08 +ebl Add new Director->MaxConsoleConnections directive 03Dec08 ebl Fix bacula-sd hanging after tape gets full + unload 02Dec08 -- 2.39.5