Changeset 11971 for lang/perl/Moobal/trunk/lib

Timestamp:

05/19/08 12:18:25 (5 years ago)

Author:

daisuke

Message:

proxy accepts connections, but blocks

Location:

lang/perl/Moobal/trunk/lib

Files:

• Moobal.pm (modified) (1 diff)
• Moobal/BackendPool.pm (modified) (1 diff)
• Moobal/Component/BackendHTTP.pm (modified) (7 diffs)
• Moobal/Pool.pm (modified) (3 diffs)
• Moobal/Role/SocketHandler.pm (modified) (1 diff)

lang/perl/Moobal/trunk/lib/Moobal.pm

@@ -96 +96 @@
     return $self;
 };
+
+sub register_backend
+{
+    $_[0]->backend_pool->register_bored( $_[1] );
+}
 
 sub pool { $_[0]->pools->{ $_[1] } }

lang/perl/Moobal/trunk/lib/Moobal/BackendPool.pm

@@ -8 +8 @@
 );
 
+sub register_bored
+{
+    my $self = shift;
+    push @{ $self->bored }, $_[0];
+}
+
 1;

lang/perl/Moobal/trunk/lib/Moobal/Component/BackendHTTP.pm

@@ -32 +32 @@
 has 'ip' => (
     is => 'rw',
-    isa => 'Str'
+    isa => 'Str',
+    required => 1,
 );
 
@@ -38 +39 @@
 has 'port' => (
     is => 'rw',
-    isa => 'Str'
+    isa => 'Str',
+    required => 1,
 );
 
@@ -44 +46 @@
 has 'ipport' => (
     is => 'rw',
-    isa => 'Str'
+    isa => 'Str',
+    required => 1,
 );
 
@@ -160 +163 @@
 
     my $self = $next->($class, %args,
+        ipport => join(':', $args{ip}, $args{port}),
         socket => _create_socket( $args{context}, $args{ip}, $args{port} )
     );
@@ -176 +180 @@
 
     # mark another connection to this ip:port
-    $NodeStats{$self->ipport}->{attempts}++;
-    $NodeStats{$self->ipport}->{lastattempt} = $self->{create_time};
-
+    my $data = $NodeStats{$self->ipport};
+    if (! $data) {
+        $data = { attempts => 0, lastattempt => 0 };
+        $NodeStats{$self->ipport} = $data;
+    }
+    $data->{attempts}++;
+    $data->{lastattempt} = $self->{create_time};
+
+    # All backend http components are registered into the global
+    # backend pool
+    $self->context->register_backend( $self );
 
     return $self;
+};
+
+around 'DESTROY' => sub {
+    my $next = shift;
+    my $self = shift;
+    if (my $context = $self->context) {
+        $context->unregister_backend( $self );
+    }
+    $next->($self, @_ );
 };
 
@@ -417 +438 @@
 
         my $service = $self->service;
-        if (defined $service && $service->verify_backend &&
+        if (defined $service && $service->param('verify_backend') &&
             !$self->{has_attention} && !defined $NoVerify{$ipport}) {
 
             # the backend should be able to answer this incredibly quickly.
-            $self->write("OPTIONS " . $self->{service}->{verify_backend_path} . " HTTP/1.0\r\nConnection: keep-alive\r\n\r\n");
+            $self->write("OPTIONS " . ($service->param('verify_backend_path') || '/') . " HTTP/1.0\r\nConnection: keep-alive\r\n\r\n");
             $self->watch_read(1);
             $self->{waiting_options} = 1;
@@ -687 +708 @@
 
     # and now see if we should closed based on the pool we're from
+
+    my $pool = $self->pool;
     return $self->close('pool_requested_closure')
-        if $self->{pool} && ! $self->{pool}->backend_should_live($self);
+        if $pool && ! $pool->backend_should_live($self);
 
     # we've been used

lang/perl/Moobal/trunk/lib/Moobal/Pool.pm

@@ -41 +41 @@
 );
 
+has 'use_count' => (
+    is => 'rw',
+    isa => 'Int',
+    default => 0,
+);
+
 use constant NODEFILE_RELOAD_FREQ => 3;
 
@@ -79 +85 @@
     return @{ $nodes[int(rand($self->node_count))] };
 }
+
+sub backend_should_live {
+    my ($self, $be) = @_;
+
+    # a backend stays alive if we still have users.  eventually this whole
+    # function might do more and actually take into account the individual
+    # backend, but for now, this suits us.
+    return $self->use_count > 0;
+}
+
+
 
 1;
@@ -284 +301 @@
 }
 
-sub backend_should_live {
-    my Moobal::Pool $self = $_[0];
-    my Moobal::BackendHTTP $be = $_[1];
-
-    # a backend stays alive if we still have users.  eventually this whole
-    # function might do more and actually take into account the individual
-    # backend, but for now, this suits us.
-    return 1 if $self->{use_count};
-    return 0;
-}
-
 sub node_count {
     my Moobal::Pool $self = $_[0];

lang/perl/Moobal/trunk/lib/Moobal/Role/SocketHandler.pm

@@ -74 +74 @@
 has 'read_ahead' => (
     is => 'rw',
-    isa => 'Str'
+    isa => 'Int',
+    default => 0,
 );