From d1611d97fa6fdd8e8a079eb08840db758174928a Mon Sep 17 00:00:00 2001
From: "Leigh B. Stoller" <stoller@flux.utah.edu>
Date: Tue, 2 Jul 2002 16:16:44 +0000
Subject: [PATCH] Check for error when doing a forced (from boss) update. If it
does fail (usually cause of network dropout), continue to try every minute
until it suceeds.
---
tmcd/ron/update | 4 ++--
tmcd/ron/upemuman.sh | 4 ++--
tmcd/ron/watchdog | 5 ++++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/tmcd/ron/update b/tmcd/ron/update
index d85dd06fee..2a5f0ce4e6 100755
--- a/tmcd/ron/update
+++ b/tmcd/ron/update
@@ -128,7 +128,7 @@ while (flock(LOCK, LOCK_EX|LOCK_NB) == 0) {
sleep(5);
}
-remotenodeupdate();
+my $failed = remotenodeupdate();
close(LOCK);
-exit(0);
+exit($failed);
diff --git a/tmcd/ron/upemuman.sh b/tmcd/ron/upemuman.sh
index f76edd29c7..85728cb42d 100755
--- a/tmcd/ron/upemuman.sh
+++ b/tmcd/ron/upemuman.sh
@@ -6,8 +6,8 @@ chown root update vnodesetup
chmod u+s update vnodesetup
chown root /usr/bin/suidperl
chmod u+s /usr/bin/suidperl
-chown emulabman client.pem emulab.pem
-chmod 640 client.pem emulab.pem
+chown emulabman client.pem emulab.pem ronnode.pem
+chmod 640 client.pem emulab.pem ronnode.pem
/usr/bin/install -c -o root -g wheel -d -m 755 -o root -g 0 /var/testbed
cp rc.testbed /usr/local/etc/rc.d/testbed.sh
diff --git a/tmcd/ron/watchdog b/tmcd/ron/watchdog
index ecdc40e3a0..8bf3020a14 100755
--- a/tmcd/ron/watchdog
+++ b/tmcd/ron/watchdog
@@ -123,6 +123,8 @@ system("tmcc state ISUP");
#
my $mypid = fork();
if (! $mypid) {
+ my $failed = 0;
+
print "Keep alive starting up ... \n";
while (1) {
@@ -144,9 +146,10 @@ if (! $mypid) {
chomp $result;
my (undef,$update) = split("=", $result);
- if ($update) {
+ if ($update || $failed) {
print "Running an update at $date ...\n";
system("update -i");
+ $failed = $?;
}
last;
}
--
GitLab