Changeset 442 in ProjectBuilder for devel/pb/bin

Timestamp:

May 15, 2008, 1:32:36 AM (17 years ago)

Author:

Bruno Cornec

Message:

Adds support for multi VM for setupvm command (took way too much time to debug, I'm really tired :-()

File:

• devel/pb/bin/pb (modified) (10 diffs)

devel/pb/bin/pb

@@ -791 +791 @@
     my $vmpid = shift || 0;             # 0 is FALSE
 
+    pb_log(2,"DEBUG: pb_send2target($cmt,$v,$vmexist,$vmpid)\n");
     my $host = "sshhost";
     my $login = "sshlogin";
@@ -1027 +1028 @@
         pb_log(2,"Before sending pkgs, vmexist: $vmexist, vmpid: $vmpid\n");
         pb_send2target("Packages",$odir."-".$over."-".$oarch,$vmexist,$vmpid);
-        if ((! $vmexist) && ($cmt eq "vm")) {
-            pb_system("$shcmd \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
-        }
         pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");
+    }
+    pb_log(2,"Before halt, vmexist: $vmexist, vmpid: $vmpid\n");
+    if ((! $vmexist) && (($cmt eq "vm") || ($cmt eq "Script"))) {
+        pb_system("$shcmd \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
     }
 }
@@ -1037 +1039 @@
     my $pbscript=shift;
     my $vtype=shift;
-
+    my $force=shift || 0;   # Force stop of VM. Default not
+    my $vm1=shift || undef; # Only that VM to treat
+    my $vm;
+    my $all;
+
+    pb_log(2,"DEBUG: pb_script2v($pbscript,$vtype,$force,$vm1)\n");
     # Prepare the script to be executed on the VM
     # in $ENV{'PBDESTDIR'}/pbscript
@@ -1045 +1052 @@
     }
 
-    my ($vm,$all) = pb_get_v($vtype);
+    if (not defined $vm1) {
+        ($vm,$all) = pb_get_v($vtype);
+    } else {
+        @$vm = ($vm1);
+    }
     my ($vmexist,$vmpid) = (undef,undef);
 
@@ -1052 +1063 @@
         if ($vtype eq "vm") {
             ($vmexist,$vmpid) = pb_launchv($vtype,$v,0);
+            pb_log(2,"DEBUG: After pb_launchv, vmexist: $vmexist, vmpid: $vmpid\n");
 
             # Skip that VM if something went wrong
-            next if (($vmpid == 0) && ($vmexist ==0));
+            next if (($vmpid == 0) && ($vmexist == 0));
+
+            # If force stopping the VM then reset vmexist
+            if ($force == 1) {
+                $vmpid = $vmexist;
+                $vmexist = 0;
+            }
         }
 
         # Gather all required files to send them to the VM 
         # and launch the build through pbscript
+        pb_log(2,"DEBUG: Before send2target, vmexist: $vmexist, vmpid: $vmpid\n");
         pb_send2target("Script","$v",$vmexist,$vmpid);
 
@@ -1069 +1088 @@
     my $create = shift || 0;        # By default do not create a VM
 
+    pb_log(2,"DEBUG: pb_launchv($vtype,$v,$create)\n");
     die "No VM/VE defined, unable to launch" if (not defined $v);
     # Keep only the first VM in case many were given
@@ -1144 +1164 @@
             pb_log(0,"Found an existing VM $vmm (pid $vmexist)\n");
         }
+        pb_log(2,"DEBUG: pb_launchv returns ($vmexist,$vmpid)\n");
         return($vmexist,$vmpid);
     # VE here
@@ -1383 +1404 @@
 
         # Skip that VM if something went wrong
-        return if (($vmpid == 0) && ($vmexist == 0));
+        next if (($vmpid == 0) && ($vmexist == 0));
     
         # Store the pub key part in a variable
@@ -1533 +1554 @@
 system "pb 2>&1 | head -5";
 EOF
-    if ((! $vmexist) && ($vtype eq "vm")) {
-        print SCRIPT << 'EOF';
-pb_system("sudo /sbin/halt -p","Halting the VM");
-EOF
-    }
-    
     # Adds pb_distro_init from ProjectBuilder::Distribution
     foreach my $d (@INC) {
@@ -1559 +1574 @@
     chmod 0755,"$pbscript";
 
-    # That build script needs to be run as root
+    # That build script needs to be run as root and force stop of VM at end
     $pbaccount = "root";
-    pb_script2v($pbscript,$vtype);
+
+    # Force shutdown of VM exept if it was already launched
+    my $force = 0;
+    if ((! $vmexist) && ($vtype eq "vm")) {
+        $force = 1;
+    }
+    
+    pb_script2v($pbscript,$vtype,$force,$v);
 }
 return;