show more details for "Writing more data" errors, too

[apt.git] / apt-pkg / acquire-worker.cc

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index b5f52a3caf6781aaa62f751a57f82de25b962dbd..69ca6a28e19a8740c72634bb1ef2dcbae9775648 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -42,29 +42,16 @@
 using namespace std;
 
 // Worker::Worker - Constructor for Queue startup                      /*{{{*/
 using namespace std;
 
 // Worker::Worker - Constructor for Queue startup                      /*{{{*/

-// ---------------------------------------------------------------------
-/* */
-pkgAcquire::Worker::Worker(Queue *Q,MethodConfig *Cnf,
-                          pkgAcquireStatus *log) : d(NULL), Log(log)
+pkgAcquire::Worker::Worker(Queue *Q, MethodConfig *Cnf, pkgAcquireStatus *log) :
+   d(NULL), OwnerQ(Q), Log(log), Config(Cnf), Access(Cnf->Access),
+   CurrentItem(nullptr), CurrentSize(0), TotalSize(0)

 {
 {

-   OwnerQ = Q;
-   Config = Cnf;
-   Access = Cnf->Access;
-   CurrentItem = 0;
-   TotalSize = 0;
-   CurrentSize = 0;
-

    Construct();
 }
                                                                        /*}}}*/
 // Worker::Worker - Constructor for method config startup              /*{{{*/
    Construct();
 }
                                                                        /*}}}*/
 // Worker::Worker - Constructor for method config startup              /*{{{*/

-// ---------------------------------------------------------------------
-/* */
-pkgAcquire::Worker::Worker(MethodConfig *Cnf) : d(NULL), OwnerQ(NULL), Config(Cnf),
-                                               Access(Cnf->Access), CurrentItem(NULL),
-                                               CurrentSize(0), TotalSize(0)
+pkgAcquire::Worker::Worker(MethodConfig *Cnf) : Worker(nullptr, Cnf, nullptr)

 {
 {

-   Construct();

 }
                                                                        /*}}}*/
 // Worker::Construct - Constructor helper                              /*{{{*/
 }
                                                                        /*}}}*/
 // Worker::Construct - Constructor helper                              /*{{{*/


@@ -185,6 +172,25 @@ bool pkgAcquire::Worker::ReadMessages()
 // ---------------------------------------------------------------------
 /* This takes the messages from the message queue and runs them through
    the parsers in order. */
 // ---------------------------------------------------------------------
 /* This takes the messages from the message queue and runs them through
    the parsers in order. */

+enum class APT_HIDDEN MessageType {
+   CAPABILITIES = 100,
+   LOG = 101,
+   STATUS = 102,
+   REDIRECT = 103,
+   WARNING = 104,
+   URI_START = 200,
+   URI_DONE = 201,
+   URI_FAILURE = 400,
+   GENERAL_FAILURE = 401,
+   MEDIA_CHANGE = 403
+};
+static bool isDoomedItem(pkgAcquire::Item const * const Itm)
+{
+   auto const TransItm = dynamic_cast<pkgAcqTransactionItem const * const>(Itm);
+   if (TransItm == nullptr)
+      return false;
+   return TransItm->TransactionManager->State != pkgAcqTransactionItem::TransactionStarted;
+}

 bool pkgAcquire::Worker::RunMessages()
 {
    while (MessageQueue.empty() == false)
 bool pkgAcquire::Worker::RunMessages()
 {
    while (MessageQueue.empty() == false)


@@ -197,7 +203,7 @@ bool pkgAcquire::Worker::RunMessages()
 
       // Fetch the message number
       char *End;
 
       // Fetch the message number
       char *End;

-      int Number = strtol(Message.c_str(),&End,10);
+      MessageType const Number = static_cast<MessageType>(strtoul(Message.c_str(),&End,10));

       if (End == Message.c_str())
         return _error->Error("Invalid message from method %s: %s",Access.c_str(),Message.c_str());
 
       if (End == Message.c_str())
         return _error->Error("Invalid message from method %s: %s",Access.c_str(),Message.c_str());
 


@@ -223,27 +229,23 @@ bool pkgAcquire::Worker::RunMessages()
       // Determine the message number and dispatch
       switch (Number)
       {
       // Determine the message number and dispatch
       switch (Number)
       {

-        // 100 Capabilities
-        case 100:
+        case MessageType::CAPABILITIES:

         if (Capabilities(Message) == false)
            return _error->Error("Unable to process Capabilities message from %s",Access.c_str());
         break;
 
         if (Capabilities(Message) == false)
            return _error->Error("Unable to process Capabilities message from %s",Access.c_str());
         break;
 

-        // 101 Log
-        case 101:
+        case MessageType::LOG:

         if (Debug == true)
            clog << " <- (log) " << LookupTag(Message,"Message") << endl;
         break;
 
         if (Debug == true)
            clog << " <- (log) " << LookupTag(Message,"Message") << endl;
         break;
 

-        // 102 Status
-        case 102:
+        case MessageType::STATUS:

         Status = LookupTag(Message,"Message");
         break;
 
         Status = LookupTag(Message,"Message");
         break;
 

-         // 103 Redirect
-         case 103:
+        case MessageType::REDIRECT:

          {
          {

-            if (Itm == 0)
+            if (Itm == nullptr)

             {
                _error->Error("Method gave invalid 103 Redirect message");
                break;
             {
                _error->Error("Method gave invalid 103 Redirect message");
                break;


@@ -261,11 +263,13 @@ bool pkgAcquire::Worker::RunMessages()
            // and then put it in the main queue again
            std::vector<Item*> const ItmOwners = Itm->Owners;
            OwnerQ->ItemDone(Itm);
            // and then put it in the main queue again
            std::vector<Item*> const ItmOwners = Itm->Owners;
            OwnerQ->ItemDone(Itm);

-           Itm = NULL;
-           for (pkgAcquire::Queue::QItem::owner_iterator O = ItmOwners.begin(); O != ItmOwners.end(); ++O)
+           Itm = nullptr;
+           for (auto const &Owner: ItmOwners)

            {
            {

-              pkgAcquire::Item *Owner = *O;

               pkgAcquire::ItemDesc &desc = Owner->GetItemDesc();
               pkgAcquire::ItemDesc &desc = Owner->GetItemDesc();

+              if (Log != nullptr)
+                 Log->Done(desc);
+

               // if we change site, treat it as a mirror change
               if (URI::SiteOnly(NewURI) != URI::SiteOnly(desc.URI))
               {
               // if we change site, treat it as a mirror change
               if (URI::SiteOnly(NewURI) != URI::SiteOnly(desc.URI))
               {


@@ -283,18 +287,19 @@ bool pkgAcquire::Worker::RunMessages()
                  }
               }
               desc.URI = NewURI;
                  }
               }
               desc.URI = NewURI;

-              OwnerQ->Owner->Enqueue(desc);
-
-              if (Log != 0)
-                 Log->Done(desc);
+              if (isDoomedItem(Owner) == false)
+                 OwnerQ->Owner->Enqueue(desc);

            }
             break;
          }
 
            }
             break;
          }
 

-        // 200 URI Start
-        case 200:
+        case MessageType::WARNING:
+           _error->Warning("%s: %s", Itm->Owner->DescURI().c_str(), LookupTag(Message,"Message").c_str());
+           break;
+
+        case MessageType::URI_START:

         {
         {

-           if (Itm == 0)
+           if (Itm == nullptr)

            {
               _error->Error("Method gave invalid 200 URI Start message");
               break;
            {
               _error->Error("Method gave invalid 200 URI Start message");
               break;


@@ -304,26 +309,24 @@ bool pkgAcquire::Worker::RunMessages()
            CurrentSize = 0;
            TotalSize = strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10);
            ResumePoint = strtoull(LookupTag(Message,"Resume-Point","0").c_str(), NULL, 10);
            CurrentSize = 0;
            TotalSize = strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10);
            ResumePoint = strtoull(LookupTag(Message,"Resume-Point","0").c_str(), NULL, 10);

-           for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+           for (auto const Owner: Itm->Owners)

            {
            {

-              (*O)->Start(Message, TotalSize);
-
+              Owner->Start(Message, TotalSize);

               // Display update before completion
               // Display update before completion

-              if (Log != 0)
+              if (Log != nullptr)

               {
                  if (Log->MorePulses == true)
               {
                  if (Log->MorePulses == true)

-                    Log->Pulse((*O)->GetOwner());
-                 Log->Fetch((*O)->GetItemDesc());
+                    Log->Pulse(Owner->GetOwner());
+                 Log->Fetch(Owner->GetItemDesc());

               }
            }
 
            break;
         }
 
               }
            }
 
            break;
         }
 

-        // 201 URI Done
-        case 201:
+        case MessageType::URI_DONE:

         {
         {

-           if (Itm == 0)
+           if (Itm == nullptr)

            {
               _error->Error("Method gave invalid 201 URI Done message");
               break;
            {
               _error->Error("Method gave invalid 201 URI Done message");
               break;


@@ -372,9 +375,8 @@ bool pkgAcquire::Worker::RunMessages()
 
            bool const isIMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false) ||
               StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false);
 
            bool const isIMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false) ||
               StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false);

-           for (pkgAcquire::Queue::QItem::owner_iterator O = ItmOwners.begin(); O != ItmOwners.end(); ++O)
+           for (auto const Owner: ItmOwners)

            {
            {

-              pkgAcquire::Item * const Owner = *O;

               HashStringList const ExpectedHashes = Owner->GetExpectedHashes();
               if(_config->FindB("Debug::pkgAcquire::Auth", false) == true)
               {
               HashStringList const ExpectedHashes = Owner->GetExpectedHashes();
               if(_config->FindB("Debug::pkgAcquire::Auth", false) == true)
               {


@@ -421,10 +423,12 @@ bool pkgAcquire::Worker::RunMessages()
               else // hashsum mismatch
                  Owner->Status = pkgAcquire::Item::StatAuthError;
 
               else // hashsum mismatch
                  Owner->Status = pkgAcquire::Item::StatAuthError;
 

+

               if (consideredOkay == true)
               {
               if (consideredOkay == true)
               {

-                 Owner->Done(Message, ReceivedHashes, Config);
-                 if (Log != 0)
+                 if (isDoomedItem(Owner) == false)
+                    Owner->Done(Message, ReceivedHashes, Config);
+                 if (Log != nullptr)

                  {
                     if (isIMSHit)
                        Log->IMSHit(Owner->GetItemDesc());
                  {
                     if (isIMSHit)
                        Log->IMSHit(Owner->GetItemDesc());


@@ -434,8 +438,12 @@ bool pkgAcquire::Worker::RunMessages()
               }
               else
               {
               }
               else
               {

-                 Owner->Failed(Message,Config);
-                 if (Log != 0)
+                 if (isDoomedItem(Owner) == false)
+                 {
+                    Message.append("\nFailReason: HashSumMismatch");
+                    Owner->Failed(Message,Config);
+                 }
+                 if (Log != nullptr)

                     Log->Fail(Owner->GetItemDesc());
               }
            }
                     Log->Fail(Owner->GetItemDesc());
               }
            }


@@ -443,10 +451,9 @@ bool pkgAcquire::Worker::RunMessages()
            break;
         }
 
            break;
         }
 

-        // 400 URI Failure
-        case 400:
+        case MessageType::URI_FAILURE:

         {
         {

-           if (Itm == 0)
+           if (Itm == nullptr)

            {
               std::string const msg = LookupTag(Message,"Message");
               _error->Error("Method gave invalid 400 URI Failure message: %s", msg.c_str());
            {
               std::string const msg = LookupTag(Message,"Message");
               _error->Error("Method gave invalid 400 URI Failure message: %s", msg.c_str());


@@ -456,43 +463,51 @@ bool pkgAcquire::Worker::RunMessages()
            PrepareFiles("400::URIFailure", Itm);
 
            // Display update before completion
            PrepareFiles("400::URIFailure", Itm);
 
            // Display update before completion

-           if (Log != 0 && Log->MorePulses == true)
+           if (Log != nullptr && Log->MorePulses == true)

               for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
                  Log->Pulse((*O)->GetOwner());
 
            std::vector<Item*> const ItmOwners = Itm->Owners;
            OwnerQ->ItemDone(Itm);
               for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
                  Log->Pulse((*O)->GetOwner());
 
            std::vector<Item*> const ItmOwners = Itm->Owners;
            OwnerQ->ItemDone(Itm);

-           Itm = NULL;
+           Itm = nullptr;

 
 

-           bool errTransient;
+           bool errTransient = false, errAuthErr = false;

            {
               std::string const failReason = LookupTag(Message, "FailReason");
            {
               std::string const failReason = LookupTag(Message, "FailReason");

-              std::string const reasons[] = { "Timeout", "ConnectionRefused",
-                 "ConnectionTimedOut", "ResolveFailure", "TmpResolveFailure" };
-              errTransient = std::find(std::begin(reasons), std::end(reasons), failReason) != std::end(reasons);
+              {
+                 auto const reasons = { "Timeout", "ConnectionRefused",
+                    "ConnectionTimedOut", "ResolveFailure", "TmpResolveFailure" };
+                 errTransient = std::find(std::begin(reasons), std::end(reasons), failReason) != std::end(reasons);
+              }
+              if (errTransient == false)
+              {
+                 auto const reasons = { "HashSumMismatch", "MaximumSizeExceeded" };
+                 errAuthErr = std::find(std::begin(reasons), std::end(reasons), failReason) != std::end(reasons);
+              }

            }
 
            }
 

-           for (pkgAcquire::Queue::QItem::owner_iterator O = ItmOwners.begin(); O != ItmOwners.end(); ++O)
+           for (auto const Owner: ItmOwners)

            {
            {

-              if (errTransient)
-                 (*O)->Status = pkgAcquire::Item::StatTransientNetworkError;
-              (*O)->Failed(Message,Config);
+              if (errAuthErr && Owner->GetExpectedHashes().empty() == false)
+                 Owner->Status = pkgAcquire::Item::StatAuthError;
+              else if (errTransient)
+                 Owner->Status = pkgAcquire::Item::StatTransientNetworkError;

 
 

-              if (Log != 0)
-                 Log->Fail((*O)->GetItemDesc());
+              if (isDoomedItem(Owner) == false)
+                 Owner->Failed(Message,Config);
+              if (Log != nullptr)
+                 Log->Fail(Owner->GetItemDesc());

            }
            ItemDone();
 
            break;
         }
 
            }
            ItemDone();
 
            break;
         }
 

-        // 401 General Failure
-        case 401:
+        case MessageType::GENERAL_FAILURE:

         _error->Error("Method %s General failure: %s",Access.c_str(),LookupTag(Message,"Message").c_str());
         break;
 
         _error->Error("Method %s General failure: %s",Access.c_str(),LookupTag(Message,"Message").c_str());
         break;
 

-        // 403 Media Change
-        case 403:
+        case MessageType::MEDIA_CHANGE:

         MediaChange(Message);
         break;
       }
         MediaChange(Message);
         break;
       }


@@ -639,7 +654,7 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
 
    if (RealFileExists(Item->Owner->DestFile))
    {
 
    if (RealFileExists(Item->Owner->DestFile))
    {

-      std::string SandboxUser = _config->Find("APT::Sandbox::User");
+      std::string const SandboxUser = _config->Find("APT::Sandbox::User");

       ChangeOwnerAndPermissionOfFile("Item::QueueURI", Item->Owner->DestFile.c_str(),
                                      SandboxUser.c_str(), "root", 0600);
    }
       ChangeOwnerAndPermissionOfFile("Item::QueueURI", Item->Owner->DestFile.c_str(),
                                      SandboxUser.c_str(), "root", 0600);
    }