Changeset 814

Timestamp:

02/11/09 21:35:24 (10 months ago)

Author:

hachi

Message:

Prevent a complex crash scenario.

I have an unautomated test that gets perlbal to crash right now, will make an automated test out of it tomorrow.

If perlbal has a service selector, performs a reproxy, and throws an error in the reproxy setup routine that gets shown to the user perlbal will crash because ->next_request on the backend doesn't get called until after the reproxy setup. Basically since the backend has made a successful response to us we should detach it from our client earlier, so that errors in the client can't cause us to end up in a mixed state.

This is the proper fix for the duck-typing fix I made in a branch a few weeks ago.

Files:

• trunk/lib/Perlbal/BackendHTTP.pm (modified) (1 diff)

trunk/lib/Perlbal/BackendHTTP.pm

@@ -475 +475 @@
     if ((my $rep = $hd->header('X-REPROXY-FILE')) && $self->may_reproxy) {
         # make the client begin the async IO while we move on
+        $self->next_request;
         $client->start_reproxy_file($rep, $hd);
+        return;
+    } elsif ((my $urls = $hd->header('X-REPROXY-URL')) && $self->may_reproxy) {
         $self->next_request;
-        return;
-    } elsif ((my $urls = $hd->header('X-REPROXY-URL')) && $self->may_reproxy) {
         $self->{service}->add_to_reproxy_url_cache($rqhd, $hd)
             if $reproxy_cache_for;
-        $client->start_reproxy_uri($self->{res_headers}, $urls);
+        $client->start_reproxy_uri($hd, $urls);
+        return;
+    } elsif ((my $svcname = $hd->header('X-REPROXY-SERVICE')) && $self->may_reproxy) {
         $self->next_request;
-        return;
-    } elsif ((my $svcname = $hd->header('X-REPROXY-SERVICE')) && $self->may_reproxy) {
         $self->{client} = undef;
-        $client->start_reproxy_service($self->{res_headers}, $svcname);
-        $self->next_request;
+        $client->start_reproxy_service($hd, $svcname);
         return;
     } elsif ($res_code == 500 &&