Ticket 3469 (https://fedorahosted.org/fedora-infrastructure/ticket/3469) notes that an extra / is present in the mirrorlist for files such as the EPEL GPG key. This happens because the mirrorlist CGI is inserting an extra / in the path, when the file is in the "topdir" (e.g. pub/epel, pub/fedora/linux) of a given category. This fix should prevent it from adding the extraneous / in such a case.
diff --git a/modules/hotfix/files/mirrormanager/mirrorlist_server.py b/modules/hotfix/files/mirrormanager/mirrorlist_server.py index fb2ae29..605a121 100755 --- a/modules/hotfix/files/mirrormanager/mirrorlist_server.py +++ b/modules/hotfix/files/mirrormanager/mirrorlist_server.py @@ -366,7 +366,9 @@ def append_path(hosts, cache, file, pathIsDirectory=False): if file is None and pathIsDirectory: s += "/" if file is not None: - s += "/" + file + if not s.endswidth('/'): + s += "/" + s += file hcurls.append(s) results.append((hostid, hcurls)) return results
-- Matt Domsch Technology Strategist Dell | Office of the CTO [cid:image001.jpg@01CDDE3F.54A640A0]https://cloudconsole.dell.com/Online/Signup/Products/
On Wed, 19 Dec 2012 23:19:44 -0600 Matt_Domsch@Dell.com wrote:
Ticket 3469 (https://fedorahosted.org/fedora-infrastructure/ticket/3469) notes that an extra / is present in the mirrorlist for files such as the EPEL GPG key. This happens because the mirrorlist CGI is inserting an extra / in the path, when the file is in the "topdir" (e.g. pub/epel, pub/fedora/linux) of a given category. This fix should prevent it from adding the extraneous / in such a case.
diff --git a/modules/hotfix/files/mirrormanager/mirrorlist_server.py b/modules/hotfix/files/mirrormanager/mirrorlist_server.py index fb2ae29..605a121 100755 --- a/modules/hotfix/files/mirrormanager/mirrorlist_server.py +++ b/modules/hotfix/files/mirrormanager/mirrorlist_server.py @@ -366,7 +366,9 @@ def append_path(hosts, cache, file, pathIsDirectory=False): if file is None and pathIsDirectory: s += "/" if file is not None:
s += "/" + file
if not s.endswidth('/'):
s += "/"
return resultss += file hcurls.append(s) results.append((hostid, hcurls))
It looks pretty minor to me, so I'd be ok with trying it, but being ready to back it out if it caused any issues. ;)
Is there any way to test it in staging first, at least to make sure it doesn't cause the mirrorlist_server to crash or anything?
+1
kevin
On Wed, Dec 19, 2012 at 10:26:39PM -0700, Kevin Fenzi wrote:
On Wed, 19 Dec 2012 23:19:44 -0600
diff --git a/modules/hotfix/files/mirrormanager/mirrorlist_server.py b/modules/hotfix/files/mirrormanager/mirrorlist_server.py index fb2ae29..605a121 100755 --- a/modules/hotfix/files/mirrormanager/mirrorlist_server.py +++ b/modules/hotfix/files/mirrormanager/mirrorlist_server.py @@ -366,7 +366,9 @@ def append_path(hosts, cache, file, pathIsDirectory=False): if file is None and pathIsDirectory: s += "/" if file is not None:
s += "/" + file
if not s.endswidth('/'):
s += "/"
return resultss += file hcurls.append(s) results.append((hostid, hcurls))
It looks pretty minor to me, so I'd be ok with trying it, but being ready to back it out if it caused any issues. ;)
Is there any way to test it in staging first, at least to make sure it doesn't cause the mirrorlist_server to crash or anything?
+1
+1
-Toshio
I've tested this on app01.stg now, and it does as expected. Thanks for the +1s, I'll apply.
-- Matt Domsch Technology Strategist Dell | Office of the CTO
due to a typo I somehow introduced, the mirrorlist app was returning an error instead of mirrorlists/metalinks from approximately 1:30-3:00am Central time this morning. Thanks to Jon Stanley for waking my butt and prompting me to fix it. Ugh. Typo fixed upstream too.
Other items to note:
Puppet runs shouldn't take 20+ minutes. skvidal may be living this nightmare, hence ansible.
I miss 'make push'.
I need something analogous to 'notify=>Service[httpd]' to handle killing mirrorlist_server.py too.
app07 is sick - can't sudo on it - it doesn't prompt for password+token, and doesn't like my password.
-- Matt Domsch Technology Strategist Dell | Office of the CTO
On Thu, 20 Dec 2012, Matt_Domsch@Dell.com wrote:
due to a typo I somehow introduced, the mirrorlist app was returning an error instead of mirrorlists/metalinks from approximately 1:30-3:00am Central time this morning. Thanks to Jon Stanley for waking my butt and prompting me to fix it. Ugh. Typo fixed upstream too.
Other items to note:
Puppet runs shouldn't take 20+ minutes. skvidal may be living this nightmare, hence ansible.
did you run-puppet nowait?
if not - the 20minutes was probably from the random-wait we add to keep the puppetmaster from melting down.
-sv
infrastructure@lists.fedoraproject.org