fix upid parser for long uptimes

[pve-common.git] / data / PVE / Tools.pm

diff --git a/data/PVE/Tools.pm b/data/PVE/Tools.pm
index 235178a68cd68b4bebe08db263243905a46a48df..922c0e6685d6773ff9210428bde34b4931069b83 100644 (file)
--- a/data/PVE/Tools.pm
+++ b/data/PVE/Tools.pm
@@ -1,6 +1,7 @@
 package PVE::Tools;
 
 use strict;
+use warnings;
 use POSIX qw(EINTR);
 use IO::Socket::INET;
 use IO::Select;
@@ -18,6 +19,8 @@ use Text::ParseWords;
 use String::ShellQuote;
 
 our @EXPORT_OK = qw(
+$IPV6RE
+$IPV4RE
 lock_file 
 lock_file_full
 run_command 
@@ -39,6 +42,22 @@ my $pvetaskdir = "$pvelogdir/tasks";
 mkdir $pvelogdir;
 mkdir $pvetaskdir;
 
+my $IPV4OCTET = "(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])";
+our $IPV4RE = "(?:(?:$IPV4OCTET\\.){3}$IPV4OCTET)";
+my $IPV6H16 = "(?:[0-9a-fA-F]{1,4})";
+my $IPV6LS32 = "(?:(?:$IPV4RE|$IPV6H16:$IPV6H16))";
+
+our $IPV6RE = "(?:" .
+    "(?:(?:" .                             "(?:$IPV6H16:){6})$IPV6LS32)|" .
+    "(?:(?:" .                           "::(?:$IPV6H16:){5})$IPV6LS32)|" .
+    "(?:(?:(?:" .              "$IPV6H16)?::(?:$IPV6H16:){4})$IPV6LS32)|" .
+    "(?:(?:(?:(?:$IPV6H16:){0,1}$IPV6H16)?::(?:$IPV6H16:){3})$IPV6LS32)|" .
+    "(?:(?:(?:(?:$IPV6H16:){0,2}$IPV6H16)?::(?:$IPV6H16:){2})$IPV6LS32)|" .
+    "(?:(?:(?:(?:$IPV6H16:){0,3}$IPV6H16)?::(?:$IPV6H16:){1})$IPV6LS32)|" .
+    "(?:(?:(?:(?:$IPV6H16:){0,4}$IPV6H16)?::" .           ")$IPV6LS32)|" .
+    "(?:(?:(?:(?:$IPV6H16:){0,5}$IPV6H16)?::" .            ")$IPV6H16)|" .
+    "(?:(?:(?:(?:$IPV6H16:){0,6}$IPV6H16)?::" .                    ")))";
+
 sub run_with_timeout {
     my ($timeout, $code, @param) = @_;
 
@@ -555,8 +574,8 @@ my $keymaphash =  {
     'dk'     => ['Danish', 'da', 'qwerty/dk-latin1.kmap.gz', 'dk', 'nodeadkeys'],
     'de'     => ['German', 'de', 'qwertz/de-latin1-nodeadkeys.kmap.gz', 'de', 'nodeadkeys' ],
     'de-ch'  => ['Swiss-German', 'de-ch', 'qwertz/sg-latin1.kmap.gz',  'ch', 'de_nodeadkeys' ], 
-    'en-gb'  => ['United Kingdom', 'en-gb', 'qwerty/uk.kmap.gz' , 'gb', 'intl' ],
-    'en-us'  => ['U.S. English', 'en-us', 'qwerty/us-latin1.kmap.gz',  'us', 'intl' ],
+    'en-gb'  => ['United Kingdom', 'en-gb', 'qwerty/uk.kmap.gz' , 'gb', undef],
+    'en-us'  => ['U.S. English', 'en-us', 'qwerty/us-latin1.kmap.gz',  'us', undef ],
     'es'     => ['Spanish', 'es', 'qwerty/es.kmap.gz', 'es', 'nodeadkeys'],
     #'et'     => [], # Ethopia or Estonia ??
     'fi'     => ['Finnish', 'fi', 'qwerty/fi-latin1.kmap.gz', 'fi', 'nodeadkeys'],
@@ -632,24 +651,78 @@ sub wait_for_vnc_port {
     return undef;
 }
 
-sub next_vnc_port {
+sub next_unused_port {
+    my ($range_start, $range_end) = @_;
+
+    # We use a file to register allocated ports.
+    # Those registrations expires after $expiretime.
+    # We use this to avoid race conditions between
+    # allocation and use of ports.
 
-    for (my $p = 5900; $p < 6000; $p++) {
+    my $filename = "/var/tmp/pve-reserved-ports";
 
-       my $sock = IO::Socket::INET->new (Listen => 5,
-                                         LocalAddr => 'localhost',
-                                         LocalPort => $p,
-                                         ReuseAddr => 1,
-                                         Proto     => 0);
+    my $code = sub {
 
-       if ($sock) {
-           close ($sock);
-           return $p;
+       my $expiretime = 5;
+       my $ctime = time();
+
+       my $ports = {};
+
+       if (my $fh = IO::File->new ($filename, "r")) {
+           while (my $line = <$fh>) {
+               if ($line =~ m/^(\d+)\s(\d+)$/) {
+                   my ($port, $timestamp) = ($1, $2);
+                   if (($timestamp + $expiretime) > $ctime) {
+                       $ports->{$port} = $timestamp; # not expired
+                   }           
+               }
+           }
        }
-    }
+    
+       my $newport;
+
+       for (my $p = $range_start; $p < $range_end; $p++) {
+           next if $ports->{$p}; # reserved
+
+           my $sock = IO::Socket::INET->new(Listen => 5,
+                                            LocalAddr => 'localhost',
+                                            LocalPort => $p,
+                                            ReuseAddr => 1,
+                                            Proto     => 0);
+
+           if ($sock) {
+               close($sock);
+               $newport = $p;
+               $ports->{$p} = $ctime;
+               last;
+           }
+       }
+ 
+       my $data = "";
+       foreach my $p (keys %$ports) {
+           $data .= "$p $ports->{$p}\n";
+       }
+    
+       file_set_contents($filename, $data);
 
-    die "unable to find free vnc port";
-};
+       return $newport;
+    };
+
+    my $p = lock_file($filename, 10, $code);
+    die $@ if $@;
+   
+    die "unable to find free port (${range_start}-${range_end})\n" if !$p;
+
+    return $p;
+}
+
+sub next_migrate_port {
+    return next_unused_port(60000, 60010);
+}
+
+sub next_vnc_port {
+    return next_unused_port(5900, 6000);
+}
 
 # NOTE: NFS syscall can't be interrupted, so alarm does 
 # not work to provide timeouts.
@@ -692,6 +765,8 @@ sub df {
 sub upid_encode {
     my $d = shift;
 
+    # Note: pstart can be > 32bit if uptime > 497 days, so this can result in
+    # more that 8 characters for pstart
     return sprintf("UPID:%s:%08X:%08X:%08X:%s:%s:%s:", $d->{node}, $d->{pid}, 
                   $d->{pstart}, $d->{starttime}, $d->{type}, $d->{id}, 
                   $d->{user});
@@ -704,7 +779,8 @@ sub upid_decode {
     my $filename;
 
     # "UPID:$node:$pid:$pstart:$startime:$dtype:$id:$user"
-    if ($upid =~ m/^UPID:([a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?):([0-9A-Fa-f]{8}):([0-9A-Fa-f]{8}):([0-9A-Fa-f]{8}):([^:\s]+):([^:\s]*):([^:\s]+):$/) {
+    # Note: allow up to 9 characters for pstart (work until 20 years uptime)
+    if ($upid =~ m/^UPID:([a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?):([0-9A-Fa-f]{8}):([0-9A-Fa-f]{8,9}):([0-9A-Fa-f]{8}):([^:\s]+):([^:\s]*):([^:\s]+):$/) {
        $res->{node} = $1;
        $res->{pid} = hex($3);
        $res->{pstart} = hex($4);