summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-03-16 08:24:03 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-03-16 08:24:03 +0100
commit4d8c4b509454d494e0b36f91ecb82f1ce7344923 (patch)
tree59fedcfe8142aba694b9accfadea2b8690d95353
parent30cd298887e196992c155d63ec5a9dc4bafe05b4 (diff)
parentf71c0f2e83d849b85c795a2a4a0056d265abf904 (diff)
* merged from debian/sid, this adds important fixes in the
apt mirror method * mirror method: - when downloading data, show the mirror being used - randomize mirror list after download in a host specific way to ensure that the load is evenly spreaded accross the mirrors - fix some missing "Fail-Ignore"
-rw-r--r--apt-pkg/acquire-item.cc29
-rw-r--r--apt-pkg/acquire-item.h1
-rw-r--r--apt-pkg/acquire-method.cc17
-rw-r--r--apt-pkg/acquire-worker.cc11
-rw-r--r--debian/changelog16
-rw-r--r--methods/mirror.cc47
-rw-r--r--methods/mirror.h1
7 files changed, 111 insertions, 11 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 497edbaac..2ecb8ed6e 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -220,8 +220,8 @@ string pkgAcqSubIndex::Custom600Headers()
struct stat Buf;
if (stat(Final.c_str(),&Buf) != 0)
- return "\nIndex-File: true";
- return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
+ return "\nIndex-File: true\nFail-Ignore: true\n";
+ return "\nIndex-File: true\nFail-Ignore: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
}
/*}}}*/
void pkgAcqSubIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/
@@ -835,10 +835,16 @@ string pkgAcqIndex::Custom600Headers()
if (_config->FindB("Acquire::GzipIndexes",false))
Final += ".gz";
+ string msg = "\nIndex-File: true";
+ // FIXME: this really should use "IndexTarget::IsOptional()" but that
+ // seems to be difficult without breaking ABI
+ if (ShortDesc().find("Translation") != 0)
+ msg += "\nFail-Ignore: true";
struct stat Buf;
if (stat(Final.c_str(),&Buf) != 0)
- return "\nIndex-File: true";
- return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
+ msg += "\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
+
+ return msg;
}
/*}}}*/
void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/
@@ -1538,6 +1544,21 @@ pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire *Owner, /*{{{*/
SigFile = DestFile;
}
/*}}}*/
+// pkgAcqMetaClearSig::Custom600Headers - Insert custom request headers /*{{{*/
+// ---------------------------------------------------------------------
+// FIXME: this can go away once the InRelease file is used widely
+string pkgAcqMetaClearSig::Custom600Headers()
+{
+ string Final = _config->FindDir("Dir::State::lists");
+ Final += URItoFileName(RealURI);
+
+ struct stat Buf;
+ if (stat(Final.c_str(),&Buf) != 0)
+ return "\nIndex-File: true\nFail-Ignore: true\n";
+
+ return "\nIndex-File: true\nFail-Ignore: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
+}
+ /*}}}*/
void pkgAcqMetaClearSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/
{
if (AuthPass == false)
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 2ae7bf27c..f763577ee 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -854,6 +854,7 @@ class pkgAcqMetaClearSig : public pkgAcqMetaIndex
public:
void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual string Custom600Headers();
/** \brief Create a new pkgAcqMetaClearSig. */
pkgAcqMetaClearSig(pkgAcquire *Owner,
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 17d52cf51..fb45d9ee7 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -149,6 +149,8 @@ void pkgAcqMethod::URIStart(FetchResult &Res)
if (Res.ResumePoint != 0)
End += snprintf(End,sizeof(S)-4 - (End - S),"Resume-Point: %lu\n",
Res.ResumePoint);
+ if (UsedMirror.empty() == false)
+ End += snprintf(End,sizeof(S)-4 - (End - S),"UsedMirror: %s\n",UsedMirror.c_str());
strcat(End,"\n");
if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))
@@ -418,9 +420,11 @@ void pkgAcqMethod::Log(const char *Format,...)
// sprintf the description
char S[1024];
- unsigned int Len = snprintf(S,sizeof(S)-4,"101 Log\nURI: %s\n"
- "Message: ",CurrentURI.c_str());
-
+ unsigned int Len = snprintf(S,sizeof(S)-4,"101 Log\n"
+ "URI: %s\n"
+ "UsedMirror: %s\n"
+ "Message: ", UsedMirror.c_str(),
+ CurrentURI.c_str());
vsnprintf(S+Len,sizeof(S)-4-Len,Format,args);
strcat(S,"\n\n");
@@ -442,8 +446,11 @@ void pkgAcqMethod::Status(const char *Format,...)
// sprintf the description
char S[1024];
- unsigned int Len = snprintf(S,sizeof(S)-4,"102 Status\nURI: %s\n"
- "Message: ",CurrentURI.c_str());
+ unsigned int Len = snprintf(S,sizeof(S)-4,"102 Status\n"
+ "URI: %s\n"
+ "UsedMirror: %s\n"
+ "Message: ",UsedMirror.c_str(),
+ CurrentURI.c_str());
vsnprintf(S+Len,sizeof(S)-4-Len,Format,args);
strcat(S,"\n\n");
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 4f0b52af9..ddd8e3101 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -199,6 +199,17 @@ bool pkgAcquire::Worker::RunMessages()
pkgAcquire::Queue::QItem *Itm = 0;
if (URI.empty() == false)
Itm = OwnerQ->FindItem(URI,this);
+
+ // update used mirror
+ string UsedMirror = LookupTag(Message,"UsedMirror", "");
+ if (!UsedMirror.empty() &&
+ Itm &&
+ Itm->Description.find(" ") != string::npos)
+ {
+ Itm->Description.replace(0, Itm->Description.find(" "), UsedMirror);
+ // FIXME: will we need this as well?
+ //Itm->ShortDesc = UsedMirror;
+ }
// Determine the message number and dispatch
switch (Number)
diff --git a/debian/changelog b/debian/changelog
index ae50ad20c..84151715a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-apt (0.8.13) UNRELEASED; urgency=low
+apt (0.8.13ubuntu1) UNRELEASED; urgency=low
+
+ * merged from debian/sid, this adds important fixes in the
+ apt mirror method
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 16 Mar 2011 08:23:19 +0100
+
+apt (0.8.13) unstable; urgency=low
[ Thorsten Spindler ]
* methods/rsh.cc
@@ -11,8 +18,13 @@ apt (0.8.13) UNRELEASED; urgency=low
user to insert the CD on each apt-get update
* po/sl.po:
- updated, thanks to Andrej Znidarsic
+ * mirror method:
+ - when downloading data, show the mirror being used
+ - randomize mirror list after download in a host specific way
+ to ensure that the load is evenly spreaded accross the mirrors
+ - fix some missing "Fail-Ignore"
- -- Michael Vogt <mvo@debian.org> Mon, 14 Mar 2011 13:17:08 +0100
+ -- Michael Vogt <mvo@debian.org> Wed, 16 Mar 2011 08:04:42 +0100
apt (0.8.12ubuntu2) unstable; urgency=low
diff --git a/methods/mirror.cc b/methods/mirror.cc
index d092cc657..e499b054b 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -16,11 +16,15 @@
#include <apt-pkg/hashes.h>
#include <apt-pkg/sourcelist.h>
+
+#include <algorithm>
#include <fstream>
#include <iostream>
+
#include <stdarg.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/utsname.h>
#include <dirent.h>
using namespace std;
@@ -147,6 +151,44 @@ 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);
+ }
+
+ // 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, i;
+ if(uname(&buf) == 0) {
+ for(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";
+ }
+
+ 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)
@@ -186,6 +228,10 @@ bool MirrorMethod::TryNextMirror()
Queue->Uri.replace(0, mirror->length(), *nextmirror);
if (Debug)
clog << "TryNextMirror: " << Queue->Uri << endl;
+
+ // inform parent
+ UsedMirror = *nextmirror;
+ Log("Switching mirror");
return true;
}
@@ -309,6 +355,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 0a3ea6e92..bd807e122 100644
--- 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();