Changeset 1331

Timestamp:

10/18/09 08:45:06 (6 weeks ago)

Author:

dormando

Message:

Update documentation and config examples.

Location:

trunk/server

Files:

• conf/mogilefsd.conf (modified) (1 diff)
• lib/MogileFS/Config.pm (modified) (3 diffs)
• lib/MogileFS/Server.pm (modified) (1 diff)
• mogstored (modified) (1 diff)

trunk/server/conf/mogilefsd.conf

@@ -1 +1 @@
 #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

trunk/server/lib/MogileFS/Config.pm

@@ -56 +56 @@
     $delete_jobs,
     $replicate_jobs,
+    $fsck_jobs,
     $reaper_jobs,
     $monitor_jobs,
@@ -89 +90 @@
                              '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},
@@ -147 +148 @@
     $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 );

trunk/server/lib/MogileFS/Server.pm

@@ -105 +105 @@
     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);
 

trunk/server/mogstored

@@ -160 +160 @@
  --mgmtlisten=<ip:port> IP/Port management/sidechannel listens on
  --docroot=<path>       Docroot above device mount points.  Defaults to /var/mogdata
+ --maxconns=<number>    Number of simultaneous clients to serve. Default 10000
 ";