--- loncom/loncnew 2005/06/09 02:38:03 1.70
+++ loncom/loncnew 2007/03/28 00:05:38 1.78
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# lonc maintains the connections to remote computers
#
-# $Id: loncnew,v 1.70 2005/06/09 02:38:03 albertel Exp $
+# $Id: loncnew,v 1.78 2007/03/28 00:05:38 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -106,8 +106,8 @@ my $ConnectionCount = 0;
my $IdleSeconds = 0; # Number of seconds idle.
my $Status = ""; # Current status string.
my $RecentLogEntry = "";
-my $ConnectionRetries=2; # Number of connection retries allowed.
-my $ConnectionRetriesLeft=2; # Number of connection retries remaining.
+my $ConnectionRetries=5; # Number of connection retries allowed.
+my $ConnectionRetriesLeft=5; # Number of connection retries remaining.
my $LondVersion = "unknown"; # Version of lond we talk with.
my $KeyMode = ""; # e.g. ssl, local, insecure from last connect.
my $LondConnecting = 0; # True when a connection is being built.
@@ -115,6 +115,7 @@ 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.
#
@@ -198,7 +199,7 @@ sub Log {
my $now = time;
my $local = localtime($now);
my $finalformat = "$local ($$) [$RemoteHost] [$Status] ";
- my $finalformat = $finalformat.$format."\n";
+ $finalformat = $finalformat.$format."\n";
# open the file and put the result.
@@ -331,11 +332,13 @@ sub child_exit {
# during which no listens will be done on the
# lonnet client socket.
#
- my $lock_file = GetLoncSocketPath().".lock";
+ 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:
@@ -677,9 +680,9 @@ sub FailTransaction {
if ($ConnectionRetriesLeft > 0) {
Log("WARNING", "Failing transaction "
- .$transaction->getRequest());
+ .$transaction->getLoggableRequest());
}
- Debug(1, "Failing transaction: ".$transaction->getRequest());
+ Debug(1, "Failing transaction: ".$transaction->getLoggableRequest());
if (!$transaction->isDeferred()) { # If the transaction is deferred we'll get to it.
my $client = $transaction->getClient();
Debug(1," Replying con_lost to ".$transaction->getRequest());
@@ -955,7 +958,7 @@ sub LondReadable {
# We need to be writable for this and probably don't belong
# here inthe first place.
- Deubg(6, "SendingRequest state encountered in readable");
+ Debug(6, "SendingRequest state encountered in readable");
$Watcher->poll("w");
$Watcher->cb(\&LondWritable);
@@ -1164,19 +1167,28 @@ sub QueueDelayed {
Debug(4, "Delayed path: ".$path);
opendir(DIRHANDLE, $path);
-
- my @alldelayed = grep /\.$RemoteHost$/, readdir DIRHANDLE;
+
+ 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();
+ }
+ my $host_id_re = '(?:'.join('|',@all_host_ids).')';
+ my @alldelayed = grep(/\.$host_id_re$/, readdir(DIRHANDLE));
closedir(DIRHANDLE);
- my $dfname;
- my $reqfile;
- foreach $dfname (sort @alldelayed) {
- $reqfile = "$path/$dfname";
- Debug(4, "queueing ".$reqfile);
+ foreach my $dfname (sort(@alldelayed)) {
+ my $reqfile = "$path/$dfname";
+ my ($host_id) = ($dfname =~ /\.([^.]*)$/);
+ Debug(4, "queueing ".$reqfile." for $host_id");
my $Handle = IO::File->new($reqfile);
my $cmd = <$Handle>;
chomp $cmd; # There may or may not be a newline...
$cmd = $cmd."\n"; # now for sure there's exactly one newline.
- my $Transaction = LondTransaction->new($cmd);
+ my $Transaction = LondTransaction->new("sethost:$host_id:$cmd");
$Transaction->SetDeferred($reqfile);
QueueTransaction($Transaction);
}
@@ -1517,15 +1529,14 @@ another event handler to subess requests
=cut
sub SetupLoncListener {
+ my ($host,$SocketName) = @_;
+ if (!$host) { $host = &GetServerHost(); }
+ if (!$SocketName) { $SocketName = &GetLoncSocketPath($host); }
- my $host = GetServerHost(); # Default host.
- if (@_) {
- ($host) = @_ # Override host with parameter.
- }
- my $socket;
- my $SocketName = GetLoncSocketPath($host);
unlink($SocketName);
+
+ my $socket;
unless ($socket =IO::Socket::UNIX->new(Local => $SocketName,
Listen => 250,
Type => SOCK_STREAM)) {
@@ -1722,7 +1733,7 @@ sub ChildProcess {
desc => 'Lonc Listener Unix Socket',
fd => $socket);
- $Event::Debuglevel = $DebugLevel;
+ $Event::DebugLevel = $DebugLevel;
Debug(9, "Making initial lond connection for ".$RemoteHost);
@@ -1796,25 +1807,67 @@ 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};
+ # Lookup the host associated with this socket:
+
+ my $host = $listening_to{$socket};
- # Start the child:
+ # 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);
+ }
+ }
+}
+
+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 $data = $watcher->data().$thisread;
+ $watcher->data($data);
+ if($data =~ /\n$/) { # Request entirely read.
+ chomp($data);
+ } else {
+ return;
+ }
- &Debug(9,"Creating child for $host (parent_client_connection)");
- &CreateChild($host, $socket);
+ &Debug(5,"Creating child for $data (parent_client_connection)");
+ &CreateChild($data);
# 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->send("done\n");
$socket->close();
- }
}
# parent_listen:
@@ -1836,23 +1889,43 @@ sub parent_listen {
my ($loncapa_host) = @_;
Debug(5, "parent_listen: $loncapa_host");
- my $socket = &SetupLoncListener($loncapa_host);
+ my ($socket,$file);
+ if (!$loncapa_host) {
+ $loncapa_host = 'common_parent';
+ $file = $perlvar{'lonSockCreate'};
+ } else {
+ $file = &GetLoncSocketPath($loncapa_host);
+ }
+ $socket = &SetupLoncListener($loncapa_host,$file);
+
$listening_to{$socket} = $loncapa_host;
if (!$socket) {
die "Unable to create a listen socket for $loncapa_host";
}
- my $lock_file = &GetLoncSocketPath($loncapa_host).".lock";
+ my $lock_file = $file.".lock";
unlink($lock_file); # No problem if it doesn't exist yet [startup e.g.]
- my $watcher = Event->io(cb => \&parent_client_connection,
- poll => 'r',
- desc => "Parent listener unix socket ($loncapa_host)",
- fd => $socket);
+ my $watcher =
+ Event->io(cb => \&parent_client_connection,
+ poll => 'r',
+ desc => "Parent listener unix socket ($loncapa_host)",
+ data => "",
+ fd => $socket);
$parent_dispatchers{$loncapa_host} = $watcher;
}
+sub parent_clean_up {
+ my ($loncapa_host) = @_;
+ Debug(5, "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.]
+ my $lock_file = $socket_file.".lock";
+ unlink($lock_file); # No problem if it doesn't exist yet [startup e.g.]
+}
+
# listen_on_all_unix_sockets:
# This sub initiates a listen on all unix domain lonc client sockets.
@@ -1875,13 +1948,18 @@ sub 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->[0];
+ 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();
+}
+
# server_died is called whenever a child process exits.
# Since this is dispatched via a signal, we must process all
# dead children until there are no more left. The action
@@ -1906,8 +1984,12 @@ sub server_died {
&Debug(9, "Caught sigchild for $host");
delete($ChildHash{$pid});
delete($HostToPid{$host});
- &parent_listen($host);
-
+ if ($hosts_tab) {
+ &parent_listen($host);
+ } else {
+ &parent_clean_up($host);
+ }
+
} else {
&Debug(5, "Caught sigchild for pid not in hosts hash: $pid");
}
@@ -1967,7 +2049,11 @@ my $HostIterator = LondConnection::GetHo
if ($DieWhenIdle) {
$RemoteHost = "[parent]";
- &listen_on_all_unix_sockets();
+ if ($hosts_tab) {
+ &listen_on_all_unix_sockets();
+ } else {
+ &listen_on_common_socket();
+ }
} else {
while (! $HostIterator->end()) {
@@ -2005,9 +2091,15 @@ if ($DieWhenIdle) {
$parent_handlers{TERM} = Event->signal(cb => \&Terminate,
desc => "Parent TERM handler",
signal => "TERM");
- $parent_handlers{HUP} = Event->signal(cb => \&Restart,
- desc => "Parent HUP handler.",
- signal => "HUP");
+ 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");
@@ -2030,7 +2122,11 @@ if ($DieWhenIdle) {
$SIG{INT} = \&Terminate;
$SIG{TERM} = \&Terminate;
- $SIG{HUP} = \&Restart;
+ if ($hosts_tab) {
+ $SIG{HUP} = \&Restart;
+ } else {
+ $SIG{HUP} = \&KillThemAll;
+ }
$SIG{USR1} = \&CheckKids;
$SIG{USR2} = \&UpdateKids; # LonManage update request.
@@ -2115,8 +2211,11 @@ sub UpdateKids {
# The down side is transactions that are in flight will get timed out
# (lost unless they are critical).
- &Restart();
-
+ if ($hosts_tab) {
+ &Restart();
+ } else {
+ &KillThemAll();
+ }
}
@@ -2156,8 +2255,6 @@ sub KillThemAll {
Log("CRITICAL", "Nicely Killing lonc for $serving pid = $pid");
kill 'QUIT' => $pid;
}
-
-
}