From ab6809f06f0210fa96f65716078671e201166e4f Mon Sep 17 00:00:00 2001 From: dormando Date: Sun, 18 Oct 2009 08:45:06 +0000 Subject: [PATCH] Update documentation and config examples. git-svn-id: http://code.sixapart.com/svn/mogilefs/trunk@1331 f67b2e87-0811-0410-a7e0-dd94e48410d6 --- conf/mogilefsd.conf | 25 ++++++++++++++++++++++++- lib/MogileFS/Config.pm | 6 ++++-- lib/MogileFS/Server.pm | 2 +- mogstored | 1 + 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/conf/mogilefsd.conf b/conf/mogilefsd.conf index cbe6902..847d3f3 100644 --- a/conf/mogilefsd.conf +++ b/conf/mogilefsd.conf @@ -1,10 +1,33 @@ #daemonize = 1 +# Database connection information db_dsn = DBI:mysql:mogilefs:host=127.0.0.1 db_user = username db_pass = password +# IP:PORT to listen on for mogilefs client requests listen = 127.0.0.1:7001 +# Optional, if you don't define the port above. conf_port = 7001 -listener_jobs = 10 +# Number of query workers to start by default. +query_jobs = 10 +# Number of delete workers to start by default. delete_jobs = 1 +# Number of replicate workers to start by default. replicate_jobs = 5 +# Number of reaper workers to start by default. +# (you don't usually need to increase this) reaper_jobs = 1 +# Number of fsck workers to start by default. +# (these can cause a lot of load when fsck'ing) +#fsck_jobs = 1 +# Minimum amount of space to reserve in megabytes +# default: 100 +# Consider setting this to be larger than the largest file you +# would normally be uploading. +#min_free_space = 200 +# Number of seconds to wait for a storage node to respond. +# default: 2 +# Keep this low, so busy storage nodes are quickly ignored. +#node_timeout = 2 +# Allow replication to use the secondary node get port, +# if you have apache or similar configured for GET's +#repl_use_get_port = 1 diff --git a/lib/MogileFS/Config.pm b/lib/MogileFS/Config.pm index 7b92d82..ebfef34 100644 --- a/lib/MogileFS/Config.pm +++ b/lib/MogileFS/Config.pm @@ -55,6 +55,7 @@ our ( $query_jobs, $delete_jobs, $replicate_jobs, + $fsck_jobs, $reaper_jobs, $monitor_jobs, $min_free_space, @@ -88,8 +89,8 @@ sub load_config { 'w|workers=i' => \$cmdline{query_jobs}, 'no_http' => \$cmdline{no_http}, # OLD, we just eat it to shut it up. 'workerport=i' => \$dummy_workerport, # eat it for backwards compat - 'maxdiskage=i' => \$cmdline{max_disk_age}, - 'minfreespace=i' => \$cmdline{min_free_space}, + 'max_disk_age=i' => \$cmdline{max_disk_age}, + 'min_free_space=i' => \$cmdline{min_free_space}, 'default_mindevcount=i' => \$cmdline{default_mindevcount}, 'node_timeout=i' => \$cmdline{node_timeout}, 'pidfile=s' => \$cmdline{pidfile}, @@ -146,6 +147,7 @@ sub load_config { choose_value( 'query_jobs', 20 )); # fall back to query_jobs, new name $delete_jobs = choose_value( 'delete_jobs', 1 ); $replicate_jobs = choose_value( 'replicate_jobs', 1 ); + $fsck_jobs = choose_value( 'fsck_jobs', 1 ); $reaper_jobs = choose_value( 'reaper_jobs', 1 ); $monitor_jobs = choose_value( 'monitor_jobs', 1 ); $min_free_space = choose_value( 'min_free_space', 100 ); diff --git a/lib/MogileFS/Server.pm b/lib/MogileFS/Server.pm index 5e6edc5..ff0d98f 100644 --- a/lib/MogileFS/Server.pm +++ b/lib/MogileFS/Server.pm @@ -104,7 +104,7 @@ sub run { MogileFS::ProcManager->set_min_workers('replicate' => MogileFS->config('replicate_jobs')); MogileFS::ProcManager->set_min_workers('reaper' => MogileFS->config('reaper_jobs')); MogileFS::ProcManager->set_min_workers('monitor' => MogileFS->config('monitor_jobs')); - MogileFS::ProcManager->set_min_workers('fsck' => 1); + MogileFS::ProcManager->set_min_workers('fsck' => MogileFS->config('fsck_jobs')); MogileFS::ProcManager->set_min_workers('job_master' => 1); # open up our log diff --git a/mogstored b/mogstored index 0b97889..1fd152c 100755 --- a/mogstored +++ b/mogstored @@ -159,6 +159,7 @@ OPTS: --httplisten= IP/Port HTTP server listens on --mgmtlisten= IP/Port management/sidechannel listens on --docroot= Docroot above device mount points. Defaults to /var/mogdata + --maxconns= Number of simultaneous clients to serve. Default 10000 "; } -- 2.11.4.GIT