WebSVN – DevTools – Diff – /dpkg_blat/trunk/src/blat/blatDaemon.pl

     filtered => 0,                      # Packages filtered out
     missing  => 0,                      # Packages missing
     transfer => 0,                      # Packages to transfer
     writable => 0,                      # Packages still writable - thus not transferred
     tagCount => 0,                      # Packages tagged to be transferred
+                                        #
+                                        # Expected from the Target
+#   Target.Hostname => '',              # Target Hostname
+#   Target.avail    => 0,               # Information from 'df' 1Kblocks
+#   Target.pcent    => 0,
+#   Target.size     => 0,
+#   Target.used     => 0,
+#   Target.iavail   => 0,               # Inode information from 'df'
+#   Target.ipcent   => 0,
+#   Target.isize    => 0,
+#   Target.iused    => 0,
+#   Target.Total    => 0,               # Number of Package Versions in the archive
+#   Target.Damaged  => 0,               # Number that are damaged
+#   Target.Delete   => 0,               # Number marked for future deletion
+#   Target.Missing  => 0,               # Number missing
 );
+#
 #   Describe configuration parameters
+#
 #       Set up a logger
 #       Write a pidfile - thats not used
 readConfig();
 Utils::writepid($conf);
 $logger->logmsg("Starting...");
+readStatistics();
 sighandlers($conf);
 $startTime = time();
+#
 #   Main processing loop
     #   Returned data looks like:
     #   1141792602 GMT(Wed Mar  8 04:36:42 2006) [DL] ishieldmodules/11.5.0.cots
+    #
+    #
     my $remotePkgList;
+    my $remotePackageVersionCount = 0;
+    my $remoteData;
     my $ph;
     my $tgt_cmd = "$conf->{'bindir'}/get_plist.pl";
     my $ssh_cmd = sshCmd($tgt_cmd);
     $logger->verbose2("processReleaseList:ssh_cmd:$ssh_cmd");
     open ($ph, "$ssh_cmd |");
     while ( <$ph> )
+    {
         chomp;
-        if ( parsePkgList($_, \%{$remotePkgList} ) )
+        if ($_ =~ m~^Metadata\s+~)
+        {
-            $logger->verbose2("processReleaseList:Data: $_");
+            parsePkgMetaData($_, \%{$remoteData})
+        }
         else
+        {
+            if ( parsePkgList($_, \%{$remotePkgList} ) )
+            {
+                $logger->verbose2("processReleaseList:Data: $_");
+                $remotePackageVersionCount++;
+            }
+            else
+            {
-            $logger->warn("processReleaseList:Bad Data: $_");
+                $logger->warn("processReleaseList:Bad Data: $_");
+            }
+        }
+    }
     close ($ph);
     $logger->verbose("processReleaseList:End: $?");
     LogTxError ($?);
     my $needPkgListCount = 0;
     my $filteredCount = 0;
     my $missingCount = 0;
     my $writableCount = 0;
     my $excludeCount = 0;
+    my $packageVersionCount = 0;
     while ( (my ($pname, $pvers)) = each %{$pkgList} )
+    {
+        #
         #   Ignore excluded packages
+        #
+        }
         while ( (my ($pver, $pdata) ) = each %{$pvers} )
+        {
             my $tmtime = $remotePkgList->{$pname}{$pver}{time} || 0;
+            $packageVersionCount++;
             # Package is present in both list
             my ($mtime, $mode) = Utils::mtime( catfile( $conf->{'dpkg_archive'} , $pname, $pver, 'descpkg' ));
             if ( $mtime == 0 )
+            {
+    #
     #   Update stats
     #   At this point we are looking pretty good
+    #
     $statistics{state} = 'OK';
-    $statistics{total} = scalar keys(%{$pkgList});
+    $statistics{total} = $packageVersionCount;
-    $statistics{remoteTotal} = scalar keys(%{$remotePkgList});
+    $statistics{remoteTotal} = $remotePackageVersionCount;
     $statistics{transfer} = $needPkgListCount;
     $statistics{delete} = $excessPkgListCount;
     $statistics{filtered} = $filteredCount;
     $statistics{missing} = $missingCount;
     $statistics{writable} = $writableCount;
     $hashp->{$pname}{$pver} = $rv;
     return $hashp;
+}
 #-------------------------------------------------------------------------------
+# Function        : parsePkgMetaData
+#
+# Description     : Parse one line of meta data from a pkgList
+#                   Lines are multiple item="data" items
+#
+# Inputs          : $line                   - Line of data
+#                   $hashp                  - Ref to hash to populate
+#
+# Returns         : Nothing
+#
+sub parsePkgMetaData
+{
+    my ($line, $hashp) = @_;
+    if ( $line =~ m~\s+(.+?)="(.+?)"~ )
+    {
+        $hashp->{$1} = $2;
+        $statistics{'Target.' . $1} = $2;
+        $line = $';
+        $logger->verbose2("parsePkgMetaData: $1 = $2");
+    }
+}
+#-------------------------------------------------------------------------------
 # Function        : resetDailyStatistics
+#
 # Description     : Called periodically to reset the daily statistics
+#
 # Inputs          : $time       - Current time
     if ($yday != $today)
+    {
         $yday = $today;
         $logger->logmsg('Resetting daily statistics' );
+        # Note: Must match @recoverTags in readStatistics
         $statistics{dayStart} = $time;
         $statistics{txCount} = 0;
         $statistics{delCount} = 0;
         $statistics{staleTags} = 0;
         $statistics{linkErrors} = 0;
+    }
+}
 #-------------------------------------------------------------------------------
+# Function        : readStatistics
+#
+# Description     : Read in the last set of stats
+#                   Used after a restart to recover daily statistics
+#
+# Inputs          :
+#
+# Returns         :
+#
+sub readStatistics
+{
+    my @recoverTags = qw(dayStart txCount delCount staleTags linkErrors);
+    if ($conf->{'statsfile'} and -f $conf->{'statsfile'})
+    {
+        if (open my $fh, $conf->{'statsfile'})
+        {
+            while (<$fh>)
+            {
+                m~(.*):(.*)~;
+                if ( grep( /^$1$/, @recoverTags ) )
+                {
+                    $statistics{$1} = $2;
+                    $logger->verbose("readStatistics $1, $2\n");
+                }
+            }
+            close $fh;
+            $yday = (localtime($statistics{dayStart}))[7];
+        }
+    }
+}
+#-------------------------------------------------------------------------------
 # Function        : periodicStatistics
+#
 # Description     : Called on a regular basis to write out statistics
 #                   Used to feed information into Nagios
+#
             $fh = undef;
             $logger->warn("Cannot create temp stats file: $!");
+        }
         else
+        {
-            foreach my $key ( keys %statistics)
+            foreach my $key ( sort { lc($a) cmp lc($b) } keys %statistics)
+            {
                 print $fh $key . ':' . $statistics{$key} . "\n";
                 $logger->verbose2('Statistics:'. $key . ':' . $statistics{$key});
+            }
             close $fh;
     $SIG{TERM} = sub {
         # On shutdown
         $logger->logmsg('Received SIGTERM. Shutting down....' );
         unlink $conf->{'pidfile'} if (-f $conf->{'pidfile'});
-        unlink $conf->{'statsfile'} if (-f $conf->{'statsfile'});
-        unlink $conf->{'statsfiletmp'} if (-f $conf->{'statsfiletmp'});
         exit 0;
     };
     $SIG{HUP} = sub {
         # On logrotate

Subversion Repositories DevTools

(root)/dpkg_blat/trunk/src/blat/blatDaemon.pl – Rev 5399 → 5404