--- loncom/loncnew 2007/03/28 00:23:46 1.80 +++ loncom/loncnew 2007/03/28 20:28:29 1.81 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # lonc maintains the connections to remote computers # -# $Id: loncnew,v 1.80 2007/03/28 00:23:46 albertel Exp $ +# $Id: loncnew,v 1.81 2007/03/28 20:28:29 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -60,7 +60,6 @@ use LONCAPA::Stack; use LONCAPA::LondConnection; use LONCAPA::LondTransaction; use LONCAPA::Configuration; -use LONCAPA::HashIterator; use Fcntl qw(:flock); @@ -94,6 +93,7 @@ my $executable = $0; # Get the full # The variables below are only used by the child processes. # my $RemoteHost; # Name of host child is talking to. +my $RemoteHostId; # default lonid of host child is talking to. my $UnixSocketDir= $perlvar{'lonSockDir'}; my $IdleConnections = Stack->new(); # Set of idle connections my %ActiveConnections; # Connections to the remote lond. @@ -112,7 +112,6 @@ my $LondConnecting = 0; # True wh -my $hosts_tab = 0; # True if we are using a static hosts.tab my $I_am_child = 0; # True if this is the child process. # @@ -333,9 +332,7 @@ sub child_exit { open(LOCK,">$lock_file"); print LOCK "Contents not important"; close(LOCK); - if ($hosts_tab) { - unlink(&GetLoncSocketPath()); - } + unlink(&GetLoncSocketPath()); if ($message) { die($message); @@ -1150,10 +1147,12 @@ sub LondWritable { } } + =pod =cut + sub QueueDelayed { Debug(3,"QueueDelayed called"); @@ -1162,15 +1161,9 @@ sub QueueDelayed { Debug(4, "Delayed path: ".$path); opendir(DIRHANDLE, $path); - my @all_host_ids; - my $host_iterator = &LondConnection::GetHostIterator(); - while (!$host_iterator->end()) { - my ($host_id,$host_name) = @{$host_iterator->get()}[0,3]; - if ($host_name eq $RemoteHost) { - push(@all_host_ids, $host_id); - } - $host_iterator->next(); - } + use Apache::lonnet; + my @all_host_ids = &Apache::lonnet::machine_ids($RemoteHost); + my $host_id_re = '(?:'.join('|',@all_host_ids).')'; my @alldelayed = grep(/\.$host_id_re$/, readdir(DIRHANDLE)); closedir(DIRHANDLE); @@ -1206,7 +1199,8 @@ sub MakeLondConnection { .GetServerPort()); my $Connection = LondConnection->new(&GetServerHost(), - &GetServerPort()); + &GetServerPort(), + &GetHostId()); if($Connection eq undef) { # Needs to be more robust later. Log("CRITICAL","Failed to make a connection with lond."); @@ -1496,6 +1490,18 @@ sub GetServerHost { =pod +=head2 GetServerId + +Returns the hostid whose lond we talk with. + +=cut + +sub GetHostId { + return $RemoteHostId; # Setup by the fork. +} + +=pod + =head2 GetServerPort Returns the lond port number. @@ -1749,7 +1755,7 @@ sub ChildProcess { # Create a new child for host passed in: sub CreateChild { - my ($host, $socket) = @_; + my ($host, $hostid) = @_; my $sigset = POSIX::SigSet->new(SIGINT); sigprocmask(SIG_BLOCK, $sigset); @@ -1762,14 +1768,11 @@ sub CreateChild { sigprocmask(SIG_UNBLOCK, $sigset); } else { # child. + $RemoteHostId = $hostid; ShowStatus("Connected to ".$RemoteHost); $SIG{INT} = 'DEFAULT'; sigprocmask(SIG_UNBLOCK, $sigset); - if(defined $socket) { - &ChildProcess($socket); - } else { - ChildProcess; # Does not return. - } + &ChildProcess(); # Does not return. } } @@ -1797,33 +1800,11 @@ sub parent_client_connection { my ($event) = @_; my $watcher = $event->w; my $socket = $watcher->fd; - if ($hosts_tab) { - - # Lookup the host associated with this socket: - - my $host = $listening_to{$socket}; - - # Start the child: - - - - &Debug(9,"Creating child for $host (parent_client_connection)"); - &CreateChild($host, $socket); - - # Clean up the listen since now the child takes over until it exits. - - $watcher->cancel(); # Nolonger listening to this event - delete($listening_to{$socket}); - delete($parent_dispatchers{$host}); - $socket->close(); - - } else { - my $connection = $socket->accept(); # Accept the client connection. - Event->io(cb => \&get_remote_hostname, - poll => 'r', - data => "", - fd => $connection); - } + my $connection = $socket->accept(); # Accept the client connection. + Event->io(cb => \&get_remote_hostname, + poll => 'r', + data => "", + fd => $connection); } } @@ -1852,7 +1833,8 @@ sub get_remote_hostname { } &Debug(5,"Creating child for $data (parent_client_connection)"); - &CreateChild($data); + my ($hostname,$lonid) = split(':',$data,2); + &CreateChild($hostname,$lonid); # Clean up the listen since now the child takes over until it exits. $watcher->cancel(); # Nolonger listening to this event @@ -1973,12 +1955,8 @@ sub server_died { if($host) { # It's for real... &Debug(9, "Caught sigchild for $host"); delete($ChildHash{$pid}); - if ($hosts_tab) { - &parent_listen($host); - } else { - &parent_clean_up($host); - } - + &parent_clean_up($host); + } else { &Debug(5, "Caught sigchild for pid not in hosts hash: $pid"); } @@ -2036,11 +2014,7 @@ Log("CRITICAL", "--------------- Startin LondConnection::ReadConfig; # Read standard config files. $RemoteHost = "[parent]"; -if ($hosts_tab) { - &listen_on_all_unix_sockets(); -} else { - &listen_on_common_socket(); -} +&listen_on_common_socket(); $RemoteHost = "Parent Server"; @@ -2065,15 +2039,9 @@ $parent_handlers{INT} = Event->signal(cb $parent_handlers{TERM} = Event->signal(cb => \&Terminate, desc => "Parent TERM handler", signal => "TERM"); -if ($hosts_tab) { - $parent_handlers{HUP} = Event->signal(cb => \&Restart, - desc => "Parent HUP handler.", - signal => "HUP"); -} else { - $parent_handlers{HUP} = Event->signal(cb => \&KillThemAll, - desc => "Parent HUP handler.", - signal => "HUP"); -} +$parent_handlers{HUP} = Event->signal(cb => \&KillThemAll, + desc => "Parent HUP handler.", + signal => "HUP"); $parent_handlers{USR1} = Event->signal(cb => \&CheckKids, desc => "Parent USR1 handler", signal => "USR1"); @@ -2154,11 +2122,7 @@ sub UpdateKids { # The down side is transactions that are in flight will get timed out # (lost unless they are critical). - if ($hosts_tab) { - &Restart(); - } else { - &KillThemAll(); - } + &KillThemAll(); } @@ -2242,6 +2206,14 @@ sub Terminate { exit 0; } + +sub my_hostname { + use Sys::Hostname; + my $name = &hostname(); + &Debug(9,"Name is $name"); + return $name; +} + =pod =head1 Theory