Changeset 755 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Apr 3, 2009, 4:19:09 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Adds snapshot support for VEs

File:

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

devel/pb/bin/pb

@@ -1435 +1435 @@
 
     foreach my $v (@$vm) {
-        # Launch the VM/VE
+        # Launch VM/VE
+        ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,$snapme);
+
         if ($vtype eq "vm") {
-            ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,$snapme);
             pb_log(2,"DEBUG: After pb_launchv, vmexist: $vmexist, vmpid: $vmpid\n");
 
@@ -1465 +1466 @@
     my $vtype = shift;
     my $v = shift;
-    my $create = shift || 0;        # By default do not create a VM
-    my $snapme = shift || 0;        # By default do not create a VM
+    my $create = shift || 0;        # By default do not create a VM/VE
+    my $snapme = shift || 0;        # By default do not snap a VM/VE
 
     pb_log(2,"DEBUG: pb_launchv($vtype,$v,$create)\n");
@@ -1497 +1498 @@
             $ENV{'PBVMOPT'} .= " $vmopt->{$ENV{'PBPROJ'}}" if ($ENV{'PBVMOPT'} !~ / $vmopt->{$ENV{'PBPROJ'}}/);
         }
-        # Do not use snapshot feature at creation
-        if ($create != 0) {
+        # Use snapshot feature when not creating VM
+        if ($create == 0) {
             if ((defined $vmsnap->{$v}) && ($vmsnap->{$v} =~ /true/i)) {
                 $ENV{'PBVMOPT'} .= " -snapshot";
@@ -1584 +1585 @@
         # Get VE context
         my ($ptr,$vetmout,$vepath,$verebuild,$veconf,$vepostinstall) = pb_conf_get("vetype","vetmout","vepath","verebuild","veconf");
-        my ($veb4pi,$vepi,$vepkglist) = pb_conf_get_if("veb4pi","vepi","vepkglist");
+        my ($veb4pi,$vepi,$vepkglist,$vesnap) = pb_conf_get_if("veb4pi","vepi","vepkglist","vesnap");
         my $vetype = $ptr->{$ENV{'PBPROJ'}};
 
@@ -1653 +1654 @@
                 }
             }
+            # Test if an existing snapshot exists and use it if appropriate
+            # And also use it of no local extracted VE is present
+            if ((-f "$vepath->{$ENV{'PBPROJ'}}/$ddir-$dver-$darch.tar.gz") &&
+                (((defined $vesnap->{$v}) && ($vesnap->{$v} =~ /true/i)) ||
+                    ((defined $vesnap->{$ENV{'PBPROJ'}}) && ($vesnap->{$ENV{'PBPROJ'}} =~ /true/i)) ||
+                    ($pbsnap eq 1) ||
+                    (! -d "$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch"))) {
+                        pb_system("sudo mkdir -p $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch ; sudo tar xz  -C $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch -f $vepath->{$ENV{'PBPROJ'}}/$ddir-$dver-$darch.tar.gz","Extracting snapshot of $ddir-$dver-$darch.tar.gz under $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch");
+            }
             # Nothing more to do for VE. No real launch
         } else {
@@ -1785 +1795 @@
     chmod 0755,"$ENV{'PBDESTDIR'}/pbscript";
     
+    # Launch the VM/VE
+    ($vmexist,$vmpid) = pb_launchv($vtype,$v,0);
+
     if ($vtype eq "vm") {
-        # Launch the VM
-        ($vmexist,$vmpid) = pb_launchv($vtype,$v,0);
-
         # Skip that VM if it something went wrong
         next if (($vmpid == 0) && ($vmexist == 0));
@@ -1984 +1994 @@
 EOF
 
+    # Launch the VM/VE
+    ($vmexist,$vmpid) = pb_launchv($vtype,$v,0);
+
     if ($vtype eq "vm") {
         # Prepare the key to be used and transfered remotely
@@ -1992 +2005 @@
         $nport = "$pbport" if (defined $pbport);
     
-        # Launch the VM
-        ($vmexist,$vmpid) = pb_launchv($vtype,$v,0);
-
         # Skip that VM if something went wrong
         next if (($vmpid == 0) && ($vmexist == 0));
@@ -2164 +2174 @@
     print SCRIPT << "EOF";
 # This is needed in order to be able to halt the machine from the $pbac->{$ENV{'PBPROJ'}} account at least
-print PBOUT "Defaults:pb env_keep += \"http_proxy ftp_proxy\"\n";
+print PBOUT "Defaults:pb env_keep += \\\"http_proxy ftp_proxy\\\"\n";
 print PBOUT "$pbac->{$ENV{'PBPROJ'}}   ALL=(ALL) NOPASSWD:ALL\n";
 EOF