Retry support

Author: jgg
Date: 1999-01-30 08:08:54 GMT
Retry support

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index d7bcc041be8c0f1f7556b208de4c964bbd1d1096..0883c296d27edfaa00a5c951f384c4009573afc1 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-item.cc,v 1.19 1999/01/27 02:48:52 jgg Exp $
+// $Id: acquire-item.cc,v 1.20 1999/01/30 08:08:54 jgg Exp $

 /* ######################################################################
 
    Acquire Item - Item to acquire
 /* ######################################################################
 
    Acquire Item - Item to acquire


@@ -51,16 +51,17 @@ pkgAcquire::Item::~Item()
 // ---------------------------------------------------------------------
 /* We return to an idle state if there are still other queues that could
    fetch this object */
 // ---------------------------------------------------------------------
 /* We return to an idle state if there are still other queues that could
    fetch this object */

-void pkgAcquire::Item::Failed(string Message)
+void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)

 {
    Status = StatIdle;
    ErrorText = LookupTag(Message,"Message");
    if (QueueCounter <= 1)
    {
       /* This indicates that the file is not available right now but might
 {
    Status = StatIdle;
    ErrorText = LookupTag(Message,"Message");
    if (QueueCounter <= 1)
    {
       /* This indicates that the file is not available right now but might

-         be sometime later. If we do a retry cycle then this should be 
+         be sometime later. If we do a retry cycle then this should be

         retried */
         retried */

-      if (StringToBool(LookupTag(Message,"Transient-Failure"),false) == true)
+      if (Cnf->LocalOnly == true &&
+         StringToBool(LookupTag(Message,"Transient-Failure"),false) == true)

       {
         Status = StatIdle;
         Owner->Dequeue(this);
       {
         Status = StatIdle;
         Owner->Dequeue(this);


@@ -338,6 +339,8 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources,
                Item(Owner), Version(Version), Sources(Sources), Recs(Recs), 
                StoreFilename(StoreFilename), Vf(Version.FileList())
 {
                Item(Owner), Version(Version), Sources(Sources), Recs(Recs), 
                StoreFilename(StoreFilename), Vf(Version.FileList())
 {

+   Retries = _config->FindI("Acquire::Retries",0);
+      

    // Select a source
    if (QueueNext() == false && _error->PendingError() == false)
       _error->Error("I wasn't able to locate file for the %s package. "
    // Select a source
    if (QueueNext() == false && _error->PendingError() == false)
       _error->Error("I wasn't able to locate file for the %s package. "


@@ -477,10 +480,23 @@ string pkgAcqArchive::Describe()
 // AcqArchive::Failed - Failure handler                                        /*{{{*/
 // ---------------------------------------------------------------------
 /* Here we try other sources */
 // AcqArchive::Failed - Failure handler                                        /*{{{*/
 // ---------------------------------------------------------------------
 /* Here we try other sources */

-void pkgAcqArchive::Failed(string Message)
+void pkgAcqArchive::Failed(string Message,pkgAcquire::MethodConfig *Cnf)

 {
    ErrorText = LookupTag(Message,"Message");
    if (QueueNext() == false)
 {
    ErrorText = LookupTag(Message,"Message");
    if (QueueNext() == false)

-      Item::Failed(Message);
+   {
+      // This is the retry counter
+      if (Retries != 0 &&
+         Cnf->LocalOnly == false &&
+         StringToBool(LookupTag(Message,"Transient-Failure"),false) == true)
+      {
+        Retries--;
+        Vf = Version.FileList();
+        if (QueueNext() == true)
+           return;
+      }
+      
+      Item::Failed(Message,Cnf);
+   }

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 676766dbc1255f4dfc0eb7a57890224b0da5ff59..8b6889c4d5bc47c1065f78d54a710341b1ec401c 100644 (file)
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-item.h,v 1.13 1999/01/30 06:07:24 jgg Exp $
+// $Id: acquire-item.h,v 1.14 1999/01/30 08:08:54 jgg Exp $

 /* ######################################################################
 
    Acquire Item - Item to acquire
 /* ######################################################################
 
    Acquire Item - Item to acquire


@@ -55,8 +55,8 @@ class pkgAcquire::Item
    
    // File to write the fetch into
    string DestFile;
    
    // File to write the fetch into
    string DestFile;

-   
-   virtual void Failed(string Message);
+
+   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);

    virtual void Done(string Message,unsigned long Size,string Md5Hash);
    virtual void Start(string Message,unsigned long Size);
    virtual string MD5Sum() {return string();};
    virtual void Done(string Message,unsigned long Size,string Md5Hash);
    virtual void Start(string Message,unsigned long Size);
    virtual string MD5Sum() {return string();};


@@ -116,12 +116,13 @@ class pkgAcqArchive : public pkgAcquire::Item
    string MD5;
    string &StoreFilename;
    pkgCache::VerFileIterator Vf;
    string MD5;
    string &StoreFilename;
    pkgCache::VerFileIterator Vf;

+   unsigned int Retries;

    
    bool QueueNext();
    
    public:
    
    
    bool QueueNext();
    
    public:
    

-   virtual void Failed(string Message);
+   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);

    virtual string MD5Sum() {return MD5;};
    virtual void Done(string Message,unsigned long Size,string Md5Hash);
    virtual string Describe();
    virtual string MD5Sum() {return MD5;};
    virtual void Done(string Message,unsigned long Size,string Md5Hash);
    virtual string Describe();

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 1ac6e8528d164c28af9909b54b9ff62dddf2086b..099a43e2ec214142ef878d047039cab7f20935a9 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-worker.cc,v 1.18 1999/01/27 02:48:52 jgg Exp $
+// $Id: acquire-worker.cc,v 1.19 1999/01/30 08:08:54 jgg Exp $

 /* ######################################################################
 
    Acquire Worker 
 /* ######################################################################
 
    Acquire Worker 


@@ -281,12 +281,12 @@ bool pkgAcquire::Worker::RunMessages()
            pkgAcquire::Item *Owner = Itm->Owner;
            pkgAcquire::ItemDesc Desc = *Itm;
            OwnerQ->ItemDone(Itm);
            pkgAcquire::Item *Owner = Itm->Owner;
            pkgAcquire::ItemDesc Desc = *Itm;
            OwnerQ->ItemDone(Itm);

-           Owner->Failed(Message);
+           Owner->Failed(Message,Config);

            ItemDone();
            ItemDone();

-           
+

            if (Log != 0)
               Log->Fail(Desc);
            if (Log != 0)
               Log->Fail(Desc);

-           
+

            break;
         }       
         
            break;
         }       
         

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 8b1f522f9f5137d00f8ab935499aad1e0f6f9c89..6457fa6594642724d9c6a8e4f6a096e78392faa9 100644 (file)
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire.cc,v 1.25 1999/01/30 06:07:24 jgg Exp $
+// $Id: acquire.cc,v 1.26 1999/01/30 08:08:54 jgg Exp $

 /* ######################################################################
 
    Acquire - File Acquiration
 /* ######################################################################
 
    Acquire - File Acquiration


@@ -563,7 +563,7 @@ bool pkgAcquire::Queue::Shutdown()
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-// Queue::Finditem - Find a URI in the item list                       /*{{{*/
+// Queue::FindItem - Find a URI in the item list                       /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 pkgAcquire::Queue::QItem *pkgAcquire::Queue::FindItem(string URI,pkgAcquire::Worker *Owner)
 // ---------------------------------------------------------------------
 /* */
 pkgAcquire::Queue::QItem *pkgAcquire::Queue::FindItem(string URI,pkgAcquire::Worker *Owner)

diff --git a/doc/apt.conf.5.yo b/doc/apt.conf.5.yo
index 1488cc742c2b4fc0e43779827f5115bfcba9410e..2eb2bbf456ca9d939509207fd7ed833958eaf67c 100644 (file)
--- a/doc/apt.conf.5.yo
+++ b/doc/apt.conf.5.yo
@@ -72,6 +72,10 @@ determins how APT parallelizes outgoing connections. bf(host) means that
 one connection per target host will be opened, bf(access) means that one
 connection per URI type will be opened.
 
 one connection per target host will be opened, bf(access) means that one
 connection per URI type will be opened.
 

+dit(bf(Retries))
+Number of retries to perform. If this is non-zero apt will retry failed 
+files the given number of times.
+

 dit(bf(http))
 HTTP URIs; http::Proxy is the default http proxy to use. It is in the standard
 form of em(http://[[user][:pass]@]host[:port]/). Per host proxies can also
 dit(bf(http))
 HTTP URIs; http::Proxy is the default http proxy to use. It is in the standard
 form of em(http://[[user][:pass]@]host[:port]/). Per host proxies can also

diff --git a/doc/examples/apt.conf b/doc/examples/apt.conf
index 57292b8fc9471b903db21ebd1e973cff84db820a..68b896e42aa246515fc1e0361cedb8cfd870ac20 100644 (file)
--- a/doc/examples/apt.conf
+++ b/doc/examples/apt.conf
@@ -1,4 +1,4 @@
-// $Id: apt.conf,v 1.19 1998/12/14 04:00:34 jgg Exp $
+// $Id: apt.conf,v 1.20 1999/01/30 08:08:54 jgg Exp $

 /* This file is an index of all APT configuration directives. It should
    NOT actually be used as a real config file, though it is a completely
    valid file.
 /* This file is an index of all APT configuration directives. It should
    NOT actually be used as a real config file, though it is a completely
    valid file.


@@ -29,6 +29,7 @@ APT {
      Fix-Missing "false";     
      Show-Upgraded "false";
      No-Upgrade "false";
      Fix-Missing "false";     
      Show-Upgraded "false";
      No-Upgrade "false";

+     Print-URIs "false";

   };
 
   Cache {
   };
 
   Cache {


@@ -50,6 +51,7 @@ APT {
 Acquire
 {
   Queue-Mode "host";       // host|access
 Acquire
 {
   Queue-Mode "host";       // host|access

+  Retry "false";

   
   // HTTP method configuration
   http 
   
   // HTTP method configuration
   http