Changeset 748

Timestamp:

03/29/09 18:52:33 (4 years ago)

Author:

bruno

Message:

• Adds snapshot support at build time and at use time for VMs

Location:

devel

Files:

• pb-doc/qemu.txt (modified) (1 diff)
• pb/bin/pb (modified) (21 diffs)

devel/pb-doc/qemu.txt

@@ -37 +37 @@
 change cdrom /dev/cdrom
 
+# Making a snapshot
+Ctrl-Alt 2
+savevm pb
+commit all
+
 # Slack: put loadkeys fr in /etc/rc.d/rc.keymap
 

devel/pb/bin/pb

@@ -36 +36 @@
 my $action;                 # action to realize
 my $test = "FALSE";         # Not used
-my $force = 0;              # Force VE/VM rebuild
+my $pbforce = 0;            # Force VE/VM rebuild
+my $pbsnap = 0;             # Use snapshot mode for VM/VE
 my $option = "";            # Not used
 my @pkgs;                   # list of packages
@@ -63 +64 @@
 pb helps you build various packages directly from your project sources. 
 Those sources could be handled by a CMS (Configuration Management System)
-such as Subversion, CVS, Mercurial... or being a simple reference to a compressed tar file.
+such as Subversion, CVS, Git, Mercurial... or being a simple reference to a compressed tar file.
 It's based on a set of configuration files, a set of provided macros to help 
 you keeping build files as generic as possible. For example, a single .spec
@@ -71 +72 @@
 =head1 SYNOPSIS
 
-pb [-vhq][-r pbroot][-p project][[-s script -a account -P port][-m mach-1[,...]]][-i iso] <action> [<pkg1> ...]
-
-pb [--verbose][--help][--man][--quiet][--revision pbroot][--project project][[--script script --account account --port port][--machine mach-1[,...]]][--iso iso] <action> [<pkg1> ...]
+pb [-vhSq][-r pbroot][-p project][[-s script -a account -P port][-m mach-1[,...]]][-i iso] <action> [<pkg1> ...]
+
+pb [--verbose][--help][--man][--quiet][--snapshot][--revision pbroot][--project project][[--script script --account account --port port][--machine mach-1[,...]]][--iso iso] <action> [<pkg1> ...]
 
 =head1 OPTIONS
@@ -90 +91 @@
 
 Print a brief help message and exits.
+
+=item B<-S|--snapshot>
+
+Use the snapshot mode of VMs or VEs
 
 =item B<--man>
@@ -214 +219 @@
 
 Setup a virtual environment for pb usage
+
+=item B<snapvm>
+
+Snapshot a virtual machine for pb usage
+
+=item B<snapve>
+
+Snapshot a virtual environment for pb usage
 
 =item B<newver>
@@ -314 +327 @@
 # ---------------------------------------------------------------------------
 
-# Old syntax
-#getopts('a:fhi:l:m:P:p:qr:s:vV:',\%opts);
-
 my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
 
@@ -326 +336 @@
         "man" => \$opts{'man'},
         "verbose|v+" => \$opts{'v'},
+        "snapshot|S" => \$opts{'S'},
         "quiet|q" => \$opts{'q'},
         "log-files|l=s" => \$opts{'l'},
@@ -349 +360 @@
 }
 if (defined $opts{'f'}) {
-    $force=1;
+    $pbforce=1;
 }
 if (defined $opts{'q'}) {
     $pbdebug=-1;
+}
+if (defined $opts{'S'}) {
+    $pbsnap=1;
 }
 if (defined $opts{'l'}) {
@@ -444 +458 @@
     pb_setup_v("ve");
 } elsif ($action =~ /^setupvm$/) {
+    pb_snap_v("vm");
+} elsif ($action =~ /^snapve$/) {
+    pb_snap_v("ve");
+} elsif ($action =~ /^snapvm$/) {
     pb_setup_v("vm");
 } elsif ($action =~ /^newproj$/) {
@@ -1017 +1035 @@
     my $vmexist = shift || 0;           # 0 is FALSE
     my $vmpid = shift || 0;             # 0 is FALSE
+    my $snapme = shift || 0;            # 0 is FALSE
 
     pb_log(2,"DEBUG: pb_send2target($cmt,".Dumper($v).",$vmexist,$vmpid)\n");
@@ -1365 +1384 @@
     pb_log(2,"Before halt, vmexist: $vmexist, vmpid: $vmpid\n");
     if ((! $vmexist) && (($cmt eq "vm") || ($cmt eq "VMScript"))) {
+        # If in setupvm then takes a snapshot just before halting
+        if ($snapme != 0) {
+            my ($vmmonport,$vmtype) = pb_conf_get("vmmonport","vmtype");
+            # For monitoring control
+            if ((($vmtype->{$ENV{'PBPROJ'}}) eq "kvm") || (($vmtype->{$ENV{'PBPROJ'}}) eq "qemu")) {
+                use Net::Telnet;
+                my $t = new Net::Telnet (Host => "localhost", Port => $vmmonport->{$ENV{'PBPROJ'}}) || die "Unable to dialog on the monitor";
+                # move to monitor mode
+                my @lines = $t->cmd("
+                # Create a snapshot named pb
+                @lines = $t->cmd("savevm pb");
+                # Write the new status in the VM
+                @lines = $t->cmd("commit all");
+                # End
+                @lines = $t->cmd("quit");
+            }
+        }
         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)");
     }
@@ -1372 +1408 @@
     my $pbscript=shift;
     my $vtype=shift;
-    my $force=shift || 0;   # Force stop of VM. Default not
+    my $pbforce=shift || 0; # Force stop of VM. Default not
     my $vm1=shift || undef; # Only that VM to treat
+    my $snapme=shift || 0;  # Do we have to crate a snapshot
     my $vm;
     my $all;
 
-    pb_log(2,"DEBUG: pb_script2v($pbscript,$vtype,$force)\n");
+    pb_log(2,"DEBUG: pb_script2v($pbscript,$vtype,$pbforce)\n");
     # Prepare the script to be executed on the VM
     # in $ENV{'PBDESTDIR'}/pbscript
@@ -1395 +1432 @@
         # Launch the VM/VE
         if ($vtype eq "vm") {
-            ($vmexist,$vmpid) = pb_launchv($vtype,$v,0);
+            ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,$snapme);
             pb_log(2,"DEBUG: After pb_launchv, vmexist: $vmexist, vmpid: $vmpid\n");
 
@@ -1402 +1439 @@
 
             # If force stopping the VM then reset vmexist
-            if ($force == 1) {
+            if ($pbforce == 1) {
                 $vmpid = $vmexist;
                 $vmexist = 0;
@@ -1415 +1452 @@
         # and launch the build through pbscript
         pb_log(2,"DEBUG: Before send2target, vmexist: $vmexist, vmpid: $vmpid\n");
-        pb_send2target(uc($vtype)."Script","$v",$vmexist,$vmpid);
+        pb_send2target(uc($vtype)."Script","$v",$vmexist,$vmpid,$snapme);
 
     }
@@ -1424 +1461 @@
     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
 
     pb_log(2,"DEBUG: pb_launchv($vtype,$v,$create)\n");
@@ -1436 +1474 @@
         die "-i iso parameter needed" if (((not defined $iso) || ($iso eq "")) && ($create != 0));
 
-        my ($ptr,$vmopt,$vmpath,$vmport,$vmtmout,$vmsize) = pb_conf_get("vmtype","vmopt","vmpath","vmport","vmtmout","vmsize");
+        my ($ptr,$vmpath,$vmport,$vmsize,$vmmonport) = pb_conf_get("vmtype","vmpath","vmport","vmsize","vmmonport");
+        my ($vmopt,$vmtmout,$vmsnap) = pb_conf_get_if("vmopt","vmtmout","vmsnap");
 
         my $vmtype = $ptr->{$ENV{'PBPROJ'}};
@@ -1452 +1491 @@
         } elsif (defined $vmopt->{$ENV{'PBPROJ'}}) {
             $ENV{'PBVMOPT'} .= " $vmopt->{$ENV{'PBPROJ'}}" if ($ENV{'PBVMOPT'} !~ / $vmopt->{$ENV{'PBPROJ'}}/);
+        }
+        # Do not use snapshot feature at creation
+        if ($create != 0) {
+            if ((defined $vmsnap->{$v}) && ($vmsnap->{$v} =~ /true/i)) {
+                $ENV{'PBVMOPT'} .= " -snapshot";
+            } elsif ((defined $vmsnap->{$ENV{'PBPROJ'}}) && ($vmsnap->{$ENV{'PBPROJ'}} =~ /true/i)) {
+                $ENV{'PBVMOPT'} .= " -snapshot";
+            } elsif ($pbsnap eq 1) {
+                $ENV{'PBVMOPT'} .= " -snapshot";
+            }
+        } elsif ($snapme != 0) {
+            if (($vmtype eq "kvm") || ($vmtype eq "qemu")) {
+                # Configure the monitoring to automize the creation of the 'pb' snapshot
+                $ENV{'PBVMOPT'} .= "-serial mon:telnet::$vmmonport->{$ENV{'PBPROJ'}},server,nowait ";
+            }
         }
         if (defined $vmtmout->{$v}) {
@@ -1486 +1540 @@
                 $ENV{'PBVMOPT'} .= " -cdrom $iso -boot d";
             }
-            $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 $vmm"
+            # Always redirect the network and always try to use a 'pb' snapshot
+            $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 -loadvm pb $vmm"
         } elsif ($vmtype eq "xen") {
         } elsif ($vmtype eq "vmware") {
@@ -1539 +1594 @@
 
             my ($verpmtype) = pb_conf_get("verpmtype");
-            if (($create != 0) || ($verebuild->{$ENV{'PBPROJ'}} eq "true") || ($force == 1)) {
+            if (($create != 0) || ($verebuild->{$ENV{'PBPROJ'}} eq "true") || ($pbforce == 1)) {
                 # We have to rebuild the chroot
                 if ($dtype eq "rpm") {
@@ -2162 +2217 @@
 
     # Force shutdown of VM exept if it was already launched
-    my $force = 0;
+    my $pbforce = 0;
     if ((! $vmexist) && ($vtype eq "vm")) {
-        $force = 1;
+        $pbforce = 1;
     }
     
-    pb_script2v($pbscript,$vtype,$force,$v);
+    pb_script2v($pbscript,$vtype,$pbforce,$v);
+}
+return;
+}
+
+# Function to create a snapshot named 'pb' for VMs/VEs
+sub pb_snap_v {
+
+my $vtype = shift;
+
+my ($vm,$all) = pb_get_v($vtype);
+
+# Script generated
+my $pbscript = "$ENV{'PBDESTDIR'}/snapv";
+
+foreach my $v (@$vm) {
+    # Name of the account to deal with for VM/VE
+    # Do not use the one passed potentially with -a
+    my ($pbac) = pb_conf_get($vtype."login");
+    my ($vmexist,$vmpid);
+
+    # Prepare the script to be executed on the VM/VE
+    # in $ENV{'PBDESTDIR'}/setupv
+    open(SCRIPT,"> $pbscript") || die "Unable to create $pbscript";
+    
+    print SCRIPT << 'EOF';
+    #!/bin/bash
+    sleep 60
+EOF
+    close(SCRIPT);
+    chmod 0755,"$pbscript";
+
+    # Force shutdown of VM/VE
+    $pbforce = 1;
+    # Force snapshot of VM/VE
+    pb_script2v($pbscript,$vtype,$pbforce,$v,1);
 }
 return;