ignore lost+found in private directory cleanup

[apt.git] / methods / mirror.cc

diff --git a/methods/mirror.cc b/methods/mirror.cc
index 0a0d07e6b381af72df35b81034e06027f85c372f..01eed09f0fe2999846a662341305cb52ea011a8b 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -3,31 +3,41 @@
 // $Id: mirror.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
 /* ######################################################################
 
 // $Id: mirror.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
 /* ######################################################################
 

-   Mirror Aquire Method - This is the Mirror aquire method for APT.
+   Mirror Acquire Method - This is the Mirror acquire method for APT.

    
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+
+#include <apt-pkg/aptconfiguration.h>

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/error.h>

-#include <apt-pkg/hashes.h>

 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/sourcelist.h>

-
-#include <fstream>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/metaindex.h>
+#include <apt-pkg/strutl.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <algorithm>

 #include <iostream>
 #include <iostream>

-#include <stdarg.h>
+#include <fstream>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <sys/types.h>
+#include <sys/utsname.h>

 #include <dirent.h>
 
 using namespace std;
 
 #include <dirent.h>
 
 using namespace std;
 

+#include<sstream>
+

 #include "mirror.h"
 #include "http.h"
 #include "mirror.h"
 #include "http.h"

-#include "apti18n.h"
+#include <apti18n.h>

                                                                        /*}}}*/
 
 /* Done:
                                                                        /*}}}*/
 
 /* Done:


@@ -39,7 +49,7 @@ using namespace std;
  *   of the failure that is also send to LP
  * 
  * TODO: 
  *   of the failure that is also send to LP
  * 
  * TODO: 

- * - deal with runing as non-root because we can't write to the lists 
+ * - deal with running as non-root because we can't write to the lists

      dir then -> use the cached mirror file
  * - better method to download than having a pkgAcquire interface here
  *   and better error handling there!
      dir then -> use the cached mirror file
  * - better method to download than having a pkgAcquire interface here
  *   and better error handling there!


@@ -48,9 +58,9 @@ using namespace std;
  */
 
 MirrorMethod::MirrorMethod()
  */
 
 MirrorMethod::MirrorMethod()

-   : HttpMethod(), DownloadedMirrorFile(false)
+   : HttpMethod(), DownloadedMirrorFile(false), Debug(false)

 {
 {

-};
+}

 
 // HttpMethod::Configuration - Handle a configuration message          /*{{{*/
 // ---------------------------------------------------------------------
 
 // HttpMethod::Configuration - Handle a configuration message          /*{{{*/
 // ---------------------------------------------------------------------


@@ -80,31 +90,32 @@ bool MirrorMethod::Clean(string Dir)
    pkgSourceList list;
    list.ReadMainList();
 
    pkgSourceList list;
    list.ReadMainList();
 

-   DIR *D = opendir(Dir.c_str());   
+   DIR *D = opendir(Dir.c_str());

    if (D == 0)
       return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
    if (D == 0)
       return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());

-   
+

    string StartDir = SafeGetCWD();
    if (chdir(Dir.c_str()) != 0)
    {
       closedir(D);
       return _error->Errno("chdir",_("Unable to change to %s"),Dir.c_str());
    }
    string StartDir = SafeGetCWD();
    if (chdir(Dir.c_str()) != 0)
    {
       closedir(D);
       return _error->Errno("chdir",_("Unable to change to %s"),Dir.c_str());
    }

-   
+

    for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
    {
       // Skip some files..
       if (strcmp(Dir->d_name,"lock") == 0 ||
          strcmp(Dir->d_name,"partial") == 0 ||
    for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
    {
       // Skip some files..
       if (strcmp(Dir->d_name,"lock") == 0 ||
          strcmp(Dir->d_name,"partial") == 0 ||

+         strcmp(Dir->d_name,"lost+found") == 0 ||

          strcmp(Dir->d_name,".") == 0 ||
          strcmp(Dir->d_name,"..") == 0)
         continue;
 
       // see if we have that uri
          strcmp(Dir->d_name,".") == 0 ||
          strcmp(Dir->d_name,"..") == 0)
         continue;
 
       // see if we have that uri

-      for(I=list.begin(); I != list.end(); I++)
+      for(I=list.begin(); I != list.end(); ++I)

       {
         string uri = (*I)->GetURI();
       {
         string uri = (*I)->GetURI();

-        if(uri.substr(0,strlen("mirror://")) != string("mirror://"))
+        if(uri.compare(0, strlen("mirror://"), "mirror://") != 0)

            continue;
         string BaseUri = uri.substr(0,uri.size()-1);
         if (URItoFileName(BaseUri) == Dir->d_name)
            continue;
         string BaseUri = uri.substr(0,uri.size()-1);
         if (URItoFileName(BaseUri) == Dir->d_name)


@@ -112,70 +123,154 @@ bool MirrorMethod::Clean(string Dir)
       }
       // nothing found, nuke it
       if (I == list.end())
       }
       // nothing found, nuke it
       if (I == list.end())

-        unlink(Dir->d_name);
-   };
-   
-   chdir(StartDir.c_str());
+        RemoveFile("mirror", Dir->d_name);
+   }
+

    closedir(D);
    closedir(D);

-   return true;   
+   if (chdir(StartDir.c_str()) != 0)
+      return _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str());
+   return true;

 }
 
 
 }
 
 

-bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
+bool MirrorMethod::DownloadMirrorFile(string /*mirror_uri_str*/)

 {
 {

-   if(Debug)
-      clog << "MirrorMethod::DownloadMirrorFile(): " << endl;
-
-   // check the file, if it is not older than RefreshInterval just use it
-   // otherwise try to get a new one
-   if(FileExists(MirrorFile)) 
-   {
-      struct stat buf;
-      time_t t,now,refresh;
-      if(stat(MirrorFile.c_str(), &buf) != 0)
-        return false;
-      t = std::max(buf.st_mtime, buf.st_ctime);
-      now = time(NULL);
-      refresh = 60*_config->FindI("Acquire::Mirror::RefreshInterval",360);
-      if(t + refresh > now)
-      {
-        if(Debug)
-           clog << "Mirror file is in RefreshInterval" << endl;
-        DownloadedMirrorFile = true;
-        return true;
-      }
-      if(Debug)
-        clog << "Mirror file " << MirrorFile << " older than " << refresh << "min, re-download it" << endl;
-   }
-
-   // not that great to use pkgAcquire here, but we do not have 
+   // not that great to use pkgAcquire here, but we do not have

    // any other way right now
    string fetch = BaseUri;
    fetch.replace(0,strlen("mirror://"),"http://");
 
    // any other way right now
    string fetch = BaseUri;
    fetch.replace(0,strlen("mirror://"),"http://");
 

+#if 0 // no need for this, the getArchitectures() will also include the main
+      // arch
+   // append main architecture
+   fetch += "?arch=" + _config->Find("Apt::Architecture");
+#endif
+
+   // append all architectures
+   std::vector<std::string> vec = APT::Configuration::getArchitectures();
+   for (std::vector<std::string>::const_iterator I = vec.begin();
+        I != vec.end(); ++I)
+      if (I == vec.begin())
+         fetch += "?arch=" + (*I);
+      else
+         fetch += "&arch=" + (*I);
+
+   // append the dist as a query string
+   if (Dist != "")
+      fetch += "&dist=" + Dist;
+
+   if(Debug)
+      clog << "MirrorMethod::DownloadMirrorFile(): '" << fetch << "'"
+           << " to " << MirrorFile << endl;
+

    pkgAcquire Fetcher;
    new pkgAcqFile(&Fetcher, fetch, "", 0, "", "", "", MirrorFile);
    bool res = (Fetcher.Run() == pkgAcquire::Continue);
    pkgAcquire Fetcher;
    new pkgAcqFile(&Fetcher, fetch, "", 0, "", "", "", MirrorFile);
    bool res = (Fetcher.Run() == pkgAcquire::Continue);

-   if(res)
+   if(res) {

       DownloadedMirrorFile = true;
       DownloadedMirrorFile = true;

+      chmod(MirrorFile.c_str(), 0644);
+   }

    Fetcher.Shutdown();
    Fetcher.Shutdown();

+
+   if(Debug)
+      clog << "MirrorMethod::DownloadMirrorFile() success: " << res << endl;
+

    return res;
 }
 
    return res;
 }
 

-bool MirrorMethod::SelectNextMirror()
+// Randomizes the lines in the mirror file, this is used so that
+// we spread the load on the mirrors evenly
+bool MirrorMethod::RandomizeMirrorFile(string mirror_file)

 {
 {

-   if (AllMirrors.size() < 1)
+   vector<string> content;
+   string line;
+
+   if (!FileExists(mirror_file))

       return false;
 
       return false;
 

-   Mirror = AllMirrors[0];
-   AllMirrors.erase(AllMirrors.begin());
-   if(Debug)
-      cerr << "using mirror: " << Mirror << endl;
+   // read
+   ifstream in(mirror_file.c_str());
+   while ( !in.eof() ) {
+      getline(in, line);
+      content.push_back(line);
+   }
+
+   // we want the file to be random for each different machine, but also
+   // "stable" on the same machine. this is to avoid running into out-of-sync
+   // issues (i.e. Release/Release.gpg different on each mirror)
+   struct utsname buf;
+   int seed=1;
+   if(uname(&buf) == 0) {
+      for(int i=0,seed=1; buf.nodename[i] != 0; ++i) {
+         seed = seed * 31 + buf.nodename[i];
+      }
+   }
+   srand( seed );
+   random_shuffle(content.begin(), content.end());
+
+   // write
+   ofstream out(mirror_file.c_str());
+   while ( !content.empty()) {
+      line = content.back();
+      content.pop_back();
+      out << line << "\n";
+   }

 
 

-   UsedMirror = Mirror;

    return true;
 }
 
    return true;
 }
 

+/* convert a the Queue->Uri back to the mirror base uri and look
+ * at all mirrors we have for this, this is needed as queue->uri
+ * may point to different mirrors (if TryNextMirror() was run)
+ */
+void MirrorMethod::CurrentQueueUriToMirror()
+{
+   // already in mirror:// style so nothing to do
+   if(Queue->Uri.find("mirror://") == 0)
+      return;
+
+   // find current mirror and select next one
+   for (vector<string>::const_iterator mirror = AllMirrors.begin();
+       mirror != AllMirrors.end(); ++mirror)
+   {
+      if (Queue->Uri.find(*mirror) == 0)
+      {
+        Queue->Uri.replace(0, mirror->length(), BaseUri);
+        return;
+      }
+   }
+   _error->Error("Internal error: Failed to convert %s back to %s",
+                Queue->Uri.c_str(), BaseUri.c_str());
+}
+
+bool MirrorMethod::TryNextMirror()
+{
+   // find current mirror and select next one
+   for (vector<string>::const_iterator mirror = AllMirrors.begin();
+       mirror != AllMirrors.end(); ++mirror)
+   {
+      if (Queue->Uri.find(*mirror) != 0)
+        continue;
+
+      vector<string>::const_iterator nextmirror = mirror + 1;
+      if (nextmirror == AllMirrors.end())
+        break;
+      Queue->Uri.replace(0, mirror->length(), *nextmirror);
+      if (Debug)
+        clog << "TryNextMirror: " << Queue->Uri << endl;
+
+      // inform parent
+      UsedMirror = *nextmirror;
+      Log("Switching mirror");
+      return true;
+   }
+
+   if (Debug)
+      clog << "TryNextMirror could not find another mirror to try" << endl;
+
+   return false;
+}
+

 bool MirrorMethod::InitMirrors()
 {
    // if we do not have a MirrorFile, fallback
 bool MirrorMethod::InitMirrors()
 {
    // if we do not have a MirrorFile, fallback


@@ -186,10 +281,17 @@ bool MirrorMethod::InitMirrors()
       return _error->Error(_("No mirror file '%s' found "), MirrorFile.c_str());
    }
 
       return _error->Error(_("No mirror file '%s' found "), MirrorFile.c_str());
    }
 

+   if (access(MirrorFile.c_str(), R_OK) != 0)
+   {
+      // FIXME: fallback to a default mirror here instead 
+      //        and provide a config option to define that default
+      return _error->Error(_("Can not read mirror file '%s'"), MirrorFile.c_str());
+   }  
+

    // FIXME: make the mirror selection more clever, do not 
    //        just use the first one!
    // BUT: we can not make this random, the mirror has to be
    // FIXME: make the mirror selection more clever, do not 
    //        just use the first one!
    // BUT: we can not make this random, the mirror has to be

-   //      stable accross session, because otherwise we can
+   //      stable across session, because otherwise we can

    //      get into sync issues (got indexfiles from mirror A,
    //      but packages from mirror B - one might be out of date etc)
    ifstream in(MirrorFile.c_str());
    //      get into sync issues (got indexfiles from mirror A,
    //      but packages from mirror B - one might be out of date etc)
    ifstream in(MirrorFile.c_str());


@@ -197,9 +299,24 @@ bool MirrorMethod::InitMirrors()
    while (!in.eof()) 
    {
       getline(in, s);
    while (!in.eof()) 
    {
       getline(in, s);

+
+      // ignore lines that start with #
+      if (s.find("#") == 0)
+         continue;
+      // ignore empty lines
+      if (s.size() == 0)
+         continue;
+      // ignore non http lines
+      if (s.compare(0, strlen("http://"), "http://") != 0)
+         continue;
+

       AllMirrors.push_back(s);
    }
       AllMirrors.push_back(s);
    }

-   SelectNextMirror();
+   if (AllMirrors.empty()) {
+       return _error->Error(_("No entry found in mirror file '%s'"), MirrorFile.c_str());
+   }
+   Mirror = AllMirrors[0];
+   UsedMirror = Mirror;

    return true;
 }
 
    return true;
 }
 


@@ -237,7 +354,7 @@ string MirrorMethod::GetMirrorFileName(string mirror_uri_str)
    vector<metaIndex *>::const_iterator I;
    pkgSourceList list;
    list.ReadMainList();
    vector<metaIndex *>::const_iterator I;
    pkgSourceList list;
    list.ReadMainList();

-   for(I=list.begin(); I != list.end(); I++)
+   for(I=list.begin(); I != list.end(); ++I)

    {
       string uristr = (*I)->GetURI();
       if(Debug)
    {
       string uristr = (*I)->GetURI();
       if(Debug)


@@ -250,6 +367,7 @@ string MirrorMethod::GetMirrorFileName(string mirror_uri_str)
         if(Debug)
            std::cerr << "found BaseURI: " << uristr << std::endl;
         BaseUri = uristr.substr(0,uristr.size()-1);
         if(Debug)
            std::cerr << "found BaseURI: " << uristr << std::endl;
         BaseUri = uristr.substr(0,uristr.size()-1);

+         Dist = (*I)->GetDist();

       }
    }
    // get new file
       }
    }
    // get new file


@@ -287,10 +405,11 @@ bool MirrorMethod::Fetch(FetchItem *Itm)
    if(Itm->IndexFile && !DownloadedMirrorFile)
    {
       Clean(_config->FindDir("Dir::State::mirrors"));
    if(Itm->IndexFile && !DownloadedMirrorFile)
    {
       Clean(_config->FindDir("Dir::State::mirrors"));

-      DownloadMirrorFile(Itm->Uri);
+      if (DownloadMirrorFile(Itm->Uri))
+         RandomizeMirrorFile(MirrorFile);

    }
 
    }
 

-   if(Mirror.empty()) {
+   if(AllMirrors.empty()) {

       if(!InitMirrors()) {
         // no valid mirror selected, something went wrong downloading
         // from the master mirror site most likely and there is
       if(!InitMirrors()) {
         // no valid mirror selected, something went wrong downloading
         // from the master mirror site most likely and there is


@@ -298,38 +417,48 @@ bool MirrorMethod::Fetch(FetchItem *Itm)
         return false;
       }
    }
         return false;
       }
    }

-   if(Debug)
-      clog << "selected mirror: " << Mirror << endl;

 
 

+   if(Itm->Uri.find("mirror://") != string::npos)
+      Itm->Uri.replace(0,BaseUri.size(), Mirror);
+
+   if(Debug)
+      clog << "Fetch: " << Itm->Uri << endl << endl;

 
 

-   for (FetchItem *I = Queue; I != 0; I = I->Next)
-   {
-      if(I->Uri.find("mirror://") != string::npos)
-        I->Uri.replace(0,BaseUri.size(), Mirror);
-   }
-   

    // now run the real fetcher
    return HttpMethod::Fetch(Itm);
    // now run the real fetcher
    return HttpMethod::Fetch(Itm);

-};
+}

 
 void MirrorMethod::Fail(string Err,bool Transient)
 {
 
 void MirrorMethod::Fail(string Err,bool Transient)
 {

-   if(Queue->Uri.find("http://") != string::npos)
-      Queue->Uri.replace(0,Mirror.size(), BaseUri);
+   // FIXME: TryNextMirror is not ideal for indexfile as we may
+   //        run into auth issues
+
+   if (Debug)
+      clog << "Failure to get " << Queue->Uri << endl;
+
+   // try the next mirror on fail (if its not a expected failure,
+   // e.g. translations are ok to ignore)
+   if (!Queue->FailIgnore && TryNextMirror())
+      return;
+
+   // all mirrors failed, so bail out
+   string s;
+   strprintf(s, _("[Mirror: %s]"), Mirror.c_str());
+   SetIP(s);
+
+   CurrentQueueUriToMirror();

    pkgAcqMethod::Fail(Err, Transient);
 }
 
 void MirrorMethod::URIStart(FetchResult &Res)
 {
    pkgAcqMethod::Fail(Err, Transient);
 }
 
 void MirrorMethod::URIStart(FetchResult &Res)
 {

-   if(Queue->Uri.find("http://") != string::npos)
-      Queue->Uri.replace(0,Mirror.size(), BaseUri);
+   CurrentQueueUriToMirror();

    pkgAcqMethod::URIStart(Res);
 }
 
 void MirrorMethod::URIDone(FetchResult &Res,FetchResult *Alt)
 {
    pkgAcqMethod::URIStart(Res);
 }
 
 void MirrorMethod::URIDone(FetchResult &Res,FetchResult *Alt)
 {

-   if(Queue->Uri.find("http://") != string::npos)
-      Queue->Uri.replace(0,Mirror.size(), BaseUri);
+   CurrentQueueUriToMirror();

    pkgAcqMethod::URIDone(Res, Alt);
 }
 
    pkgAcqMethod::URIDone(Res, Alt);
 }