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

 my $lastTagListUpdate = 0;
 my $mtimeConfig = 0;
 my $conf;
 my $yday = -1;
 my $linkUp = 1;
+my $dbUp = 1;
 my $RM_DB;
 my $activeReleases;
+my $RMerror = 0;                        # Error on last RM DB access
+#
 #   Contain statisics maintained while operating
 #       Can be dumped with a kill -USR2
 #       List here for documentation
                                         # The following are reset each day
     dayStart => 0,                      # DateTime when daily data was reset
     txCount => 0,                       # Packages Transferred
     txBytes => 0,                       # Bytes Transferred
     linkErrors => 0,                    # Transfer (S3) errors
+    dbErrors => 0,                      # Database errors
+                                        #
                                         # Per Cycle Data - Calculated each processing Cycle
     total => 0,                         # Number targets
 );
             maintainTagList();
+        }
+    }
     $statistics{phase} = 'Sleep';
-    sleep( $linkUp ? $conf->{'sleep'} : $conf->{'sleepLinkDown'} );
+    sleep( ($linkUp && $dbUp) ? $conf->{'sleep'} : $conf->{'sleepLinkDown'} );
     reapChildren();
     #   If my PID file ceases to be, then exit the daemon
     #   Used to force daemon to restart
+    #
         $ENV{GBE_RM_LOCATION} = $conf->{RM_LOCATION} if defined $conf->{RM_LOCATION};
         connectRM(\$RM_DB, $conf->{verbose} > 3);
         my $m_sqlstr = "SELECT rtag_id, parent_rtag_id, s3manifest, s3manifest_done " .
-                       "FROM release_tags rt " .
+                       "FROM release_manager.release_tags rt " .
                        "WHERE rt.OFFICIAL = 'S' " .
                        "      AND rt.S3MANIFEST = 'Y' " .
                        "      AND rt.S3MANIFEST_DONE != 'Y' " .
                        "ORDER BY rtag_id ";
-        my $curData = getDataFromRm ('monitorRequests', $m_sqlstr, {data => 0, sql => 1, dump => 1} );
-        return unless defined $curData;
-        $statistics{total} = scalar @{$curData};
-        # Add new enties to the set to process
-        foreach my $entry (@{$curData}) {
-            my ($rtag_id, $parent_rtag_id) = @{$entry};
-            unless ( exists $activeReleases->{$rtag_id}) {
-                $logger->logmsg("New Release Detected. rtag_id: $rtag_id, parent_rtag_id:$parent_rtag_id");
-                $activeReleases->{$rtag_id}{parent_rtag_id} = $parent_rtag_id;
-                $activeReleases->{$rtag_id}{rtag_id} = $rtag_id;
-                $activeReleases->{$rtag_id}{startTime} = $now;
-            }
-        }
-        # Process all the entries
         my $stuckEntry = 0;
-        foreach my $rtag_id ( sort keys %{$activeReleases} ) {
+        my $curData = getDataFromRm ('monitorRequests', $m_sqlstr, {data => 0, sql => 0, dump => 0} );
+        $dbUp = !$RMerror;
+        if ($curData) {
-            processSnapshot($rtag_id);
+            $statistics{total} = scalar @{$curData};
-            # Warn if stuck entry
+            # Add new enties to the set to process
-            # Repeat the warning on periodic basis
+            foreach my $entry (@{$curData}) {
-            if (exists $activeReleases->{$rtag_id}) {
+                my ($rtag_id, $parent_rtag_id) = @{$entry};
-                my $entry = $activeReleases->{$rtag_id};
+                unless ( exists $activeReleases->{$rtag_id}) {
+                    $logger->logmsg("New Release Detected. rtag_id: $rtag_id, parent_rtag_id:$parent_rtag_id");
-                if ($now - $activeReleases->{$rtag_id}{startTime} > $conf->{waitTime}) {
+                    $activeReleases->{$rtag_id}{parent_rtag_id} = $parent_rtag_id;
-                    $logger->warn("Max waitTime exceeded: rtag_id: $rtag_id, parent_rtag_id:$entry->{parent_rtag_id}");
+                    $activeReleases->{$rtag_id}{rtag_id} = $rtag_id;
                     $activeReleases->{$rtag_id}{startTime} = $now;
-                    $entry->{isStuck} = 1;
+                    $lastTagListUpdate = 0;
+                }
+            }
+            # Process all the entries
+            foreach my $rtag_id ( sort keys %{$activeReleases} ) {
+                processSnapshot($rtag_id);
+                # Warn if stuck entry
+                # Repeat the warning on periodic basis
+                if (exists $activeReleases->{$rtag_id}) {
+                    my $entry = $activeReleases->{$rtag_id};
+                    if ($now - $activeReleases->{$rtag_id}{startTime} > $conf->{waitTime}) {
+                        $logger->warn("Max waitTime exceeded: rtag_id: $rtag_id, parent_rtag_id:$entry->{parent_rtag_id}");
+                        $activeReleases->{$rtag_id}{startTime} = $now;
+                        $entry->{isStuck} = 1;
+                    }
-                if ($entry->{isStuck}) {
+                    if ($entry->{isStuck}) {
-                    $stuckEntry++;
+                        $stuckEntry++;
-                }
+                    }
+                }
+            }
+        }
         $statistics{slowGen} = $stuckEntry;
-        $lastTagListUpdate = 0;
         disconnectRM(\$RM_DB);
+    }
+}
 #-------------------------------------------------------------------------------
         #   Looks like a new entry - get the packages flagged for the manifest
         #   Determine all the package version that should go into the manifest
+        #
         my $m_sqlstr = "SELECT rc.pv_id, p.PKG_NAME, pv.PKG_VERSION, pv.v_ext, 0" .
-                        " FROM RELEASE_CONTENT rc, PACKAGE_VERSIONS pv, PACKAGES p " .
+                        " FROM release_manager.RELEASE_CONTENT rc, release_manager.PACKAGE_VERSIONS pv, release_manager.PACKAGES p " .
                         " WHERE rc.RTAG_ID = $rtagId " .
                         "  AND rc.IN_MANIFEST = 'Y' " .
                         "  AND rc.pv_id = pv.pv_id " .
                         "  AND p.pkg_id = pv.pkg_id";
         my $depEntry;
         $depEntry->{package} = $entry->[1];
         $depEntry->{version} = $entry->[2];
         $depEntry->{alias} = $entry->[1] . $entry->[3];
         $depEntry->{pv_id} = $entry->[0];
-        $depEntry->{stored} = $entry->[1] . '__' . $entry->[2] . 'tgz';
+        $depEntry->{stored} = $entry->[1] . '__' . $entry->[2] . '.tgz';
         push @{$manifest->{deployed}}, $depEntry;
+    }
     my $jsonText = to_json( $manifest, { ascii => 1, pretty => 1, canonical => 1 });
     $startTime = time;
     my $targetPath = catdir ($conf->{'S3Bucket'}, $targetName );
     my $s3_cmd = "aws --profile $conf->{'S3Profile'} --output json";
     $s3_cmd .= " --region $conf->{'S3Region'}" if (defined $conf->{'S3Region'});
-    $s3_cmd .= " s3 cp $file s3://$targetPath";
+    $s3_cmd .= " s3 cp --quiet $file s3://$targetPath";
     $logger->logmsg("transferManifest:$targetPath");
     $logger->verbose2("transferManifest:s3_cmd:$s3_cmd");
     my $cmdRv;
     unless ($conf->{'noTransfers'}) {
         my $ph;
-        open ($ph, "$s3_cmd |");
+        open ($ph, "$s3_cmd 2>&1 |");
         while ( <$ph> )
+        {
             chomp;
             $logger->verbose2("transferManifest:Data: $_");
+        }
+    #
     #   Mark the Release Manager entry as done
     #       Need Write access to do this
+    #
     $logger->verbose("Update database: $rtagId");
-    my $rv = executeRmQuery('MarkDone', "UPDATE RELEASE_TAGS SET S3MANIFEST_DONE = 'Y' where RTAG_ID = $rtagId") ;
+    my $rv = executeRmQuery('MarkDone', "UPDATE release_manager.RELEASE_TAGS SET S3MANIFEST_DONE = 'Y' where RTAG_ID = $rtagId") ;
     if ($rv) {
         return;
+    }
+    #
     #   Remove the entry from hash of items to be processed
+    #
     $logger->logmsg("Complete: $targetName");
     delete $activeReleases->{$rtagId};
     unlink $file;
+    $lastTagListUpdate = 0;
     return;
+}
 #-------------------------------------------------------------------------------
 # Function        : checkPackageVersion
 sub getDataFromRm
+{
     my ($name,$m_sqlstr, $options ) = @_;
     my @row;
     my $data;
+    $RMerror = 0;
     if (ref $options ne 'HASH') {
         $options = {};
+    }
+                }
+            }
             $sth->finish();
         } else {
             $logger->warn("Execute failure:$name: $m_sqlstr", $sth->errstr() );
+            $RMerror++;
+            $statistics{dbErrors}++;
+        }
     } else {
         $logger->warn("Prepare failure:$name" );
+        $RMerror++;
+        $statistics{dbErrors}++;
+    }
     if (!$data && $options->{error}) {
         $logger->warn( $options->{error} );
+    }
 sub executeRmQuery
+{
     my ($fname, $m_sqlstr) = @_;
     $logger->verbose3('ExecuteQuery:', $fname);
+    $RMerror = 0;
+    #
     #   Create the full SQL statement
+    #
     my $sth = $RM_DB->prepare($m_sqlstr);
     if ( defined($sth) )
             $sth->finish();
+        }
         else
+        {
             $logger->warn("$fname: Execute failure: $m_sqlstr", $sth->errstr() );
+            $RMerror++;
+            $statistics{dbErrors}++;
             return 1;
+        }
+    }
     else
+    {
         $logger->warn("$fname: Prepare failure");
+        $RMerror++;
+        $statistics{dbErrors}++;
         return 1;
+    }
     return 0;
+}
         # Note: Must match @recoverTags in readStatistics
         $statistics{dayStart} = $time;
         $statistics{txCount} = 0;
         $statistics{txBytes} = 0;
         $statistics{linkErrors} = 0;
+        $statistics{dbErrors} = 0;
+    }
+}
 #-------------------------------------------------------------------------------
 # Function        : readStatistics
+#
 # Returns         :
+#
 sub readStatistics
+{
-    my @recoverTags = qw(dayStart txCount txBytes linkErrors);
+    my @recoverTags = qw(dayStart txCount txBytes linkErrors dbErrors);
     if ($conf->{'statsfile'} and -f $conf->{'statsfile'})
+    {
         if (open my $fh, $conf->{'statsfile'})
+        {
     $statistics{upTime} = $statistics{timeStamp} - $startTime;
     $statistics{wedged} = Utils::isWedged($conf);
     if ( $statistics{wedged}) {
          $statistics{state} = 'Wedged';
+    } elsif(!$dbUp){
+        $statistics{state} = 'RM Access error';
     } elsif(!$linkUp){
         $statistics{state} = 'S3 Bucket Read Error';
     } elsif ($statistics{slowGen}) {
         $statistics{state} = 'Slow manifest generation detected';
     } else {

Subversion Repositories DevTools

(root)/dpkg_blat/trunk/src/blat/blatS3Manifest.pl – Rev 7469 → 7485