Commit 4da7feb1 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Rip out linktest; moving to tbswap ...

parent b2c92d3e
......@@ -617,45 +617,6 @@ TBSaveExpLogFiles($pid, $eid);
#
system("cp -Rfp $workdir/ $userdir/tbdata");
#
# Deal with linktest. If requested, swapping in or modifying, and experiment
# is indeed active, then run it!
#
# XXX - linktest uses files from $userdir/tbdata/, so the above cp must
# happen first!
#
if ($linktest && ExpState($pid, $eid) eq EXPTSTATE_ACTIVE) {
#
# Run it. No worries about failures.
#
my $output = "$userdir/logs/linktest.log";
my $optarg = "-o $output";
if ($linktest =~ /^(\d)$/) {
$optarg .= " -l $1";
}
else {
$optarg .= " -l 1";
}
print "Running 'linktest_control $optarg $pid $eid'\n";
if (system("$TB/sbin/linktest_control $optarg $pid $eid") != 0) {
system("cat $output")
if (-r $output);
print STDERR "*** WARNING: ".
"Linktest run returned non-zero status!\n";
SENDMAIL("$user_name <$user_email>",
"Linktest Failure: $pid/$eid",
"Failure in linktest (level $linktest); ".
"returned non-zero status",
"$user_name <$user_email>",
"Cc: $TBOPS",
($output));
}
}
#
# Gather statistics.
#
......
......@@ -342,7 +342,6 @@ my $expt_path = $hashrow{'path'};
my $expt_locked = $hashrow{'expt_locked'};
my $isbatchexpt = $hashrow{'batchmode'};
my $canceled = $hashrow{'canceled'};
my $linktest_level = $hashrow{'linktest_level'};
my $swappablebit= $hashrow{'swappable'};
my $idleswapbit = $hashrow{'idleswap'};
my $autoswapbit = $hashrow{'autoswap'};
......@@ -1007,39 +1006,6 @@ TBSaveExpLogFiles($pid, $eid);
#
system("cp -Rfp $workdir/ $userdir/tbdata/");
#
# Deal with linktest. If requested, swapping in or modifying, and experiment
# is indeed active, then run it!
#
# XXX - linktest uses files from $userdir/tbdata/, so the above cp must
# happen first!
#
if ($linktest_level && ExpState($pid, $eid) eq EXPTSTATE_ACTIVE) {
#
# Run it. No worries about failures.
#
my $output = "$userdir/logs/linktest.log";
my $optarg = "-l $linktest_level -o $output";
print STDOUT "Running 'linktest_control $optarg $pid $eid'\n";
if (system("$TB/sbin/linktest_control $optarg $pid $eid") != 0) {
system("cat $output")
if (-r $output);
print STDERR "*** WARNING: ".
"Linktest run returned non-zero status!\n";
SENDMAIL("$user_name <$user_email>",
"Linktest Failure: $pid/$eid",
"Failure in linktest (level $linktest_level); ".
"returned non-zero status",
"$user_name <$user_email>",
"Cc: $expt_head_name <$expt_head_email>\n".
"Cc: $TBOPS",
($output));
}
}
#
# Gather stats.
#
......
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