Commit 3e190994 authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Use node_status.status instead of nodes.status.

parent 8ff5d76a
...@@ -891,11 +891,12 @@ function SHOWNODES($pid, $eid) { ...@@ -891,11 +891,12 @@ function SHOWNODES($pid, $eid) {
$query_result = $query_result =
DBQueryFatal("SELECT nodes.*,reserved.*, ". DBQueryFatal("SELECT nodes.*,reserved.*,ns.status as nodestatus, ".
"date_format(rsrv_time,\"%Y-%m-%d %T\") as rsrvtime ". "date_format(rsrv_time,\"%Y-%m-%d %T\") as rsrvtime ".
"FROM nodes LEFT JOIN node_activity ". "FROM nodes LEFT JOIN node_activity ".
"on nodes.node_id=node_activity.node_id ". "on nodes.node_id=node_activity.node_id ".
"LEFT JOIN reserved ON nodes.node_id=reserved.node_id ". "LEFT JOIN reserved ON nodes.node_id=reserved.node_id ".
"LEFT JOIN node_status as ns ON ns.node_id=nodes.node_id ".
"WHERE reserved.eid=\"$eid\" and reserved.pid=\"$pid\" ". "WHERE reserved.eid=\"$eid\" and reserved.pid=\"$pid\" ".
"ORDER BY $sort"); "ORDER BY $sort");
...@@ -906,7 +907,7 @@ function SHOWNODES($pid, $eid) { ...@@ -906,7 +907,7 @@ function SHOWNODES($pid, $eid) {
$def_boot_osid = $row[def_boot_osid]; $def_boot_osid = $row[def_boot_osid];
$startstatus = $row[startstatus]; $startstatus = $row[startstatus];
$readystatus = $row[ready]; $readystatus = $row[ready];
$status = $row[status]; $status = $row[nodestatus];
$bootstate = $row[eventstate]; $bootstate = $row[eventstate];
$idlehrs = TBGetNodeIdleTime($node_id); $idlehrs = TBGetNodeIdleTime($node_id);
......
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