Commit c88a1ce1 authored by Leigh Stoller's avatar Leigh Stoller

Change linktest code to invoke linktest_control insted of run_linktest.pl,

so that the process ID is tracked in the DB and so that the user can
stop a linktest in progress from the web interface, even if its
started directly from experiment swapin.
parent f1c5ee39
......@@ -519,8 +519,8 @@ if ($linktest && ExpState($pid, $eid) eq EXPTSTATE_ACTIVE) {
$optarg .= " -l 1";
}
print "Running 'run_linktest.pl $optarg -e $pid/$eid'\n";
if (system("$tbbindir/run_linktest.pl $optarg -e $pid/$eid") != 0) {
print "Running 'linktest_control $optarg $pid $eid'\n";
if (system("$TB/sbin/linktest_control $optarg $pid $eid") != 0) {
system("cat $output")
if (-r $output);
......
......@@ -832,8 +832,8 @@ if ($linktest_level && ExpState($pid, $eid) eq EXPTSTATE_ACTIVE) {
my $output = "linktest.$$";
my $optarg = "-l $linktest_level -o $output";
print STDOUT "Running 'run_linktest.pl $optarg -e $pid/$eid'\n";
if (system("$tbdir/run_linktest.pl $optarg -e $pid/$eid") != 0) {
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);
......
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