--- loncom/loncnew 2007/03/28 00:05:38 1.78
+++ 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.78 2007/03/28 00:05:38 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);
@@ -74,8 +73,6 @@ my %perlvar = %{$perlvarref};
# parent and shared variables.
my %ChildHash; # by pid -> host.
-my %HostToPid; # By host -> pid.
-my %HostHash; # by loncapaname -> IP.
my %listening_to; # Socket->host table for who the parent
# is listening to.
my %parent_dispatchers; # host-> listener watcher events.
@@ -96,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.
@@ -114,8 +112,6 @@ my $LondConnecting = 0; # True wh
-my $DieWhenIdle = 1; # When true children die when trimmed -> 0.
-my $hosts_tab = 1; # True if we are using a static hosts.tab
my $I_am_child = 0; # True if this is the child process.
#
@@ -309,12 +305,13 @@ sub SocketTimeout {
}
}
+
#
# This function should be called by the child in all cases where it must
-# exit. If the child process is running with the DieWhenIdle turned on
-# it must create a lock file for the AF_UNIX socket in order to prevent
-# connection requests from lonnet in the time between process exit
-# and the parent picking up the listen again.
+# exit. The child process must create a lock file for the AF_UNIX socket
+# in order to prevent connection requests from lonnet in the time between
+# process exit and the parent picking up the listen again.
+#
# Parameters:
# exit_code - Exit status value, however see the next parameter.
# message - If this optional parameter is supplied, the exit
@@ -325,26 +322,20 @@ sub child_exit {
# Regardless of how we exit, we may need to do the lock thing:
- if($DieWhenIdle) {
- #
- # Create a lock file since there will be a time window
- # between our exit and the parent's picking up the listen
- # during which no listens will be done on the
- # lonnet client socket.
- #
- my $lock_file = &GetLoncSocketPath().".lock";
- open(LOCK,">$lock_file");
- print LOCK "Contents not important";
- close(LOCK);
- if ($hosts_tab) {
- unlink(&GetLoncSocketPath());
- }
- exit(0);
- }
- # Now figure out how we exit:
+ #
+ # Create a lock file since there will be a time window
+ # between our exit and the parent's picking up the listen
+ # during which no listens will be done on the
+ # lonnet client socket.
+ #
+ my $lock_file = &GetLoncSocketPath().".lock";
+ open(LOCK,">$lock_file");
+ print LOCK "Contents not important";
+ close(LOCK);
+ unlink(&GetLoncSocketPath());
- if($message) {
- die $message;
+ if ($message) {
+ die($message);
} else {
exit($exit_code);
}
@@ -378,7 +369,7 @@ sub Tick {
KillSocket($Socket);
$IdleSeconds = 0; # Otherwise all connections get trimmed to fast.
UpdateStatus();
- if(($ConnectionCount == 0) && $DieWhenIdle) {
+ if(($ConnectionCount == 0)) {
&child_exit(0);
}
@@ -1156,10 +1147,12 @@ sub LondWritable {
}
}
+
=pod
=cut
+
sub QueueDelayed {
Debug(3,"QueueDelayed called");
@@ -1168,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);
@@ -1212,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.");
@@ -1413,7 +1401,7 @@ sub ClientRequest {
# Accept a connection request for a client (lonc child) and
# start up an event watcher to keep an eye on input from that
# Event. This can be called both from NewClient and from
-# ChildProcess if we are started in DieWhenIdle mode.
+# ChildProcess.
# Parameters:
# $socket - The listener socket.
# Returns:
@@ -1502,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.
@@ -1665,7 +1665,7 @@ Optional parameter:
=cut
sub ChildProcess {
- # If we are in DieWhenIdle mode, we've inherited all the
+ # We've inherited all the
# events of our parent and those have to be cancelled or else
# all holy bloody chaos will result.. trust me, I already made
# >that< mistake.
@@ -1741,12 +1741,9 @@ sub ChildProcess {
# &MakeLondConnection(); // let first work request do it.
- # If We are in diwhenidle, need to accept the connection since the
- # event may not fire.
+ # need to accept the connection since the event may not fire.
- if ($DieWhenIdle) {
- &accept_client($socket);
- }
+ &accept_client($socket);
Debug(9,"Entering event loop");
my $ret = Event::loop(); # Start the main event loop.
@@ -1758,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);
@@ -1768,18 +1765,14 @@ sub CreateChild {
if($pid) { # Parent
$RemoteHost = "Parent";
$ChildHash{$pid} = $host;
- $HostToPid{$host}= $pid;
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.
}
}
@@ -1807,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);
}
}
@@ -1862,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
@@ -1983,13 +1955,8 @@ sub server_died {
if($host) { # It's for real...
&Debug(9, "Caught sigchild for $host");
delete($ChildHash{$pid});
- delete($HostToPid{$host});
- 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");
}
@@ -2045,25 +2012,9 @@ ShowStatus("Forking node servers");
Log("CRITICAL", "--------------- Starting children ---------------");
LondConnection::ReadConfig; # Read standard config files.
-my $HostIterator = LondConnection::GetHostIterator;
-if ($DieWhenIdle) {
- $RemoteHost = "[parent]";
- if ($hosts_tab) {
- &listen_on_all_unix_sockets();
- } else {
- &listen_on_common_socket();
- }
-} else {
-
- while (! $HostIterator->end()) {
-
- my $hostentryref = $HostIterator->get();
- CreateChild($hostentryref->[0]);
- $HostHash{$hostentryref->[0]} = $hostentryref->[4];
- $HostIterator->next();
- }
-}
+$RemoteHost = "[parent]";
+&listen_on_common_socket();
$RemoteHost = "Parent Server";
@@ -2072,78 +2023,38 @@ $RemoteHost = "Parent Server";
ShowStatus("Parent keeping the flock");
-if ($DieWhenIdle) {
- # We need to setup a SIGChild event to handle the exit (natural or otherwise)
- # of the children.
-
- Event->signal(cb => \&server_died,
- desc => "Child exit handler",
- signal => "CHLD");
-
-
- # Set up all the other signals we set up. We'll vector them off to the
- # same subs as we would for DieWhenIdle false and, if necessary, conditionalize
- # the code there.
-
- $parent_handlers{INT} = Event->signal(cb => \&Terminate,
- desc => "Parent INT handler",
- signal => "INT");
- $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{USR1} = Event->signal(cb => \&CheckKids,
- desc => "Parent USR1 handler",
- signal => "USR1");
- $parent_handlers{USR2} = Event->signal(cb => \&UpdateKids,
- desc => "Parent USR2 handler.",
- signal => "USR2");
-
- # Start procdesing events.
-
- $Event::DebugLevel = $DebugLevel;
- Debug(9, "Parent entering event loop");
- my $ret = Event::loop();
- die "Main Event loop exited: $ret";
-
-
-} else {
- #
- # Set up parent signals:
- #
-
- $SIG{INT} = \&Terminate;
- $SIG{TERM} = \&Terminate;
- if ($hosts_tab) {
- $SIG{HUP} = \&Restart;
- } else {
- $SIG{HUP} = \&KillThemAll;
- }
- $SIG{USR1} = \&CheckKids;
- $SIG{USR2} = \&UpdateKids; # LonManage update request.
-
- while(1) {
- my $deadchild = wait();
- if(exists $ChildHash{$deadchild}) { # need to restart.
- my $deadhost = $ChildHash{$deadchild};
- delete($HostToPid{$deadhost});
- delete($ChildHash{$deadchild});
- Log("WARNING","Lost child pid= ".$deadchild.
- "Connected to host ".$deadhost);
- Log("INFO", "Restarting child procesing ".$deadhost);
- CreateChild($deadhost);
- }
- }
-}
+# We need to setup a SIGChild event to handle the exit (natural or otherwise)
+# of the children.
+Event->signal(cb => \&server_died,
+ desc => "Child exit handler",
+ signal => "CHLD");
+
+
+# Set up all the other signals we set up.
+
+$parent_handlers{INT} = Event->signal(cb => \&Terminate,
+ desc => "Parent INT handler",
+ signal => "INT");
+$parent_handlers{TERM} = Event->signal(cb => \&Terminate,
+ desc => "Parent TERM handler",
+ signal => "TERM");
+$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");
+$parent_handlers{USR2} = Event->signal(cb => \&UpdateKids,
+ desc => "Parent USR2 handler.",
+ signal => "USR2");
+
+# Start procdesing events.
+
+$Event::DebugLevel = $DebugLevel;
+Debug(9, "Parent entering event loop");
+my $ret = Event::loop();
+die "Main Event loop exited: $ret";
=pod
@@ -2211,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();
}
@@ -2299,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