Changeset 1728 in ProjectBuilder

Timestamp:

Mar 17, 2013, 6:10:40 AM (11 years ago)

Author:

Bruno Cornec

Message:

• pb_check_ps now may return 2 params, the second one being the port number used by the VM for SSH communication
• If an existing VM is found, force the port number to the value used for further comm. Avoids to restart from base port, where a group of VMs has been launched and numbering doesn't correspond.
• pb_get_port now uses pbport var only for VMs

File:

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

devel/pb/bin/pb

@@ -2684 +2684 @@
 
         my ($tmpcmd,$void) = split(/ +/,$cmd);
-        my $vmexist = pb_check_ps($tmpcmd,$vmm);
+        my ($vmexist,$vmmport) = pb_check_ps($tmpcmd,$vmm);
         my $vmpid = 0;
         if (! $vmexist) {
@@ -2723 +2723 @@
         } else {
             pb_log(0,"Found an existing VM $vmm (pid $vmexist)\n");
+            # Set the correct port here based on what is done
+            $pbport = $vmmport;
+            $vmpid = $vmexist;
         }
         pb_log(2,"DEBUG: pb_launchv returns ($vmexist,$vmpid)\n");
@@ -3734 +3737 @@
             my $ntag = "[2-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]";
             $pbver .= $ntag;
-            $findstr .= "-name \'$pbrealpkgrpm-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgrpm-debug-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag"."_*\.deb\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag.dsc\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag.tar.gz\' -o -name \'$pbrealpkg-$nver"."_p$ntag\.ebuild\' -o -name \'$pbrealpkg-$pbver-$pbtag*\.pkg\' -o -name \'$pbrealpkg-$pbver-$pbtag*\.sd\' ";
+            $findstr .= "-name \'$pbrealpkgrpm-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgrpm-debug-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag"."_*\.deb\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag.dsc\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag.tar.gz\' -o -name \'$pbrealpkg-$nver"."_p$ntag\.ebuild\' -o -name \'$pbrealpkg-$pbver-$pbtag*\.pkg\.gz\' -o -name \'$pbrealpkg-$pbver-$pbtag*\.sd\' ";
             $srcstr .= "src/$pbrealpkg-$pbver.tar.gz src/$pbrealpkg-$pbver.pbconf.tar.gz ";
         } else {
@@ -3749 +3752 @@
                 $nver = $pbver."-r$pbtag";
             }
-            $findstr .= "-name \'$pbrealpkgrpm-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag"."_*\.deb\' -o -name \'$pbrealpkg-$nver\.ebuild\' -o -name \'$pbrealpkg-$pbver\.pkg\' -o -name \'$pbrealpkg-$pbver\.sd\' ";
+            $findstr .= "-name \'$pbrealpkgrpm-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag"."_*\.deb\' -o -name \'$pbrealpkg-$nver\.ebuild\' -o -name \'$pbrealpkg-$pbver\.pkg\.gz\' -o -name \'$pbrealpkg-$pbver\.sd\' ";
         }
 
@@ -3793 +3796 @@
                     $archlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkg-$pbver$prefix$pbtag.ebuild"} = "$pbos->{'arch'}";
                 } elsif ($pbos->{'type'} eq "pkg") {
-                    $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/$pbrealpkg-$pbver-$pbtag.pkg"} = 0;
+                    $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/$pbrealpkg-$pbver-$pbtag.pkg.gz"} = 0;
                 } else {
                     pb_log(1,"No theoritical list possible for type $pbos->{'type'}\n");
@@ -3917 +3920 @@
                 $excl .= $chkex->{$pkgn} if (defined $chkex->{$pkgn});
                 $excl .= $chkex->{"all"} if (defined $chkex->{"all"});
+
+                pb_log(2,"Searching in excl $excl\n");
                 foreach my $ex (split(/,/,$excl)) {
                     $found = 1 if ("$os-$ver-$arch" =~ /^$ex/);
@@ -4160 +4165 @@
 
 
-# Returns the pid of a running VM command using a specific VM file
+# Returns the pid of a running VM command using a specific VM file, and the port used if the VM exists
 sub pb_check_ps {
     my $vmcmd = shift;
     my $vmm = shift;
     my $vmexist = 0;        # FALSE by default
+    my $vmport = undef;         # NONE by default
 
     open(PS, "ps auxhww|") || die "Unable to call ps";
@@ -4171 +4177 @@
         next if (! /$vmm/);
         my ($void1, $void2);
-        ($void1, $vmexist, $void2) = split(/ +/);
+        ($void1, $vmexist, $vmport) = split(/ +/,$_,3);
+        pb_log(2,"pb_check_ps $vmport\n");
+        $vmport =~ s/.*\stcp\:([0-9]+)\:10.0.2.15:22.*/$1/;
+        chomp($vmport);
+        pb_log(2,"pb_check_ps found a VM $vmexist using port $vmport\n");
         last;
     }
+    # Maintain compatibility by just returning PID if no port
+    return($vmexist,$vmport) if (defined $vmport);
     return($vmexist);
 }
@@ -4331 +4343 @@
 }
 pb_log(2,"pb_get_port with $nport\n");
-# Maybe a port was given as parameter so overwrite
-$nport = "$pbport" if (defined $pbport);
-# Maybe in // mode so use the env var set up as an offset to the base port, except when called from send2target for Packages or for RM
-if (($cmt ne "Packages") && ($cmt !~ /^RM/i)) {
+if ($cmt =~ /^VM/i) {
+    # Maybe a port was given as parameter so overwrite
+    $nport = "$pbport" if (defined $pbport);
+    # Maybe in // mode so use the env var set up as an offset to the base port
     $nport += $ENV{'PBVMPORT'} if ((defined $pbparallel) && (defined $ENV{'PBVMPORT'}));
 }