Changeset 358

Timestamp:

08/21/06 20:08:15 (2 years ago)

Author:

marksmith

Message:

* add generic get_server_setting/set_server_setting methods in Mgd namespace

* add stub-like Checker job (will do fsck stuff) -- so far it populates the fsck table and

works on files there, but doesn't actually do anything with said files yet, so will end
up populating it with every file, but not touching any of them

* add mogilefsd support for spawning Checker job children

* add support through Query child for setting the checker level using server settings

more to come today! (lots more)

Files:

• branches/server-newrepl/lib/MogileFS/Config.pm (modified) (2 diffs)
• branches/server-newrepl/lib/MogileFS/ProcManager.pm (modified) (1 diff)
• branches/server-newrepl/lib/MogileFS/Worker/Checker.pm (added)
• branches/server-newrepl/lib/MogileFS/Worker/Query.pm (modified) (2 diffs)
• branches/server-newrepl/mogilefsd (modified) (4 diffs)

branches/server-newrepl/lib/MogileFS/Config.pm

@@ -34 +34 @@
-    $reaper_jobs,
-    $monitor_jobs,
+    $checker_jobs,
-    $mog_root,
-    $min_free_space,
@@ -117 +118 @@
-    $reaper_jobs    = choose_value( 'reaper_jobs', 1 );
-    $monitor_jobs   = choose_value( 'monitor_jobs', 1 );
+    $checker_jobs   = choose_value( 'checker_jobs', 1 );
-    $min_free_space = choose_value( 'min_free_space', 100 );
-    $max_disk_age   = choose_value( 'max_disk_age', 5 );

branches/server-newrepl/lib/MogileFS/ProcManager.pm

@@ -50 +50 @@
-    my ($class, $job) = @_;
-    return {
+        checker     => "Checker",
-        queryworker => "Query",
-        delete      => "Delete",

branches/server-newrepl/lib/MogileFS/Worker/Query.pm

@@ -1113 +1113 @@
-
-    return $self->ok_line;
+}
+
+sub cmd_checker {
+    my MogileFS::Worker::Query $self = shift;
+    my $args = shift;
+
+    my $new_setting;
+    if ($args->{disable}) {
+        $new_setting = 'off';
+    } elsif ($args->{level}) {
+        # they want to turn it on or change the level, so let's ensure they
+        # specified a valid level
+        if (MogileFS::Worker::Checker::is_valid_level($args->{level})) {
+            $new_setting = $args->{level};
+        } else {
+            return $self->err_line('invalid_checker_level');
+        }
+    }
+
+    if (defined $new_setting) {
+        Mgd::set_server_setting('fsck_enable', $new_setting);
+        return $self->ok_line;
+    }
+
+    $self->err_line('failure');
-}
-
@@ -1153 +1178 @@
-        'host_not_found' => "Host not found",
-        'invalid_chars' => "Patterns must not contain backslashes (\\) or percent signs (%).",
+        'invalid_checker_level' => "Checker level invalid.  Please see documentation on this command.",
-        'invalid_mindevcount' => "The mindevcount must be at least 1",
-        'key_exists' => "Target key name already exists; can't overwrite.",

branches/server-newrepl/mogilefsd

@@ -45 +45 @@
-use MogileFS::Worker::Reaper;
-use MogileFS::Worker::Monitor;
+use MogileFS::Worker::Checker;
-use MogileFS::ProcManager;
-use MogileFS::Config;
@@ -75 +76 @@
-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('checker'     => MogileFS->config('checker_jobs'));
-
-# open up our log
@@ -924 +926 @@
-    }
-
-$dbh->selectrow_array("SELECT value FROM server_settings WHERE field='schema_version'"
+get_server_setting('schema_version'
-    unless ($sversion == SCHEMA_VERSION) {
-        my $exp = SCHEMA_VERSION;
@@ -930 +932 @@
-            "Please run mogdbsetup to upgrade your schema.\n";
-    }
+}
+
+# set_server_setting( key, value )
+#   set value to undef to remove whatever is presently stored; returns 1 on success or
+#   undef on error
+sub set_server_setting {
+    my ($key, $val) = @_;
+    return unless $key;
+
+    my $dbh = Mgd::get_dbh()
+        or return undef;
+
+    if (defined $val) {
+        $dbh->do("REPLACE INTO server_settings (field, value) VALUES (?, ?)", undef, $key, $val);
+    } else {
+        $dbh->do("DELETE FROM server_settings WHERE field=?", undef, $key);
+    }
+
+    return undef if $dbh->err;
+    return 1;
+}
+
+# get_server_setting( key )
+#   get value of server setting, undef on error (or no result)
+sub get_server_setting {
+    my $dbh = Mgd::get_dbh()
+        or return undef;
+    my $ret = $dbh->selectrow_array("SELECT value FROM server_settings WHERE field=?", undef, shift);
+    return undef if $dbh->err;
+    return $ret;
-}
-