randomize mirror list to ensure more even load

diff --git a/debian/changelog b/debian/changelog
index efa7be76306f3ce224255bfe7a80ce14b19c2350..d9a20765ff45b17ed08a0c2eee53e1a9dc1d5064 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ apt (0.8.13) unstable; urgency=low
       user to insert the CD on each apt-get update
   * mirror method:
     - when downloading data, show the mirror being used
+    - randomize mirror list to ensure more even load
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100
 

diff --git a/methods/mirror.cc b/methods/mirror.cc
index 5a53d3c819fd44606f96dc03ecfb136b895c23cf..08a603207191d232090c643d6afdb01f92a02b09 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -17,6 +17,7 @@
 #include <apt-pkg/sourcelist.h>
 
 #include <fstream>
+#include <algorithm>
 #include <iostream>
 #include <stdarg.h>
 #include <sys/stat.h>
@@ -147,6 +148,34 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
    return res;
 }
 
+// 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)
+{
+   vector<string> content;
+   string line;
+
+   // read 
+   ifstream in(mirror_file.c_str());
+   while ( ! in.eof() ) {
+      getline(in, line);
+      content.push_back(line);
+   }
+   
+   // randomize
+   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";
+   }
+
+   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)
@@ -313,6 +342,7 @@ bool MirrorMethod::Fetch(FetchItem *Itm)
    {
       Clean(_config->FindDir("Dir::State::mirrors"));
       DownloadMirrorFile(Itm->Uri);
+      RandomizeMirrorFile(MirrorFile);
    }
 
    if(AllMirrors.empty()) {

diff --git a/methods/mirror.h b/methods/mirror.h
index 0a3ea6e92ae16f0e3df8f428ee2bd506e9503b5e..bd807e1227c0f84b4bf92bf24753337541f2d88b 100644 (file)
--- a/methods/mirror.h
+++ b/methods/mirror.h
@@ -34,6 +34,7 @@ class MirrorMethod : public HttpMethod
 
  protected:
    bool DownloadMirrorFile(string uri);
+   bool RandomizeMirrorFile(string file);
    string GetMirrorFileName(string uri);
    bool InitMirrors();
    bool TryNextMirror();