Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
4da7feb1
Commit
4da7feb1
authored
Oct 19, 2005
by
Leigh B. Stoller
Browse files
Rip out linktest; moving to tbswap ...
parent
b2c92d3e
Changes
2
Show whitespace changes
Inline
Side-by-side
tbsetup/batchexp.in
View file @
4da7feb1
...
...
@@ -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.
#
...
...
tbsetup/swapexp.in
View file @
4da7feb1
...
...
@@ -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.
#
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment