Changeset 1147

Timestamp:

02/05/08 23:48:18 (10 months ago)

Author:

hachi

Message:

r1328@miyako: hachi | 2008-02-05 15:44:41 -0800
Make a new server (config file) option 'rebalance_ignore_missing' which makes the rebalance process not spin in the case of a 404 when trying to delete a file. It's possible that this sort of behavior should be default on, but I would rather get the functionality now and make the decision later.

Files:

• trunk/server/lib/MogileFS/Config.pm (modified) (1 diff)
• trunk/server/lib/MogileFS/DevFID.pm (modified) (1 diff)
• trunk/server/lib/MogileFS/HTTPFile.pm (modified) (2 diffs)
• trunk/server/lib/MogileFS/Worker/Replicate.pm (modified) (1 diff)

trunk/server/lib/MogileFS/Config.pm

@@ -158 +158 @@
-
-    $old_repl_compat = choose_value( 'old_repl_compat', 1 );
+    choose_value( 'rebalance_ignore_missing', 0 );
-
-    choose_value( 'no_schema_check', 0 );

trunk/server/lib/MogileFS/DevFID.pm

@@ -124 +124 @@
-sub destroy {
-    my $self = shift;
+    my %opts = @_;
+
-    my $httpfile = MogileFS::HTTPFile->at($self->url)
-        or die "Creation of HTTPFile object failed.";
-
-
+
+
+
+
+
+
-        or die "Deletion of file via HTTP failed.";
-

trunk/server/lib/MogileFS/HTTPFile.pm

@@ -58 +58 @@
-sub delete {
-    my $self = shift;
+    my %opts = @_;
-    my ($host, $port) = ($self->{host}, $self->{port});
-
@@ -91 +92 @@
-            my $rescode = $1;
-            # make sure we get a good response
+            if ($rescode == 404 && $opts{ignore_missing}) {
+                $did_del = 1;
+                next;
+            }
-            unless ($rescode == 204) {
-                delete $http_socket{"$host:$port"};

trunk/server/lib/MogileFS/Worker/Replicate.pm

@@ -458 +458 @@
-    }
-
+    my %destroy_opts;
+
+    $destroy_opts{ignore_missing} = 1
+        if MogileFS::Config->config("rebalance_ignore_missing");
+
-    if ($should_delete) {
-
+(%destroy_opts)
-        if ($@) {
-            return $fail->("HTTP delete (due to '$del_reason') failed: $@");