Skip to content

emulab-devel
emulab-devel
Commit f6e7a762 authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files
Options

Some general cleanup of jail startup scripts. 

Remove jaildog, and use the common watchdog instead.
parent de7ba859
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 257 deletions
tmcd/freebsd/jail/jailctl deleted 100755 → 0
View file @ de7ba859
#!/bin/sh
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
# All rights reserved.
#
. /etc/emulab/paths.sh
#
# Jail startup. To be run inside of a jail!
#
case "$1" in
start)
$BINDIR/jaildog.pl > /dev/null 2>&1
echo -n ' Emulab'
;;
stop)
#
# Don't bother. Inside of a jail everything gets killed at once.
#
echo -n ' Emulab'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
;;
esac
exit 0
tmcd/freebsd/jail/jaildog.pl deleted 100755 → 0
View file @ de7ba859
#!/usr/bin/perl -wT
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved.
#
use Getopt::Std;
use English;
use Errno;
use POSIX qw(strftime);
#
# Watchdog for inside a jail. All this does is look for account updates.
# Might do more later.
#
sub usage()
{
print "Usage: jaildog [-t timeout]\n";
exit(1);
}
my $optlist = "t:";
#
# Turn off line buffering on output
#
$| = 1;
# Drag in path stuff so we can find emulab stuff.
BEGIN { require "/etc/emulab/paths.pm"; import emulabpaths; }
#
# Must be root to run this.
#
if ($UID != 0) {
die("*** $0:\n".
" Must be root to run this script!\n");
}
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use libsetup;
# Locals
my $timeout = (60 * 60 * 12); # In seconds of course.
my $logname = "$LOGDIR/emulab-jaildog.debug";
my $pidfile = "/var/run/emulab-jaildog.pid";
my $vnodeid;
#
# Parse command arguments. Once we return from getopts, all that should be
# left are the required arguments.
#
%options = ();
if (! getopts($optlist, \%options)) {
usage();
}
if (defined($options{"t"})) {
$timeout = $options{"t"};
}
if (@ARGV) {
usage();
}
#
# Put this into the background and log its output. We *must* do this cause
# we do not want to halt the boot if the testbed is down!
#
if (1 && TBBackGround($logname)) {
#
# Parent exits normally
#
exit(0);
}
#
# Setup a handler to catch TERM, and kill our process group.
#
my $pgrp = getpgrp(0);
sub handler () {
$SIG{TERM} = 'IGNORE';
$SIG{INT} = 'IGNORE';
kill('TERM', -$pgrp);
sleep(5);
exit(0);
}
$SIG{TERM} = \&handler;
$SIG{INT} = \&handler;
#
# Write our pid into the pid file so we can be killed later (when the
# experiment is torn down). We must do this first so that we can be
# killed before we change the sig handlers
#
open(PFILE, "> $pidfile")
or die("Could not open $pidfile: $!");
print PFILE "$PID\n";
close(PFILE);
print "Getting our Emulab configuration ...\n";
if (! ($vnodeid = jailedsetup())) {
die("*** $0:\n".
" Did not get our jailname!\n");
}
if (-x TMIFC) {
print "Setting up Interfaces ...\n";
system(TMIFC());
if ($? < 0) {
die("*** $0:\n".
" Failed to set up interfaces!\n");
}
}
if (-x TMTARBALLS()) {
print "Installing Tarballs ...\n";
system(TMTARBALLS());
if ($? < 0) {
die("*** $0:\n".
" Failed to install tarballs!\n");
}
}
if (-x TMSTARTUPCMD()) {
print "Running startup command ...\n";
system("runstartup");
# Command does not actually run till a little later ...
if ($?) {
die("*** $0:\n".
" Failed to setup startup command!\n");
}
}
if (-x TMTRAFFICCONFIG()) {
print "Starting Traffic Generators ...\n";
# Exits immediately.
system(TMTRAFFICCONFIG());
if ($?) {
die("*** $0:\n".
" Failed to setup traffic generators!\n");
}
sleep(1);
}
#
# Start isalive daemon.
#
startisalive();
#
# Inform TMCD that we are up and running.
#
print "Informing Emulab Operations that we're up and running ...\n";
system("tmcc state ISUP");
#
# Loop!
#
while (1) {
sleep($timeout);
my $date = POSIX::strftime("20%y/%m/%d %H:%M:%S", localtime());
print "Dogging it at $date\n";
#
# Run account update. Use immediate mode so that it exits right away
# if the lock is taken (another update already running).
#
print "Looking for new Emulab accounts ...\n";
system("update -i");
}
exit(0);
#
# Fire off a child that does nothing but tell the boss we are alive.
#
sub startisalive()
{
if (fork()) {
return;
}
my $failed = 0;
print "Keep alive starting up ... \n";
while (1) {
#
# Run tmcc in UDP mode.
# Since its UDP, we try it a couple of times if it fails.
#
my $retries = 3;
while ($retries) {
# my $options = "-p 7778 REDIRECT=192.168.100.1";
my $options = "";
if (REMOTE()) {
$options .= " -u -t 3";
}
if (defined($vnodeid)) {
$options .= " -n $vnodeid";
}
my $result = `tmcc $options isalive`;
if (! $?) {
my $date = POSIX::strftime("20%y/%m/%d %H:%M:%S", localtime());
chomp $result;
my (undef,$update) = split("=", $result);
if ($update || $failed) {
print "Running an update at $date ...\n";
system("update -i");
$failed = $?;
}
last;
}
$retries--;
}
if (!$retries) {
print "keep alive returned $?\n";
}
sleep(60);
}
exit(0);
}
tmcd/freebsd/jail/jailsetup 0 → 100755
View file @ f6e7a762
#!/usr/bin/perl -wT
#
# EMULAB-COPYRIGHT
# Copyright (c) 2003 University of Utah and the Flux Group.
# All rights reserved.
#
use English;
# Drag in path stuff so we can find emulab stuff.
BEGIN { require "/etc/emulab/paths.pm"; import emulabpaths; }
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use libsetup;
#
# Then invoke the bootsetup routine in the library. All the work happens
# in there.
#
jailsetup();
exit 0;
tmcd/freebsd/jail/rc.injail 0 → 100755
View file @ f6e7a762
#!/bin/sh
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved.
#
. /etc/emulab/paths.sh
echo "Doing Testbed jailsetup configuration ..."
$BINDIR/jailsetup
if [ -x $BOOTDIR/rc.rpm ]; then
echo "Installing RPMs ..."
$BOOTDIR/rc.rpm
fi
if [ -x $BOOTDIR/rc.tarballs ]; then
echo "Installing Tarballs ..."
$BOOTDIR/rc.tarballs
fi
if [ -s $BOOTDIR/startupcmd ]; then
echo "Scheduling startup command to run in a little bit ..."
$BINDIR/runstartup
fi
if [ -x $BINDIR/rc.agents ]; then
$BINDIR/rc.agents
fi
if [ -x $BOOTDIR/rc.traffic ]; then
echo "Starting traffic generators ..."
$BOOTDIR/rc.traffic
fi
if [ -x $BINDIR/watchdog ]; then
echo "Starting update watchdog ..."
$BINDIR/watchdog start
fi
echo "Informing the testbed that we're up and running ..."
$BINDIR/tmcc state ISUP
tmcd/freebsd/jail/rc.local
View file @ f6e7a762
......@@ -4,8 +4,8 @@
#
. /etc/emulab/paths.sh
if [ -x $BINDIR/jailctl -a ! -e $ETCDIR/nojail ]; then
$BINDIR/jailctl start
if [ -x $BINDIR/rc.injail -a ! -e $ETCDIR/nojail ]; then
$BINDIR/rc.injail
fi
exit 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment