loncom/loncnew - diff

Return to loncnew CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/loncnew between versions 1.14 and 1.41

version 1.14, 2003/07/03 02:10:18	version 1.41, 2004/02/09 13:39:28
Line 7	Line 7
# Copyright Michigan State University Board of Trustees	# Copyright Michigan State University Board of Trustees
#	#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).	# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
#	## LON-CAPA is free software; you can redistribute it and/or modify
# LON-CAPA is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by	# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or	# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.	# (at your option) any later version.
Line 27	Line 26
# http://www.lon-capa.org/	# http://www.lon-capa.org/
#	#
#	#
# new lonc handles n requestors spread out bver m connections to londs.	# new lonc handles n request out bver m connections to londs.
# This module is based on the Event class.	# This module is based on the Event class.
# Development iterations:	# Development iterations:
# - Setup basic event loop. (done)	# - Setup basic event loop. (done)
Line 36	Line 35
# - Add ability to create/negotiate lond connections (done).	# - Add ability to create/negotiate lond connections (done).
# - Add general logic for dispatching requests and timeouts. (done).	# - Add general logic for dispatching requests and timeouts. (done).
# - Add support for the lonc/lond requests. (done).	# - Add support for the lonc/lond requests. (done).
# - Add logging/status monitoring.	# - Add logging/status monitoring. (done)
# - Add Signal handling - HUP restarts. USR1 status report.	# - Add Signal handling - HUP restarts. USR1 status report. (done)
# - Add Configuration file I/O (done).	# - Add Configuration file I/O (done).
# - Add management/status request interface.	# - Add management/status request interface. (done)
# - Add deferred request capability. (done)	# - Add deferred request capability. (done)
# - Detect transmission timeouts.	# - Detect transmission timeouts. (done)
#

# Change log:
# $Log$
# Revision 1.14 2003/07/03 02:10:18 foxr
# Get all of the signals to work correctly.
#
# Revision 1.13 2003/07/02 01:31:55 foxr
# Added kill -HUP logic (restart).
#
# Revision 1.11 2003/06/25 01:54:44 foxr
# Fix more problems with transaction failure.
#
# Revision 1.10 2003/06/24 02:46:04 foxr
# Put a limit on the number of times we'll retry a connection.
# Start getting the signal stuff put in as well...note that need to get signals
# going or else 6the client will permanently give up on dead servers.
#
# Revision 1.9 2003/06/13 02:38:43 foxr
# Add logging in 'expected format'
#
# Revision 1.8 2003/06/11 02:04:35 foxr
# Support delayed transactions... this is done uniformly by encapsulating
# transactions in an object ... a LondTransaction that is implemented by
# LondTransaction.pm
#
# Revision 1.7 2003/06/03 01:59:39 foxr
# complete coding to support deferred transactions.
#
#	#

	use strict;
use lib "/home/httpd/lib/perl/";	use lib "/home/httpd/lib/perl/";
use lib "/home/foxr/newloncapa/types";
use Event qw(:DEFAULT );	use Event qw(:DEFAULT );
use POSIX qw(:signal_h);	use POSIX qw(:signal_h);
use POSIX;	use POSIX;
Line 93 use LONCAPA::Configuration;	Line 63 use LONCAPA::Configuration;
use LONCAPA::HashIterator;	use LONCAPA::HashIterator;


#
# Disable all signals we might receive from outside for now.
#
#$SIG{QUIT} = IGNORE;
#$SIG{HUP} = IGNORE;
#$SIG{USR1} = IGNORE;
#$SIG{INT} = IGNORE;
#$SIG{CHLD} = IGNORE;
#$SIG{__DIE__} = IGNORE;


# Read the httpd configuration file to get perl variables	# Read the httpd configuration file to get perl variables
# normally set in apache modules:	# normally set in apache modules:

Line 114 my %perlvar = %{$perlvarref};	Line 73 my %perlvar = %{$perlvarref};
# parent and shared variables.	# parent and shared variables.

my %ChildHash; # by pid -> host.	my %ChildHash; # by pid -> host.
	my %HostToPid; # By host -> pid.
	my %HostHash; # by loncapaname -> IP.


my $MaxConnectionCount = 10; # Will get from config later.	my $MaxConnectionCount = 10; # Will get from config later.
my $ClientConnection = 0; # Uniquifier for client events.	my $ClientConnection = 0; # Uniquifier for client events.

my $DebugLevel = 0;	my $DebugLevel = 0;
	my $NextDebugLevel= 2; # So Sigint can toggle this.
my $IdleTimeout= 3600; # Wait an hour before pruning connections.	my $IdleTimeout= 3600; # Wait an hour before pruning connections.

	my $LogTransactions = 0; # When True, all transactions/replies get logged.

#	#
# The variables below are only used by the child processes.	# The variables below are only used by the child processes.
#	#
my $RemoteHost; # Name of host child is talking to.	my $RemoteHost; # Name of host child is talking to.
my $UnixSocketDir= "/home/httpd/sockets";	my $UnixSocketDir= $perlvar{'lonSockDir'};
my $IdleConnections = Stack->new(); # Set of idle connections	my $IdleConnections = Stack->new(); # Set of idle connections
my %ActiveConnections; # Connections to the remote lond.	my %ActiveConnections; # Connections to the remote lond.
my %ActiveTransactions; # LondTransactions in flight.	my %ActiveTransactions; # LondTransactions in flight.
Line 136 my $ConnectionCount = 0;	Line 100 my $ConnectionCount = 0;
my $IdleSeconds = 0; # Number of seconds idle.	my $IdleSeconds = 0; # Number of seconds idle.
my $Status = ""; # Current status string.	my $Status = ""; # Current status string.
my $RecentLogEntry = "";	my $RecentLogEntry = "";
my $ConnectionRetries=5; # Number of connection retries allowed.	my $ConnectionRetries=2; # Number of connection retries allowed.
my $ConnectionRetriesLeft=5; # Number of connection retries remaining.	my $ConnectionRetriesLeft=2; # Number of connection retries remaining.
	my $LondVersion = "unknown"; # Version of lond we talk with.

#	#
# The hash below gives the HTML format for log messages	# The hash below gives the HTML format for log messages
Line 235 sub GetPeername {	Line 200 sub GetPeername {
my $peerip;	my $peerip;
if($AdrFamily == AF_INET) {	if($AdrFamily == AF_INET) {
($peerport, $peerip) = sockaddr_in($peer);	($peerport, $peerip) = sockaddr_in($peer);
my $peername = gethostbyaddr($iaddr, $AdrFamily);	my $peername = gethostbyaddr($peerip, $AdrFamily);
return $peername;	return $peername;
} elsif ($AdrFamily == AF_UNIX) {	} elsif ($AdrFamily == AF_UNIX) {
my $peerfile;	my $peerfile;
Line 243 sub GetPeername {	Line 208 sub GetPeername {
return $peerfile;	return $peerfile;
}	}
}	}
#----------------------------- Timer management ------------------------
=pod	=pod

=head2 Debug	=head2 Debug
Line 256 sub Debug {	Line 220 sub Debug {
my $level = shift;	my $level = shift;
my $message = shift;	my $message = shift;
if ($level <= $DebugLevel) {	if ($level <= $DebugLevel) {
print $message." host = ".$RemoteHost."\n";	Log("INFO", "-Debug- $message host = $RemoteHost");
}	}
}	}

Line 286 sub ShowStatus {	Line 250 sub ShowStatus {

=pod	=pod

	=head 2 SocketTimeout

	Called when an action on the socket times out. The socket is
	destroyed and any active transaction is failed.


	=cut
	sub SocketTimeout {
	my $Socket = shift;
	Log("WARNING", "A socket timeout was detected");
	Debug(0, " SocketTimeout called: ");
	$Socket->Dump();
	KillSocket($Socket); # A transaction timeout also counts as
	# a connection failure:
	$ConnectionRetriesLeft--;
	}
	#----------------------------- Timer management ------------------------

	=pod

=head2 Tick	=head2 Tick

Invoked each timer tick.	Invoked each timer tick.
Line 295 Invoked each timer tick.	Line 279 Invoked each timer tick.

sub Tick {	sub Tick {
my $client;	my $client;
ShowStatus(GetServerHost()." Connection count: ".$ConnectionCount);	if($ConnectionRetriesLeft > 0) {
	ShowStatus(GetServerHost()." Connection count: ".$ConnectionCount
	." Retries remaining: ".$ConnectionRetriesLeft);
	} else {
	ShowStatus(GetServerHost()." >> DEAD <<");
	}
# Is it time to prune connection count:	# Is it time to prune connection count:


Line 304 sub Tick {	Line 292 sub Tick {
($WorkQueue->Count() == 0)) { # Idle connections and nothing to do?	($WorkQueue->Count() == 0)) { # Idle connections and nothing to do?
$IdleSeconds++;	$IdleSeconds++;
if($IdleSeconds > $IdleTimeout) { # Prune a connection...	if($IdleSeconds > $IdleTimeout) { # Prune a connection...
$Socket = $IdleConnections->pop();	my $Socket = $IdleConnections->pop();
KillSocket($Socket);	KillSocket($Socket);
}	}
} else {	} else {
$IdleSeconds = 0; # Reset idle count if not idle.	$IdleSeconds = 0; # Reset idle count if not idle.
}	}
	#
	# For each inflight transaction, tick down its timeout counter.
	#

	foreach my $item (keys %ActiveConnections) {
	my $State = $ActiveConnections{$item}->data->GetState();
	if ($State ne 'Idle') {
	Debug(5,"Ticking Socket $State $item");
	$ActiveConnections{$item}->data->Tick();
	}
	}
# Do we have work in the queue, but no connections to service them?	# Do we have work in the queue, but no connections to service them?
# If so, try to make some new connections to get things going again.	# If so, try to make some new connections to get things going again.
#	#
Line 320 sub Tick {	Line 318 sub Tick {
if ($ConnectionRetriesLeft > 0) {	if ($ConnectionRetriesLeft > 0) {
my $Connections = ($Requests <= $MaxConnectionCount) ?	my $Connections = ($Requests <= $MaxConnectionCount) ?
$Requests : $MaxConnectionCount;	$Requests : $MaxConnectionCount;
Debug(1,"Work but no connections, start ".$Connections." of them");	Debug(5,"Work but no connections, start ".$Connections." of them");
for ($i =0; $i < $Connections; $i++) {	my $successCount = 0;
MakeLondConnection();	for (my $i =0; $i < $Connections; $i++) {
	$successCount += MakeLondConnection();
	}
	if($successCount == 0) { # All connections failed:
	Debug(5,"Work in queue failed to make any connectiouns\n");
	EmptyQueue(); # Fail pending transactions with con_lost.
}	}
} else {	} else {
Debug(1,"Work in queue, but gave up on connections..flushing\n");	ShowStatus(GetServerHost()." >>> DEAD!!! <<<");
	Debug(5,"Work in queue, but gave up on connections..flushing\n");
EmptyQueue(); # Connections can't be established.	EmptyQueue(); # Connections can't be established.
}	}

Line 350 Trigger disconnections of idle sockets.	Line 354 Trigger disconnections of idle sockets.

sub SetupTimer {	sub SetupTimer {
Debug(6, "SetupTimer");	Debug(6, "SetupTimer");
Event->timer(interval => 1, debug => 1, cb => \&Tick );	Event->timer(interval => 1, cb => \&Tick );
}	}

=pod	=pod
Line 372 sub ServerToIdle {	Line 376 sub ServerToIdle {
my $Socket = shift; # Get the socket.	my $Socket = shift; # Get the socket.
delete($ActiveTransactions{$Socket}); # Server has no transaction	delete($ActiveTransactions{$Socket}); # Server has no transaction

&Debug(6, "Server to idle");	&Debug(5, "Server to idle");

# If there's work to do, start the transaction:	# If there's work to do, start the transaction:

$reqdata = $WorkQueue->dequeue(); # This is a LondTransaction	my $reqdata = $WorkQueue->dequeue(); # This is a LondTransaction
unless($reqdata eq undef) {	if ($reqdata ne undef) {
Debug(9, "Queue gave request data: ".$reqdata->getRequest());	Debug(5, "Queue gave request data: ".$reqdata->getRequest());
&StartRequest($Socket, $reqdata);	&StartRequest($Socket, $reqdata);

} else {	} else {

# There's no work waiting, so push the server to idle list.	# There's no work waiting, so push the server to idle list.
&Debug(8, "No new work requests, server connection going idle");	&Debug(5, "No new work requests, server connection going idle");
$IdleConnections->push($Socket);	$IdleConnections->push($Socket);
}	}
}	}
Line 430 sub ClientWritable {	Line 434 sub ClientWritable {
# request.	# request.

&Debug(9,"Send result is ".$result." Defined: ".defined($result));	&Debug(9,"Send result is ".$result." Defined: ".defined($result));
if(defined($result)) {	if($result ne undef) {
&Debug(9, "send result was defined");	&Debug(9, "send result was defined");
if($result == length($Data)) { # Entire string sent.	if($result == length($Data)) { # Entire string sent.
&Debug(9, "ClientWritable data all written");	&Debug(9, "ClientWritable data all written");
Line 448 sub ClientWritable {	Line 452 sub ClientWritable {

} else { # Partial string sent.	} else { # Partial string sent.
$Watcher->data(substr($Data, $result));	$Watcher->data(substr($Data, $result));
	if($result == 0) { # client hung up on us!!
	Log("INFO", "lonc pipe client hung up on us!");
	$Watcher->cancel;
	$Socket->shutdown(2);
	$Socket->close();
	}
}	}

} else { # Error of some sort...	} else { # Error of some sort...
Line 495 The transaction that is being completed.	Line 505 The transaction that is being completed.
=cut	=cut

sub CompleteTransaction {	sub CompleteTransaction {
&Debug(6,"Complete transaction");	&Debug(5,"Complete transaction");
my $Socket = shift;	my $Socket = shift;
my $Transaction = shift;	my $Transaction = shift;

if (!$Transaction->isDeferred()) { # Normal transaction	if (!$Transaction->isDeferred()) { # Normal transaction
my $data = $Socket->GetReply(); # Data to send.	my $data = $Socket->GetReply(); # Data to send.
	if($LogTransactions) {
	Log("SUCCESS", "Reply from lond: '$data'");
	}
StartClientReply($Transaction, $data);	StartClientReply($Transaction, $data);
} else { # Delete deferred transaction file.	} else { # Delete deferred transaction file.
Log("SUCCESS", "A delayed transaction was completed");	Log("SUCCESS", "A delayed transaction was completed");
LogPerm("S:$Client:".$Transaction->getRequest());	LogPerm("S:$Transaction->getClient() :".$Transaction->getRequest());
unlink $Transaction->getFile();	unlink $Transaction->getFile();
}	}
}	}
Line 534 sub StartClientReply {	Line 547 sub StartClientReply {
&Debug(8," Reply was: ".$data);	&Debug(8," Reply was: ".$data);
my $Serial = $ActiveClients{$Client};	my $Serial = $ActiveClients{$Client};
my $desc = sprintf("Connection to lonc client %d",	my $desc = sprintf("Connection to lonc client %d",

$Serial);	$Serial);
Event->io(fd => $Client,	Event->io(fd => $Client,
poll => "w",	poll => "w",
Line 565 Parameters:	Line 577 Parameters:

sub FailTransaction {	sub FailTransaction {
my $transaction = shift;	my $transaction = shift;
	Log("WARNING", "Failing transaction ".$transaction->getRequest());
Debug(1, "Failing transaction: ".$transaction->getRequest());	Debug(1, "Failing transaction: ".$transaction->getRequest());
if (!$transaction->isDeferred()) { # If the transaction is deferred we'll get to it.	if (!$transaction->isDeferred()) { # If the transaction is deferred we'll get to it.
my $client = $transaction->getClient();	my $client = $transaction->getClient();
Debug(1," Replying con_lost to ".$transaction->getRequest());	Debug(1," Replying con_lost to ".$transaction->getRequest());
StartClientReply($transaction, "con_lost\n");	StartClientReply($transaction, "con_lost\n");
}	}
	if($ConnectionRetriesLeft <= 0) {
	Log("CRITICAL", "Host marked dead: ".GetServerHost());
	}

}	}

Line 582 sub FailTransaction {	Line 598 sub FailTransaction {

=cut	=cut
sub EmptyQueue {	sub EmptyQueue {
	$ConnectionRetriesLeft--; # Counts as connection failure too.
while($WorkQueue->Count()) {	while($WorkQueue->Count()) {
my $request = $WorkQueue->dequeue(); # This is a transaction	my $request = $WorkQueue->dequeue(); # This is a transaction
FailTransaction($request);	FailTransaction($request);
Line 596 Close all connections open on lond prior	Line 613 Close all connections open on lond prior

=cut	=cut
sub CloseAllLondConnections {	sub CloseAllLondConnections {
foreach $Socket (keys %ActiveConnections) {	foreach my $Socket (keys %ActiveConnections) {
KillSocket($Socket);	KillSocket($Socket);
}	}
}	}
Line 627 nonzero if we are allowed to create a ne	Line 644 nonzero if we are allowed to create a ne
sub KillSocket {	sub KillSocket {
my $Socket = shift;	my $Socket = shift;

	Log("WARNING", "Shutting down a socket");
$Socket->Shutdown();	$Socket->Shutdown();

# If the socket came from the active connection set,	# If the socket came from the active connection set,
Line 640 sub KillSocket {	Line 658 sub KillSocket {
}	}
if(exists($ActiveConnections{$Socket})) {	if(exists($ActiveConnections{$Socket})) {
delete($ActiveConnections{$Socket});	delete($ActiveConnections{$Socket});
	$ConnectionCount--;
	if ($ConnectionCount < 0) { $ConnectionCount = 0; }
}	}
$ConnectionCount--;

# If the connection count has gone to zero and there is work in the	# If the connection count has gone to zero and there is work in the
# work queue, the work all gets failed with con_lost.	# work queue, the work all gets failed with con_lost.
#	#
if($ConnectionCount == 0) {	if($ConnectionCount == 0) {
EmptyQueue;	EmptyQueue();
}	}
}	}

Line 673 The connection must echo the challenge b	Line 691 The connection must echo the challenge b
The challenge has been replied to. The we are receiveing the	The challenge has been replied to. The we are receiveing the
'ok' from the partner.	'ok' from the partner.

	=head3 State=ReadingVersionString

	We have requested the lond version and are reading the
	version back. Upon completion, we'll store the version away
	for future use(?).

	=head3 State=HostSet

	We have selected the domain name of our peer (multhomed hosts)
	and are getting the reply (presumably ok) back.

=head3 State=RequestingKey	=head3 State=RequestingKey

The ok has been received and we need to send the request for	The ok has been received and we need to send the request for
Line 716 sub LondReadable {	Line 745 sub LondReadable {
my $Socket = $Watcher->data;	my $Socket = $Watcher->data;
my $client = undef;	my $client = undef;

&Debug(6,"LondReadable called state = ".$State);	&Debug(6,"LondReadable called state = ".$Socket->GetState());


my $State = $Socket->GetState(); # All action depends on the state.	my $State = $Socket->GetState(); # All action depends on the state.

SocketDump(6, $Socket);	SocketDump(6, $Socket);
my $status = $Socket->Readable();	my $status = $Socket->Readable();

&Debug(2, "Socket->Readable returned: $status");	&Debug(2, "Socket->Readable returned: $status");

if($status != 0) {	if($status != 0) {
# bad return from socket read. Currently this means that	# bad return from socket read. Currently this means that
# The socket has become disconnected. We fail the transaction.	# The socket has become disconnected. We fail the transaction.

	Log("WARNING",
	"Lond connection lost.");
if(exists($ActiveTransactions{$Socket})) {	if(exists($ActiveTransactions{$Socket})) {
Debug(3,"Lond connection lost failing transaction");
FailTransaction($ActiveTransactions{$Socket});	FailTransaction($ActiveTransactions{$Socket});
}	}
$Watcher->cancel();	$Watcher->cancel();
KillSocket($Socket);	KillSocket($Socket);
	$ConnectionRetriesLeft--; # Counts as connection failure
return;	return;
}	}
SocketDump(6,$Socket);	SocketDump(6,$Socket);
Line 742 sub LondReadable {	Line 774 sub LondReadable {
$State = $Socket->GetState(); # Update in case of transition.	$State = $Socket->GetState(); # Update in case of transition.
&Debug(6, "After read, state is ".$State);	&Debug(6, "After read, state is ".$State);

if($State eq "Initialized") {	if($State eq "Initialized") {


} elsif ($State eq "ChallengeReceived") {	} elsif ($State eq "ChallengeReceived") {
# The challenge must be echoed back; The state machine	# The challenge must be echoed back; The state machine
# in the connection takes care of setting that up. Just	# in the connection takes care of setting that up. Just
# need to transition to writable:	# need to transition to writable:

$Watcher->cb(\&LondWritable);	$Watcher->cb(\&LondWritable);
$Watcher->poll("w");	$Watcher->poll("w");

} elsif ($State eq "ChallengeReplied") {	} elsif ($State eq "ChallengeReplied") {

	} elsif ($State eq "RequestingVersion") {
	# Need to ask for the version... that is writiability:

	$Watcher->cb(\&LondWritable);
	$Watcher->poll("w");

	} elsif ($State eq "ReadingVersionString") {
	# Read the rest of the version string...
	} elsif ($State eq "SetHost") {
	# Need to request the actual domain get set...

	$Watcher->cb(\&LondWritable);
	$Watcher->poll("w");
	} elsif ($State eq "HostSet") {
	# Reading the 'ok' from the peer.

} elsif ($State eq "RequestingKey") {	} elsif ($State eq "RequestingKey") {
# The ok was received. Now we need to request the key	# The ok was received. Now we need to request the key
Line 766 sub LondReadable {	Line 813 sub LondReadable {
} elsif ($State eq "ReceivingKey") {	} elsif ($State eq "ReceivingKey") {

} elsif ($State eq "Idle") {	} elsif ($State eq "Idle") {

	# This is as good a spot as any to get the peer version
	# string:

	if($LondVersion eq "unknown") {
	$LondVersion = $Socket->PeerVersion();
	Log("INFO", "Connected to lond version: $LondVersion");
	}
# If necessary, complete a transaction and then go into the	# If necessary, complete a transaction and then go into the
# idle queue.	# idle queue.
	# Note that a trasition to idle indicates a live lond
	# on the other end so reset the connection retries.
	#
	$ConnectionRetriesLeft = $ConnectionRetries; # success resets the count
$Watcher->cancel();	$Watcher->cancel();
if(exists($ActiveTransactions{$Socket})) {	if(exists($ActiveTransactions{$Socket})) {
Debug(8,"Completing transaction!!");	Debug(5,"Completing transaction!!");
CompleteTransaction($Socket,	CompleteTransaction($Socket,
$ActiveTransactions{$Socket});	$ActiveTransactions{$Socket});
} else {	} else {
Line 791 sub LondReadable {	Line 850 sub LondReadable {


} else {	} else {
# Invalid state.	# Invalid state.
Debug(4, "Invalid state in LondReadable");	Debug(4, "Invalid state in LondReadable");
}	}
}	}
Line 880 sub LondWritable {	Line 939 sub LondWritable {
# We'll treat this as if the socket got disconnected:	# We'll treat this as if the socket got disconnected:
Log("WARNING", "Connection to ".$RemoteHost.	Log("WARNING", "Connection to ".$RemoteHost.
" has been disconnected");	" has been disconnected");
	FailTransaction($ActiveTransactions{$Socket});
$Watcher->cancel();	$Watcher->cancel();
KillSocket($Socket);	KillSocket($Socket);
return;	return;
}	}

# "init" is being sent...	# "init" is being sent...


} elsif ($State eq "Initialized") {	} elsif ($State eq "Initialized") {

# Now that init was sent, we switch	# Now that init was sent, we switch
Line 894 sub LondWritable {	Line 954 sub LondWritable {

$Watcher->cb(\&LondReadable);	$Watcher->cb(\&LondReadable);
$Watcher->poll("r");	$Watcher->poll("r");

} elsif ($State eq "ChallengeReceived") {	} elsif ($State eq "ChallengeReceived") {
# We received the challenge, now we	# We received the challenge, now we
# are echoing it back. This is a no-op,	# are echoing it back. This is a no-op,
Line 913 sub LondWritable {	Line 973 sub LondWritable {

$Watcher->cb(\&LondReadable);	$Watcher->cb(\&LondReadable);
$Watcher->poll("r");	$Watcher->poll("r");
	} elsif ($State eq "RequestingVersion") {
	# Sending the peer a version request...

	if($Socket->Writable() != 0) {
	$Watcher->cancel();
	KillSocket($Socket);
	return;
	}
	} elsif ($State eq "ReadingVersionString") {
	# Transition to read since we have sent the
	# version command and now just need to read the
	# version string from the peer:

	$Watcher->cb(\&LondReadable);
	$Watcher->poll("r");

	} elsif ($State eq "SetHost") {
	# Setting the remote domain...

	if($Socket->Writable() != 0) {
	$Watcher->cancel();
	KillSocket($Socket);
	return;
	}
	} elsif ($State eq "HostSet") {
	# Back to readable to get the ok.

	$Watcher->cb(\&LondReadable);
	$Watcher->poll("r");


} elsif ($State eq "RequestingKey") {	} elsif ($State eq "RequestingKey") {
# At this time we're requesting the key.	# At this time we're requesting the key.
Line 936 sub LondWritable {	Line 1026 sub LondWritable {
$Watcher->poll("r");	$Watcher->poll("r");

} elsif ($State eq "SendingRequest") {	} elsif ($State eq "SendingRequest") {

# At this time we are sending a request to the	# At this time we are sending a request to the
# peer... write the next chunk:	# peer... write the next chunk:

Line 979 sub QueueDelayed {	Line 1070 sub QueueDelayed {
Debug(4, "Delayed path: ".$path);	Debug(4, "Delayed path: ".$path);
opendir(DIRHANDLE, $path);	opendir(DIRHANDLE, $path);

@alldelayed = grep /\.$RemoteHost$/, readdir DIRHANDLE;	my @alldelayed = grep /\.$RemoteHost$/, readdir DIRHANDLE;
Debug(4, "Got ".$alldelayed." delayed files");
closedir(DIRHANDLE);	closedir(DIRHANDLE);
my $dfname;	my $dfname;
my $reqfile;	my $reqfile;
Line 1017 sub MakeLondConnection {	Line 1107 sub MakeLondConnection {
my $Connection = LondConnection->new(&GetServerHost(),	my $Connection = LondConnection->new(&GetServerHost(),
&GetServerPort());	&GetServerPort());

if($Connection == undef) { # Needs to be more robust later.	if($Connection eq undef) { # Needs to be more robust later.
Log("CRITICAL","Failed to make a connection with lond.");	Log("CRITICAL","Failed to make a connection with lond.");
$ConnectionRetriesLeft--;	$ConnectionRetriesLeft--;
return 0; # Failure.	return 0; # Failure.
} else {	} else {
$ConnectionRetriesLeft = $ConnectionRetries; # success resets the count
# The connection needs to have writability	# The connection needs to have writability
# monitored in order to send the init sequence	# monitored in order to send the init sequence
# that starts the whole authentication/key	# that starts the whole authentication/key
# exchange underway.	# exchange underway.
#	#
my $Socket = $Connection->GetSocket();	my $Socket = $Connection->GetSocket();
if($Socket == undef) {	if($Socket eq undef) {
die "did not get a socket from the connection";	die "did not get a socket from the connection";
} else {	} else {
&Debug(9,"MakeLondConnection got socket: ".$Socket);	&Debug(9,"MakeLondConnection got socket: ".$Socket);
}	}

	$Connection->SetTimeoutCallback(\&SocketTimeout);
$event = Event->io(fd => $Socket,
	my $event = Event->io(fd => $Socket,
poll => 'w',	poll => 'w',
cb => \&LondWritable,	cb => \&LondWritable,
data => $Connection,	data => $Connection,
Line 1092 sub StartRequest {	Line 1183 sub StartRequest {
$ActiveTransactions{$Lond} = $Request;	$ActiveTransactions{$Lond} = $Request;

$Lond->InitiateTransaction($Request->getRequest());	$Lond->InitiateTransaction($Request->getRequest());
$event = Event->io(fd => $Socket,	my $event = Event->io(fd => $Socket,
poll => "w",	poll => "w",
cb => \&LondWritable,	cb => \&LondWritable,
data => $Lond,	data => $Lond,
Line 1131 sub QueueTransaction {	Line 1222 sub QueueTransaction {

my $LondSocket = $IdleConnections->pop();	my $LondSocket = $IdleConnections->pop();
if(!defined $LondSocket) { # Need to queue request.	if(!defined $LondSocket) { # Need to queue request.
Debug(8,"Must queue...");	Debug(5,"Must queue...");
$WorkQueue->enqueue($requestData);	$WorkQueue->enqueue($requestData);
if($ConnectionCount < $MaxConnectionCount) {	if($ConnectionCount < $MaxConnectionCount) {
Debug(4,"Starting additional lond connection");	if($ConnectionRetriesLeft > 0) {
MakeLondConnection();	Debug(5,"Starting additional lond connection");
	if(MakeLondConnection() == 0) {
	EmptyQueue(); # Fail transactions, can't make connection.
	}
	} else {
	ShowStatus(GetServerHost()." >>> DEAD !!!! <<<");
	EmptyQueue(); # It's worse than that ... he's dead Jim.
	}
}	}
} else { # Can start the request:	} else { # Can start the request:
Debug(8,"Can start...");	Debug(8,"Can start...");
Line 1166 sub ClientRequest {	Line 1264 sub ClientRequest {
my $rv = $socket->recv($thisread, POSIX::BUFSIZ, 0);	my $rv = $socket->recv($thisread, POSIX::BUFSIZ, 0);
Debug(8, "rcv: data length = ".length($thisread)	Debug(8, "rcv: data length = ".length($thisread)
." read =".$thisread);	." read =".$thisread);
unless (defined $rv && length($thisread)) {	unless (defined $rv && length($thisread)) {
# Likely eof on socket.	# Likely eof on socket.
Debug(5,"Client Socket closed on lonc for ".$RemoteHost);	Debug(5,"Client Socket closed on lonc for ".$RemoteHost);
close($socket);	close($socket);
Line 1185 sub ClientRequest {	Line 1283 sub ClientRequest {
exit;	exit;
}	}
Debug(8, "Complete transaction received: ".$data);	Debug(8, "Complete transaction received: ".$data);
	if($LogTransactions) {
	Log("SUCCESS", "Transaction: '$data'"); # Transaction has \n.
	}
my $Transaction = LondTransaction->new($data);	my $Transaction = LondTransaction->new($data);
$Transaction->SetClient($socket);	$Transaction->SetClient($socket);
QueueTransaction($Transaction);	QueueTransaction($Transaction);
Line 1293 sub SetupLoncListener {	Line 1394 sub SetupLoncListener {
fd => $socket);	fd => $socket);
}	}

	#
	# Toggle transaction logging.
	# Implicit inputs:
	# LogTransactions
	# Implicit Outputs:
	# LogTransactions
	sub ToggleTransactionLogging {
	print STDERR "Toggle transaction logging...\n";
	if(!$LogTransactions) {
	$LogTransactions = 1;
	} else {
	$LogTransactions = 0;
	}


	Log("SUCCESS", "Toggled transaction logging: $LogTransactions \n");
	}

=pod	=pod

=head2 ChildStatus	=head2 ChildStatus
Line 1300 sub SetupLoncListener {	Line 1419 sub SetupLoncListener {
Child USR1 signal handler to report the most recent status	Child USR1 signal handler to report the most recent status
into the status file.	into the status file.

	We also use this to reset the retries count in order to allow the
	client to retry connections with a previously dead server.
=cut	=cut
sub ChildStatus {	sub ChildStatus {
my $event = shift;	my $event = shift;
Line 1310 sub ChildStatus {	Line 1431 sub ChildStatus {
my $fh = IO::File->new(">>$docdir/lon-status/loncstatus.txt");	my $fh = IO::File->new(">>$docdir/lon-status/loncstatus.txt");
print $fh $$."\t".$RemoteHost."\t".$Status."\t".	print $fh $$."\t".$RemoteHost."\t".$Status."\t".
$RecentLogEntry."\n";	$RecentLogEntry."\n";
	#
	# Write out information about each of the connections:
	#
	print $fh "Active connection statuses: \n";
	my $i = 1;
	print STDERR "================================= Socket Status Dump:\n";
	foreach my $item (keys %ActiveConnections) {
	my $Socket = $ActiveConnections{$item}->data;
	my $state = $Socket->GetState();
	print $fh "Connection $i State: $state\n";
	print STDERR "---------------------- Connection $i \n";
	$Socket->Dump();
	$i++;
	}
	$ConnectionRetriesLeft = $ConnectionRetries;
}	}

=pod	=pod
Line 1326 sub SignalledToDeath {	Line 1462 sub SignalledToDeath {
my $watcher= $event->w;	my $watcher= $event->w;

Debug(2,"Signalled to death! via ".$watcher->data);	Debug(2,"Signalled to death! via ".$watcher->data);
my ($signal) = @_;	my ($signal) = $watcher->data;
chomp($signal);	chomp($signal);
Log("CRITICAL", "Abnormal exit. Child $$ for $RemoteHost "	Log("CRITICAL", "Abnormal exit. Child $$ for $RemoteHost "
."died through "."\"$signal\"");	."died through "."\"$signal\"");
LogPerm("F:lonc: $$ on $RemoteHost signalled to death: "	LogPerm("F:lonc: $$ on $RemoteHost signalled to death: "
."\"$signal\"");	."\"$signal\"");
die("Signal abnormal end");
exit 0;	exit 0;

}	}

	=head2 ToggleDebug

	This sub toggles trace debugging on and off.

	=cut

	sub ToggleDebug {
	my $Current = $DebugLevel;
	$DebugLevel = $NextDebugLevel;
	$NextDebugLevel = $Current;

	Log("SUCCESS", "New debugging level for $RemoteHost now $DebugLevel");

	}

=head2 ChildProcess	=head2 ChildProcess

This sub implements a child process for a single lonc daemon.	This sub implements a child process for a single lonc daemon.
Line 1348 sub ChildProcess {	Line 1499 sub ChildProcess {
#	#
# Signals must be handled by the Event framework...	# Signals must be handled by the Event framework...
#	#
# $SIG{QUIT} = \&SignalledToDeath;
# $SIG{HUP} = \&ChildStatus;
# $SIG{USR1} = IGNORE;
# $SIG{INT} = DEFAULT;
# $SIG{CHLD} = IGNORE;
# $SIG{__DIE__} = \&SignalledToDeath;

Event->signal(signal => "QUIT",	Event->signal(signal => "QUIT",
cb => \&SignalledToDeath,	cb => \&SignalledToDeath,
Line 1364 sub ChildProcess {	Line 1509 sub ChildProcess {
Event->signal(signal => "USR1",	Event->signal(signal => "USR1",
cb => \&ChildStatus,	cb => \&ChildStatus,
data => "USR1");	data => "USR1");
	Event->signal(signal => "USR2",
	cb => \&ToggleTransactionLogging);
	Event->signal(signal => "INT",
	cb => \&ToggleDebug,
	data => "INT");

SetupTimer();	SetupTimer();

Line 1393 sub CreateChild {	Line 1543 sub CreateChild {
my $host = shift;	my $host = shift;
$RemoteHost = $host;	$RemoteHost = $host;
Log("CRITICAL", "Forking server for ".$host);	Log("CRITICAL", "Forking server for ".$host);
$pid = fork;	my $pid = fork;
if($pid) { # Parent	if($pid) { # Parent
$ChildHash{$pid} = $RemoteHost;	$RemoteHost = "Parent";
	$ChildHash{$pid} = $host;
	$HostToPid{$host}= $pid;
sigprocmask(SIG_UNBLOCK, $sigset);	sigprocmask(SIG_UNBLOCK, $sigset);

} else { # child.	} else { # child.
ShowStatus("Connected to ".$RemoteHost);	ShowStatus("Connected to ".$RemoteHost);
$SIG{INT} = DEFAULT;	$SIG{INT} = 'DEFAULT';
sigprocmask(SIG_UNBLOCK, $sigset);	sigprocmask(SIG_UNBLOCK, $sigset);
ChildProcess; # Does not return.	ChildProcess; # Does not return.
}	}
Line 1437 if ($childpid != 0) {	Line 1589 if ($childpid != 0) {
#	#

ShowStatus("Parent writing pid file:");	ShowStatus("Parent writing pid file:");
$execdir = $perlvar{'lonDaemons'};	my $execdir = $perlvar{'lonDaemons'};
open (PIDSAVE, ">$execdir/logs/lonc.pid");	open (PIDSAVE, ">$execdir/logs/lonc.pid");
print PIDSAVE "$$\n";	print PIDSAVE "$$\n";
close(PIDSAVE);	close(PIDSAVE);



if (POSIX::setsid() < 0) {	if (POSIX::setsid() < 0) {
print "Could not create new session\n";	print "Could not create new session\n";
exit -1;	exit -1;
Line 1451 ShowStatus("Forking node servers");	Line 1605 ShowStatus("Forking node servers");

Log("CRITICAL", "--------------- Starting children ---------------");	Log("CRITICAL", "--------------- Starting children ---------------");

	LondConnection::ReadConfig; # Read standard config files.
my $HostIterator = LondConnection::GetHostIterator;	my $HostIterator = LondConnection::GetHostIterator;
while (! $HostIterator->end()) {	while (! $HostIterator->end()) {

$hostentryref = $HostIterator->get();	my $hostentryref = $HostIterator->get();
CreateChild($hostentryref->[0]);	CreateChild($hostentryref->[0]);
	$HostHash{$hostentryref->[0]} = $hostentryref->[4];
$HostIterator->next();	$HostIterator->next();
}	}
$RemoteHost = "Parent Server";	$RemoteHost = "Parent Server";
Line 1472 $SIG{INT} = \&Terminate;	Line 1628 $SIG{INT} = \&Terminate;
$SIG{TERM} = \&Terminate;	$SIG{TERM} = \&Terminate;
$SIG{HUP} = \&Restart;	$SIG{HUP} = \&Restart;
$SIG{USR1} = \&CheckKids;	$SIG{USR1} = \&CheckKids;
	$SIG{USR2} = \&UpdateKids; # LonManage update request.

while(1) {	while(1) {
$deadchild = wait();	my $deadchild = wait();
if(exists $ChildHash{$deadchild}) { # need to restart.	if(exists $ChildHash{$deadchild}) { # need to restart.
$deadhost = $ChildHash{$deadchild};	my $deadhost = $ChildHash{$deadchild};
	delete($HostToPid{$deadhost});
delete($ChildHash{$deadchild});	delete($ChildHash{$deadchild});
Log("WARNING","Lost child pid= ".$deadchild.	Log("WARNING","Lost child pid= ".$deadchild.
"Connected to host ".$deadhost);	"Connected to host ".$deadhost);
Line 1506 sub CheckKids {	Line 1664 sub CheckKids {
my $now=time;	my $now=time;
my $local=localtime($now);	my $local=localtime($now);
print $fh "LONC status $local - parent $$ \n\n";	print $fh "LONC status $local - parent $$ \n\n";
foreach $pid (keys %ChildHash) {	foreach my $pid (keys %ChildHash) {
Debug(2, "Sending USR1 -> $pid");	Debug(2, "Sending USR1 -> $pid");
kill 'USR1' => $pid; # Tell Child to report status.	kill 'USR1' => $pid; # Tell Child to report status.
sleep 1; # Wait so file doesn't intermix.	sleep 1; # Wait so file doesn't intermix.
Line 1515 sub CheckKids {	Line 1673 sub CheckKids {

=pod	=pod

	=head1 UpdateKids

	parent's SIGUSR2 handler. This handler:

	=item

	Rereads the hosts file.

	=item

	Kills off (via sigint) children for hosts that have disappeared.

	=item

	QUITs children for hosts that already exist (this just forces a status display
	and resets the connection retry count for that host.

	=item

	Starts new children for hosts that have been added to the hosts.tab file since
	the start of the master program and maintains them.

	=cut

	sub UpdateKids {

	Log("INFO", "Updating connections via SIGUSR2");

	# Just in case we need to kill our own lonc, we wait a few seconds to
	# give it a chance to receive and relay lond's response to the
	# re-init command.
	#

	sleep(2); # Wait a couple of seconds.

	my %hosts; # Indexed by loncapa hostname, value=ip.

	# Need to re-read the host table:


	LondConnection::ReadConfig();
	my $I = LondConnection::GetHostIterator;
	while (! $I->end()) {
	my $item = $I->get();
	$hosts{$item->[0]} = $item->[4];
	$I->next();
	}

	# The logic below is written for clarity not for efficiency.
	# Since I anticipate that this function is only rarely called, that's
	# appropriate. There are certainly ways to combine the loops below,
	# and anyone wishing to obscure the logic is welcome to go for it.
	# Note that we don't re-direct sigchild. Instead we do what's needed
	# to the data structures that keep track of children to ensure that
	# when sigchild is honored, no new child is born.
	#

	# For each existing child; if it's host doesn't exist, kill the child.

	foreach my $child (keys %ChildHash) {
	my $oldhost = $ChildHash{$child};
	if (!(exists $hosts{$oldhost})) {
	Log("CRITICAL", "Killing child for $oldhost host no longer exists");
	delete $ChildHash{$child};
	delete $HostToPid{$oldhost};
	kill 'QUIT' => $child;
	}
	}
	# For each remaining existing child; if it's host's ip has changed,
	# Restart the child on the new IP.

	foreach my $child (keys %ChildHash) {
	my $oldhost = $ChildHash{$child};
	my $oldip = $HostHash{$oldhost};
	if ($hosts{$oldhost} ne $oldip) {

	# kill the old child.

	Log("CRITICAL", "Killing child for $oldhost host ip has changed...");
	delete $ChildHash{$child};
	delete $HostToPid{$oldhost};
	kill 'QUIT' => $child;

	# Do the book-keeping needed to start a new child on the
	# new ip.

	$HostHash{$oldhost} = $hosts{$oldhost};
	CreateChild($oldhost);
	}
	}
	# Finally, for each new host, not in the host hash, create a
	# enter the host and create a new child.
	# Force a status display of any existing process.

	foreach my $host (keys %hosts) {
	if(!(exists $HostHash{$host})) {
	Log("INFO", "New host $host discovered in hosts.tab...");
	$HostHash{$host} = $hosts{$host};
	CreateChild($host);
	} else {
	kill 'HUP' => $HostToPid{$host}; # status display.
	}
	}
	}


	=pod

=head1 Restart	=head1 Restart

Signal handler for HUP... all children are killed and	Signal handler for HUP... all children are killed and
Line 1524 the config file.	Line 1790 the config file.
=cut	=cut

sub Restart {	sub Restart {
KillThemAll; # First kill all the children.	&KillThemAll; # First kill all the children.
Log("CRITICAL", "Restarting");	Log("CRITICAL", "Restarting");
my $execdir = $perlvar{'lonDaemons'};	my $execdir = $perlvar{'lonDaemons'};
unlink("$execdir/logs/lonc.pid");	unlink("$execdir/logs/lonc.pid");
exec("$execdir/lonc");	exec("$execdir/loncnew");
}	}

=pod	=pod
Line 1536 sub Restart {	Line 1802 sub Restart {
=head1 KillThemAll	=head1 KillThemAll

Signal handler that kills all children by sending them a	Signal handler that kills all children by sending them a
SIGINT. Responds to sigint and sigterm.	SIGHUP. Responds to sigint and sigterm.

=cut	=cut

sub KillThemAll {	sub KillThemAll {
Debug(2, "Kill them all!!");	Debug(2, "Kill them all!!");
local($SIG{CHLD}) = 'IGNORE'; # Our children >will< die.	local($SIG{CHLD}) = 'IGNORE'; # Our children >will< die.
foreach $pid (keys %ChildHash) {	foreach my $pid (keys %ChildHash) {
my $serving = $ChildHash{$pid};	my $serving = $ChildHash{$pid};
Debug(2, "Killing lonc for $serving pid = $pid");	Debug(2, "Killing lonc for $serving pid = $pid");
ShowStatus("Killing lonc for $serving pid = $pid");	ShowStatus("Killing lonc for $serving pid = $pid");
Log("CRITICAL", "Killing lonc for $serving pid = $pid");	Log("CRITICAL", "Killing lonc for $serving pid = $pid");
kill('INT', $pid);	kill 'QUIT' => $pid;
delete($ChildeHash{$pid});	delete($ChildHash{$pid});
}	}
my $execdir = $perlvar{'lonDaemons'};	my $execdir = $perlvar{'lonDaemons'};
unlink("$execdir/logs/lonc.pid");	unlink("$execdir/logs/lonc.pid");
ShowStatus("Killing the master process");
Log("CRITICAL", "Killing the master process.");
}	}

=pod	=pod
Line 1567 Terminate the system.	Line 1832 Terminate the system.

sub Terminate {	sub Terminate {
KillThemAll;	KillThemAll;
exit;	Log("CRITICAL","Master process exiting");
	exit 0;

}	}
=pod	=pod

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.14
changed lines
	Added in v.1.41