All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 95ce63f4 authored by Kevin Atkinson's avatar Kevin Atkinson

Fix to Image Logging code to be able to determine if a node is a delay

node or virthost.
parent 4a94c6e4
......@@ -1509,13 +1509,15 @@ if ($exit_code == 0) {
my ($node_history_id)
= DBQuerySingleFatal("select max(history_id) ".
" from node_history where node_id = '$node_id'");
my ($osname, $req_type, $phys_type)
= DBQuerySingleFatal("select v.osname, v.type, n.type ".
my ($erole, $osname, $req_type, $phys_type)
= DBQuerySingleFatal("select r.erole, v.osname, v.type, n.type ".
" from reserved as r ".
" left join virt_nodes as v using (vname, exptidx) ".
" left join nodes as n using (node_id) ".
"where r.node_id = '$node_id'");
my $req_os = $osname ? 1 : 0;
my $req_os = defined $osname ? ($osname ? 1 : 0) : 'NULL';
$erole = 'delay' if $erole eq 'delaynode';
$req_type = $erole unless defined $req_type;
DBQueryFatal("insert into image_history ".
"(stamp, node_history_id, node_id, ".
......
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