Commit 2f5f6da6 authored by Timothy Stack's avatar Timothy Stack
Browse files

Only send separate nfs mail if its the main installation, put it in

the swap log otherwise.
parent 54230b6f
...@@ -34,6 +34,7 @@ sub usage() ...@@ -34,6 +34,7 @@ sub usage()
my $TBROOT = "@prefix@"; my $TBROOT = "@prefix@";
my $TBOPS = "@TBOPSEMAIL@"; my $TBOPS = "@TBOPSEMAIL@";
my $TBLOGS = "@TBLOGSEMAIL@"; my $TBLOGS = "@TBLOGSEMAIL@";
my $THISHOMEBASE = "@THISHOMEBASE@";
my $TESTMODE = @TESTMODE@; my $TESTMODE = @TESTMODE@;
my $DISABLE_EVENTS = "@DISABLE_EVENT_SCHED@"; my $DISABLE_EVENTS = "@DISABLE_EVENT_SCHED@";
my $piper = "$TBROOT/sbin/locpiper"; my $piper = "$TBROOT/sbin/locpiper";
...@@ -397,6 +398,7 @@ sub doSwapout($) { ...@@ -397,6 +398,7 @@ sub doSwapout($) {
print "Getting files accessed via NFS.\n"; print "Getting files accessed via NFS.\n";
TBDebugTimeStamp("nfstrace started"); TBDebugTimeStamp("nfstrace started");
if (lc $THISHOMEBASE eq "emulab.net") {
my ($dbuid, $uname, $umail); my ($dbuid, $uname, $umail);
if (UNIX2DBUID($UID, \$dbuid) && if (UNIX2DBUID($UID, \$dbuid) &&
UserDBInfo($dbuid, \$uname, \$umail)) { UserDBInfo($dbuid, \$uname, \$umail)) {
...@@ -405,6 +407,10 @@ sub doSwapout($) { ...@@ -405,6 +407,10 @@ sub doSwapout($) {
`nfstrace get $pid $eid`, `nfstrace get $pid $eid`,
"$uname <$umail>"); "$uname <$umail>");
} }
}
else {
system("nfstrace get $pid $eid");
}
TBDebugTimeStamp("nfstrace finished"); TBDebugTimeStamp("nfstrace finished");
if (! $TESTMODE) { if (! $TESTMODE) {
......
Supports Markdown
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