Commit 36db5e6e authored by Mac Newbold's avatar Mac Newbold

reset idleswap time to min of current and threshold, instead of always threshold.

parent 055e1e21
...@@ -84,8 +84,9 @@ $exp_gid = $row[gid]; ...@@ -84,8 +84,9 @@ $exp_gid = $row[gid];
$batch = $row[batchmode]; $batch = $row[batchmode];
$swappable=$row[swappable]; $swappable=$row[swappable];
$idleswap_bit=$row[idleswap]; $idleswap_bit=$row[idleswap];
$idleswap_time=$row[idleswap_timeout];
$idlethresh=TBGetSiteVar("idle/threshold"); $idlethresh=min($idleswap_time/60.0,TBGetSiteVar("idle/threshold"));
# #
# Look for transition in progress and exit with error. # Look for transition in progress and exit with error.
...@@ -162,8 +163,10 @@ if (!$confirmed) { ...@@ -162,8 +163,10 @@ if (!$confirmed) {
echo "</form>\n"; echo "</form>\n";
if ($inout!="out" && $idleswap_bit) { if ($inout!="out" && $idleswap_bit) {
echo "<p>Note: The Idle-Swap time for your experiment will be if ($idleswap_time / 60.0 != $idlethresh) {
updated to $idlethresh hours.</p>\n"; echo "<p>Note: The Idle-Swap time for your experiment will be
reset to $idlethresh hours.</p>\n";
}
} }
if (!strcmp($inout, "restart")) { if (!strcmp($inout, "restart")) {
......
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