Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Metalink #2

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions cvmfs/mountpoint.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1417,7 +1417,13 @@ bool MountPoint::CreateDownloadManagers() {
download_mgr_->SetFailoverIndefinitely();
}

if (options_mgr_->GetValue("CVMFS_SERVER_URL", &optarg)) {
if (options_mgr_->GetValue("CVMFS_METALINK_URL", &optarg)) {
download_mgr_->SetMetalinkChain(optarg);
// host chain will be set later when the metalink server is contacted
download_mgr_->SetHostChain("");
// metalink requires redirects
download_mgr_->EnableRedirects();
} else if (options_mgr_->GetValue("CVMFS_SERVER_URL", &optarg)) {
download_mgr_->SetHostChain(optarg);
}

Expand Down Expand Up @@ -2138,7 +2144,13 @@ bool MountPoint::SetupExternalDownloadMgr(bool dogeosort) {
}
external_download_mgr_->SetTimeout(timeout, timeout_direct);

if (options_mgr_->GetValue("CVMFS_EXTERNAL_URL", &optarg)) {
if (options_mgr_->GetValue("CVMFS_EXTERNAL_METALINK", &optarg)) {
external_download_mgr_->SetMetalinkChain(optarg);
// host chain will be set later when the metalink server is contacted
external_download_mgr_->SetHostChain("");
// metalink requires redirects
external_download_mgr_->EnableRedirects();
} else if (options_mgr_->GetValue("CVMFS_EXTERNAL_URL", &optarg)) {
external_download_mgr_->SetHostChain(optarg);
if (dogeosort) {
std::vector<std::string> host_chain;
Expand Down Expand Up @@ -2208,8 +2220,13 @@ void MountPoint::SetupHttpTuning() {

if (options_mgr_->GetValue("CVMFS_LOW_SPEED_LIMIT", &optarg))
download_mgr_->SetLowSpeedLimit(String2Uint64(optarg));
if (options_mgr_->GetValue("CVMFS_PROXY_RESET_AFTER", &optarg))
if (options_mgr_->GetValue("CVMFS_PROXY_RESET_AFTER", &optarg)) {
download_mgr_->SetProxyGroupResetDelay(String2Uint64(optarg));
// Use the proxy reset delay as the default for the metalink reset delay
download_mgr_->SetMetalinkResetDelay(String2Uint64(optarg));
}
if (options_mgr_->GetValue("CVMFS_METALINK_RESET_AFTER", &optarg))
download_mgr_->SetMetalinkResetDelay(String2Uint64(optarg));
if (options_mgr_->GetValue("CVMFS_HOST_RESET_AFTER", &optarg))
download_mgr_->SetHostResetDelay(String2Uint64(optarg));

Expand Down
Loading
Loading