--- loncom/loncnew 2007/03/28 20:28:29 1.81 +++ loncom/loncnew 2007/04/11 16:20:26 1.84 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # lonc maintains the connections to remote computers # -# $Id: loncnew,v 1.81 2007/03/28 20:28:29 albertel Exp $ +# $Id: loncnew,v 1.84 2007/04/11 16:20:26 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -72,7 +72,8 @@ my %perlvar = %{$perlvarref}; # # parent and shared variables. -my %ChildHash; # by pid -> host. +my %ChildPid; # by pid -> host. +my %ChildHost; # by host. my %listening_to; # Socket->host table for who the parent # is listening to. my %parent_dispatchers; # host-> listener watcher events. @@ -94,6 +95,7 @@ my $executable = $0; # Get the full # my $RemoteHost; # Name of host child is talking to. my $RemoteHostId; # default lonid of host child is talking to. +my @all_host_ids; my $UnixSocketDir= $perlvar{'lonSockDir'}; my $IdleConnections = Stack->new(); # Set of idle connections my %ActiveConnections; # Connections to the remote lond. @@ -500,6 +502,9 @@ the data and Event->w->fd is the socket sub ClientWritable { my $Event = shift; my $Watcher = $Event->w; + if (!defined($Watcher)) { + &child_exit(-1,'No watcher for event in ClientWritable'); + } my $Data = $Watcher->data; my $Socket = $Watcher->fd; @@ -563,6 +568,7 @@ sub ClientWritable { } } else { $Watcher->cancel(); # A delayed request...just cancel. + return; } } @@ -1161,10 +1167,7 @@ sub QueueDelayed { Debug(4, "Delayed path: ".$path); opendir(DIRHANDLE, $path); - use Apache::lonnet; - my @all_host_ids = &Apache::lonnet::machine_ids($RemoteHost); - - my $host_id_re = '(?:'.join('|',@all_host_ids).')'; + my $host_id_re = '(?:'.join('|',map {quotemeta($_)} (@all_host_ids)).')'; my @alldelayed = grep(/\.$host_id_re$/, readdir(DIRHANDLE)); closedir(DIRHANDLE); foreach my $dfname (sort(@alldelayed)) { @@ -1208,6 +1211,7 @@ sub MakeLondConnection { return 0; # Failure. } else { + $LondConnecting = 1; # Connection in progress. # The connection needs to have writability # monitored in order to send the init sequence # that starts the whole authentication/key @@ -1238,7 +1242,6 @@ sub MakeLondConnection { } Log("SUCESS", "Created connection ".$ConnectionCount ." to host ".GetServerHost()); - $LondConnecting = 1; # Connection in progress. return 1; # Return success. } @@ -1764,9 +1767,9 @@ sub CreateChild { my $pid = fork; if($pid) { # Parent $RemoteHost = "Parent"; - $ChildHash{$pid} = $host; + $ChildPid{$pid} = $host; sigprocmask(SIG_UNBLOCK, $sigset); - + undef(@all_host_ids); } else { # child. $RemoteHostId = $hostid; ShowStatus("Connected to ".$RemoteHost); @@ -1809,37 +1812,41 @@ sub parent_client_connection { } sub get_remote_hostname { - my ($event) = @_; - my $watcher = $event->w; - my $socket = $watcher->fd; - - my $thisread; - my $rv = $socket->recv($thisread, POSIX::BUFSIZ, 0); - Debug(8, "rcv: data length = ".length($thisread)." read =".$thisread); - if (!defined($rv) || length($thisread) == 0) { - # Likely eof on socket. - Debug(5,"Client Socket closed on lonc for p_c_c"); - close($socket); - $watcher->cancel(); - return; - } + my ($event) = @_; + my $watcher = $event->w; + my $socket = $watcher->fd; - my $data = $watcher->data().$thisread; - $watcher->data($data); - if($data =~ /\n$/) { # Request entirely read. - chomp($data); - } else { - return; - } - - &Debug(5,"Creating child for $data (parent_client_connection)"); - my ($hostname,$lonid) = split(':',$data,2); + my $thisread; + my $rv = $socket->recv($thisread, POSIX::BUFSIZ, 0); + Debug(8, "rcv: data length = ".length($thisread)." read =".$thisread); + if (!defined($rv) || length($thisread) == 0) { + # Likely eof on socket. + Debug(5,"Client Socket closed on lonc for p_c_c"); + close($socket); + $watcher->cancel(); + return; + } + + my $data = $watcher->data().$thisread; + $watcher->data($data); + if($data =~ /\n$/) { # Request entirely read. + chomp($data); + } else { + return; + } + + &Debug(5,"Creating child for $data (parent_client_connection)"); + (my $hostname,my $lonid,@all_host_ids) = split(':',$data); + $ChildHost{$hostname}++; + if ($ChildHost{$hostname} == 1) { &CreateChild($hostname,$lonid); - - # Clean up the listen since now the child takes over until it exits. - $watcher->cancel(); # Nolonger listening to this event - $socket->send("done\n"); - $socket->close(); + } else { + &Log('WARNING',"Request for a second child on $hostname"); + } + # Clean up the listen since now the child takes over until it exits. + $watcher->cancel(); # Nolonger listening to this event + $socket->send("done\n"); + $socket->close(); } # parent_listen: @@ -1890,7 +1897,7 @@ sub parent_listen { sub parent_clean_up { my ($loncapa_host) = @_; - Debug(5, "parent_clean_up: $loncapa_host"); + Debug(-1, "parent_clean_up: $loncapa_host"); my $socket_file = &GetLoncSocketPath($loncapa_host); unlink($socket_file); # No problem if it doesn't exist yet [startup e.g.] @@ -1899,14 +1906,12 @@ sub parent_clean_up { } -# listen_on_all_unix_sockets: -# This sub initiates a listen on all unix domain lonc client sockets. -# This will be called in the case where we are trimming idle processes. -# When idle processes are trimmed, loncnew starts up with no children, -# and only spawns off children when a connection request occurs on the -# client unix socket. The spawned child continues to run until it has -# been idle a while at which point it eventually exits and once more -# the parent picks up the listen. + +# This sub initiates a listen on the common unix domain lonc client socket. +# loncnew starts up with no children, and only spawns off children when a +# connection request occurs on the common client unix socket. The spawned +# child continues to run until it has been idle a while at which point it +# eventually exits and once more the parent picks up the listen. # # Parameters: # NONE @@ -1915,18 +1920,6 @@ sub parent_clean_up { # Returns: # NONE # -sub listen_on_all_unix_sockets { - Debug(5, "listen_on_all_unix_sockets"); - my $host_iterator = &LondConnection::GetHostIterator(); - while (!$host_iterator->end()) { - my $host_entry_ref = $host_iterator->get(); - my $host_name = $host_entry_ref->[3]; - Debug(9, "Listen for $host_name"); - &parent_listen($host_name); - $host_iterator->next(); - } -} - sub listen_on_common_socket { Debug(5, "listen_on_common_socket"); &parent_listen(); @@ -1951,10 +1944,11 @@ sub server_died { } # need the host to restart: - my $host = $ChildHash{$pid}; + my $host = $ChildPid{$pid}; if($host) { # It's for real... &Debug(9, "Caught sigchild for $host"); - delete($ChildHash{$pid}); + delete($ChildPid{$pid}); + delete($ChildHost{$host}); &parent_clean_up($host); } else { @@ -2078,7 +2072,7 @@ sub CheckKids { foreach my $host (keys %parent_dispatchers) { print $fh "LONC Parent process listening for $host\n"; } - foreach my $pid (keys %ChildHash) { + foreach my $pid (keys %ChildPid) { Debug(2, "Sending USR1 -> $pid"); kill 'USR1' => $pid; # Tell Child to report status. } @@ -2156,8 +2150,8 @@ SIGHUP. Responds to sigint and sigterm. sub KillThemAll { Debug(2, "Kill them all!!"); local($SIG{CHLD}) = 'IGNORE'; # Our children >will< die. - foreach my $pid (keys %ChildHash) { - my $serving = $ChildHash{$pid}; + foreach my $pid (keys %ChildPid) { + my $serving = $ChildPid{$pid}; ShowStatus("Nicely Killing lonc for $serving pid = $pid"); Log("CRITICAL", "Nicely Killing lonc for $serving pid = $pid"); kill 'QUIT' => $pid; @@ -2173,12 +2167,12 @@ sub really_kill_them_all_dammit { Debug(2, "Kill them all Dammit"); local($SIG{CHLD} = 'IGNORE'); # In case some purist reenabled them. - foreach my $pid (keys %ChildHash) { - my $serving = $ChildHash{$pid}; + foreach my $pid (keys %ChildPid) { + my $serving = $ChildPid{$pid}; &ShowStatus("Nastily killing lonc for $serving pid = $pid"); Log("CRITICAL", "Nastily killing lonc for $serving pid = $pid"); kill 'KILL' => $pid; - delete($ChildHash{$pid}); + delete($ChildPid{$pid}); my $execdir = $perlvar{'lonDaemons'}; unlink("$execdir/logs/lonc.pid"); }