]> xenbits.xensource.com Git - osstest.git/commitdiff
ts-hosts-allocate-Executive: Finish a couple of transactions
authorIan Jackson <ian.jackson@eu.citrix.com>
Tue, 29 Sep 2015 14:25:47 +0000 (15:25 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 2 Oct 2015 10:34:15 +0000 (11:34 +0100)
Call $equivflagscheckq->finish() at the end, rather than in the
candidate search loop.  This avoids missing a `next' control path.

Call $resprop_q->finish() at all.

One of these is responsible for this message:

  DBI::db=HASH(0x88e79c4)->disconnect invalidates 1 active statement
  handle (either destroy statement handles or call finish on them
  before disconnecting) at Osstest/Executive.pm line 708, <GEN4> line
  53.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
ts-hosts-allocate-Executive

index 88da50438f16fd5451abd2fac645dee291b42759..13a065289e2dcf5a93af5b635179e2945730a19c 100755 (executable)
@@ -366,7 +366,6 @@ END
                push @{ $candrow->{Warnings} },
                    "host has multiple equivalence class flags";
            }
-           $equivflagscheckq->finish();
        }
 
         print DEBUG "$dbg FLAGS MISSINGFLAGS: @missingflags.\n";
@@ -419,7 +418,9 @@ END
        print DEBUG "$dbg CANDIDATE.\n";
     }
     $findhostsq->finish();
+    $equivflagscheckq->finish();
     $equivstatusq->finish();
+    $resprop_q->finish();
 
     if (!@candidates) {
         if (defined $use) {