diff options
| -rw-r--r-- | apt-pkg/acquire.cc | 30 | ||||
| -rwxr-xr-x | test/integration/test-pdiff-usage | 6 |
2 files changed, 26 insertions, 10 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 757fab057..c65aef329 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -352,23 +352,37 @@ string pkgAcquire::QueueName(string Uri,MethodConfig const *&Config) return U.Access; string AccessSchema = U.Access + ':'; - string FullQueueName; + string FullQueueName; if (U.Host.empty()) { - long randomQueue = random(); + long existing = 0; + // check how many queues exist already and reuse empty ones + for (Queue const *I = Queues; I != 0; I = I->Next) + if (I->Name.compare(0, AccessSchema.length(), AccessSchema) == 0) + { + if (I->Items == nullptr) + return I->Name; + ++existing; + } + #ifdef _SC_NPROCESSORS_ONLN long cpuCount = sysconf(_SC_NPROCESSORS_ONLN) * 2; #else - long cpuCount = _config->FindI("Acquire::QueueHost::Limit",10); + long cpuCount = 10; #endif - if (cpuCount > 0) - randomQueue %= cpuCount; + cpuCount = _config->FindI("Acquire::QueueHost::Limit", cpuCount); - strprintf(FullQueueName, "%s%ld", AccessSchema.c_str(), randomQueue); - if (Debug) { - clog << "Chose random queue " << FullQueueName << " for " << Uri << endl; + if (cpuCount <= 0 || existing < cpuCount) + strprintf(FullQueueName, "%s%ld", AccessSchema.c_str(), existing); + else + { + long const randomQueue = random() % cpuCount; + strprintf(FullQueueName, "%s%ld", AccessSchema.c_str(), randomQueue); } + + if (Debug) + clog << "Chose random queue " << FullQueueName << " for " << Uri << endl; } else { FullQueueName = AccessSchema + U.Host; diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index 4e2d1f182..f219b9193 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -30,7 +30,7 @@ echo 'hacked' > aptarchive/hacked-i386 compressfile aptarchive/hacked-i386 wasmergeused() { - testsuccess apt update "$@" + testsuccess apt update "$@" -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1 -o Debug::pkgAcquire=1 msgtest 'No intermediate patch files' 'still exist' local EDS="$(find rootdir/var/lib/apt/lists -name '*.ed' -o -name '*.ed.*')" @@ -61,6 +61,8 @@ wasmergeused() { else msgpass fi + + testequal '1' grep -c rred:601 rootdir/tmp/testsuccess.output } testrun() { @@ -214,7 +216,7 @@ SHA256-Download: cp Packages-future aptarchive/Packages rm -f rootdir/var/lib/apt/lists/*_Contents-* webserverconfig 'aptwebserver::overwrite::.*Contents-.*::filename' '/hacked-i386.gz' - testfailure apt update "$@" -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1 + testfailure apt update "$@" webserverconfig 'aptwebserver::overwrite::.*Contents-.*::filename' '/Contents-i386.gz' cp rootdir/tmp/testfailure.output patchdownload.output testfailure grep 'rred:600' patchdownload.output |