[mirrormanager] v1.4: fix umdl failure (6bec9d4)
by Matt Domsch
Repository : http://git.fedorahosted.org/cgit/
On branch : v1.4
>---------------------------------------------------------------
commit 6bec9d4e56d43dcfaee438839b2eebc045a8d02d
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Fri Jun 14 23:51:38 2013 -0500
fix umdl failure
>---------------------------------------------------------------
server/mirrormanager/repomap.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/mirrormanager/repomap.py b/server/mirrormanager/repomap.py
index 74390a7..4360850 100644
--- a/server/mirrormanager/repomap.py
+++ b/server/mirrormanager/repomap.py
@@ -96,7 +96,7 @@ def repo_prefix(path, category, ver):
version = u'unknown'
if not isRawhide and ver is not None:
- version = ver.name
+ version = ver['name']
if isCore:
if isUpdatesReleased:
11 years
[mirrormanager] v1.4: clean up syntax a bit (7fb0cb6)
by Matt Domsch
Repository : http://git.fedorahosted.org/cgit/
On branch : v1.4
>---------------------------------------------------------------
commit 7fb0cb6ee940833c9c2d46f5af113f9f6be0d37a
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Fri Jun 14 22:17:24 2013 -0500
clean up syntax a bit
>---------------------------------------------------------------
mirrorlist-server/mirrorlist_server.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/mirrorlist-server/mirrorlist_server.py b/mirrorlist-server/mirrorlist_server.py
index 0a14bc1..7a73b6a 100755
--- a/mirrorlist-server/mirrorlist_server.py
+++ b/mirrorlist-server/mirrorlist_server.py
@@ -698,7 +698,7 @@ def setup_netblocks(netblocks_file, asns_wanted=None):
mask = int(mask)
if mask == 0: continue
asn = int(s[1])
- if asns_wanted is None or (asns_wanted is not None and asn in asns_wanted):
+ if asns_wanted is None or asn in asns_wanted:
node = tree.add(s[0])
node.data['asn'] = asn
except:
11 years
[mirrormanager] v1.4: mirrorlist_server: reduce memory usage considerably (bfd83f2)
by Matt Domsch
Repository : http://git.fedorahosted.org/cgit/
On branch : v1.4
>---------------------------------------------------------------
commit bfd83f22fdf99c704cc949a9ac19b6ac6ccb0aff
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Fri Jun 14 22:12:49 2013 -0500
mirrorlist_server: reduce memory usage considerably
Rather than loading in the entire 500k entries of the global netblock
list, only load in the ~30k entries that match ASNs that our mirrors
have explicitly claimed as being relevant to them, either as the
Host.asn or in the HostPeerASN list.
This has the effect of reducing memory size by about half for the
overall program, which, should improve fork() time and reduce failure
to insufficient RAM available.
>---------------------------------------------------------------
mirrorlist-server/mirrorlist_server.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mirrorlist-server/mirrorlist_server.py b/mirrorlist-server/mirrorlist_server.py
index eb32860..0a14bc1 100755
--- a/mirrorlist-server/mirrorlist_server.py
+++ b/mirrorlist-server/mirrorlist_server.py
@@ -684,7 +684,7 @@ def setup_cache_tree(cache, field):
node.data[field] = v
return tree
-def setup_netblocks(netblocks_file):
+def setup_netblocks(netblocks_file, asns_wanted=None):
tree = radix.Radix()
if netblocks_file is not None:
try:
@@ -698,12 +698,12 @@ def setup_netblocks(netblocks_file):
mask = int(mask)
if mask == 0: continue
asn = int(s[1])
- node = tree.add(s[0])
- node.data['asn'] = asn
+ if asns_wanted is None or (asns_wanted is not None and asn in asns_wanted):
+ node = tree.add(s[0])
+ node.data['asn'] = asn
except:
pass
f.close()
-
return tree
def read_caches():
@@ -769,7 +769,7 @@ def read_caches():
global netblock_country_tree
internet2_tree = setup_netblocks(internet2_netblocks_file)
- global_tree = setup_netblocks(global_netblocks_file)
+ global_tree = setup_netblocks(global_netblocks_file, asn_host_cache)
# host_netblocks_tree key is a netblock, value is a list of host IDs
host_netblocks_tree = setup_cache_tree(host_netblock_cache, 'hosts')
# netblock_country_tree key is a netblock, value is a single country string
11 years
[mirrormanager] v1.4: fix maxconnections again (eb288c3)
by Matt Domsch
Repository : http://git.fedorahosted.org/cgit/
On branch : v1.4
>---------------------------------------------------------------
commit eb288c39ce3f411be0b886bf2c1e072abf0b77d7
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Fri Jun 14 17:45:56 2013 -0500
fix maxconnections again
>---------------------------------------------------------------
mirrorlist-server/mirrorlist_server.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/mirrorlist-server/mirrorlist_server.py b/mirrorlist-server/mirrorlist_server.py
index aefbafe..eb32860 100755
--- a/mirrorlist-server/mirrorlist_server.py
+++ b/mirrorlist-server/mirrorlist_server.py
@@ -188,7 +188,7 @@ def metalink(cache, directory, file, hosts_and_urls):
doc += indent(4) + '</mm0:alternate>\n'
doc += indent(3) + '</mm0:alternates>\n'
- doc += indent(3) + '<resources>\n'
+ doc += indent(3) + '<resources maxconnections="1">\n'
for (hostid, hcurls) in hosts_and_urls:
private = ''
if hostid not in cache['global']:
11 years
[mirrormanager] v1.4: fix metalinks (32567dd)
by Matt Domsch
Repository : http://git.fedorahosted.org/cgit/
On branch : v1.4
>---------------------------------------------------------------
commit 32567ddc62bbe3ab189115da92b3875c701ca2fc
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Fri Jun 14 17:23:10 2013 -0500
fix metalinks
>---------------------------------------------------------------
mirrorlist-server/mirrorlist_server.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/mirrorlist-server/mirrorlist_server.py b/mirrorlist-server/mirrorlist_server.py
index 1624f3e..aefbafe 100755
--- a/mirrorlist-server/mirrorlist_server.py
+++ b/mirrorlist-server/mirrorlist_server.py
@@ -188,7 +188,7 @@ def metalink(cache, directory, file, hosts_and_urls):
doc += indent(4) + '</mm0:alternate>\n'
doc += indent(3) + '</mm0:alternates>\n'
- doc += indent(3) + '<resources maxconnections="%d">\n' % (host_max_connections_cache.get(hostid, 1))
+ doc += indent(3) + '<resources>\n'
for (hostid, hcurls) in hosts_and_urls:
private = ''
if hostid not in cache['global']:
11 years
[mirrormanager] v1.4: s/print/sys.stdout.write/ in generate-publiclist (d41be10)
by Matt Domsch
Repository : http://git.fedorahosted.org/cgit/
On branch : v1.4
>---------------------------------------------------------------
commit d41be10658bafa77863aac67d51cf731018d089f
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Fri Jun 14 14:23:08 2013 -0500
s/print/sys.stdout.write/ in generate-publiclist
>---------------------------------------------------------------
server/generate-publiclist | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/server/generate-publiclist b/server/generate-publiclist
index ed9469f..0c27be8 100755
--- a/server/generate-publiclist
+++ b/server/generate-publiclist
@@ -106,7 +106,9 @@ class ProductVersionArchMatrix:
for a in publiclist_arches():
hosts = publiclist_hosts(productname=p.name, vername=v.name, archname=a.name)
self.set_pva(p.name, v.name, a.name, hosts)
- print "filled %s/%s/%s with %s hosts" % (p.name, v.name, a.name, len(hosts))
+ msg = "filled %s/%s/%s with %s hosts\n" % (p.name, v.name, a.name, len(hosts))
+ sys.stdout.write(msg)
+ sys.stdout.flush()
@@ -141,7 +143,9 @@ def generate_all():
def generate_one_html(engine, pvaMatrix, productname=None, vername=None, archname=None):
pva = make_pva(productname, vername, archname)
- print "making %s" % pva
+ msg = "making %s\n" % pva
+ sys.stdout.write(msg)
+ sys.stdout.flush()
title = "%s %s Public Active Mirrors" % (config.get('mirrormanager.projectname','Fedora'),
pva)
@@ -161,8 +165,10 @@ def generate_one_html(engine, pvaMatrix, productname=None, vername=None, archnam
bandwidth = 0
for h in hosts:
if not isinstance(h.bandwidth_int, int):
- print '%s bandwidth_int was not an int: %s' % (h, h.bandwidth_int)
- h.bandwidth_int = 1
+ msg = '%s bandwidth_int was not an int: %s\n' % (h, h.bandwidth_int)
+ sys.stdout.write(msg)
+ sys.stdout.flush()
+ h.bandwidth_int = 1
bandwidth = bandwidth + h.bandwidth_int
bandwidth = bandwidth / 1024 # convert to Gb
11 years
[mirrormanager] v1.4: switch to xz compression, bump RELEASE_DATE (f358ed7)
by Matt Domsch
Repository : http://git.fedorahosted.org/cgit/
On branch : v1.4
>---------------------------------------------------------------
commit f358ed7c4774130ddc19bdaad92b10d7aa621782
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Fri Jun 14 10:52:46 2013 -0500
switch to xz compression, bump RELEASE_DATE
>---------------------------------------------------------------
Makefile | 11 ++++++-----
mirrormanager.spec.in | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 14a0e00..2d6b530 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-RELEASE_DATE := "31-Oct-2010"
+RELEASE_DATE := "14-Jun-2013"
RELEASE_MAJOR := 1
RELEASE_MINOR := 4
RELEASE_EXTRALEVEL := .0
@@ -8,7 +8,7 @@ RELEASE_STRING := $(RELEASE_NAME)-$(RELEASE_VERSION)
SPEC=mirrormanager.spec
RELEASE_PY=server/mirrormanager/release.py
-TARBALL=dist/$(RELEASE_STRING).tar.bz2
+TARBALL=dist/$(RELEASE_STRING).tar.xz
STARTSCRIPT=server/start-mirrormanager
PROGRAMDIR=/usr/share/mirrormanager/server
SBINDIR=/usr/sbin
@@ -17,7 +17,7 @@ SBINDIR=/usr/sbin
all:
clean:
- -rm -rf *.tar.gz *.rpm *~ dist/ $(SPEC) $(RELEASE_PY) server/mirrormanager.egg-info server/build
+ -rm -rf *.tar.xz *.rpm *~ dist/ $(SPEC) $(RELEASE_PY) server/mirrormanager.egg-info server/build
-find . -name \*.pyc -exec rm \{\} \;
-find . -name \*.pyo -exec rm \{\} \;
@@ -47,9 +47,10 @@ $(TARBALL):
find $${tmp_dir}/$(RELEASE_STRING) -depth -name sqlobject-history -type d -exec rm -rf \{\} \; ; \
find $${tmp_dir}/$(RELEASE_STRING) -depth -name \*~ -type f -exec rm -f \{\} \; ; \
find $${tmp_dir}/$(RELEASE_STRING) -depth -name \*.rpm -type f -exec rm -f \{\} \; ; \
- find $${tmp_dir}/$(RELEASE_STRING) -depth -name \*.tar.gz -type f -exec rm -f \{\} \; ; \
+ find $${tmp_dir}/$(RELEASE_STRING) -depth -name \*.tar.xz -type f -exec rm -f \{\} \; ; \
sync ; sync ; sync ; \
- tar cvjf $(TARBALL) -C $${tmp_dir} $(RELEASE_STRING) ; \
+ tar cvf $(TARBALL) -C $${tmp_dir} $(RELEASE_STRING) ; \
+ xz -c -9 $(TARBALL) ; \
rm -rf $${tmp_dir} ;
# Use older digest algorithms for local rpmbuilds, as EPEL5 and
diff --git a/mirrormanager.spec.in b/mirrormanager.spec.in
index a7ce186..5cfef0a 100644
--- a/mirrormanager.spec.in
+++ b/mirrormanager.spec.in
@@ -7,7 +7,7 @@ BuildArch: noarch
Group: Applications/Internet
License: MIT and GPLv2
URL: http://fedorahosted.org/mirrormanager
-Source0: https://fedorahosted.org/releases/m/i/%{name}/%{name}-%{version}.tar.bz2
+Source0: https://fedorahosted.org/releases/m/i/%{name}/%{name}-%{version}.tar.xz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: python
Requires: TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns, python-fedora >= 0.3.14, python-fedora-turbogears, py-radix, mod_wsgi, python-TurboMail
11 years
[mirrormanager] v1.4: update copyright dates throughout (f34ec13)
by Matt Domsch
Repository : http://git.fedorahosted.org/cgit/
On branch : v1.4
>---------------------------------------------------------------
commit f34ec136ed34ceb9a9d1bcb3d9eedf31a94ad2fc
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Fri Jun 14 10:44:00 2013 -0500
update copyright dates throughout
>---------------------------------------------------------------
mirrorlist-server/mirrorlist_client.wsgi | 2 +-
mirrorlist-server/mirrorlist_server.py | 2 +-
mirrorlist-server/test/server_tester.py | 2 +-
mirrorlist-server/weighted_shuffle.py | 2 +-
server/generate-worldmap | 2 +-
server/import_centos | 2 +-
server/manage-repo-redirects | 2 +-
server/mirrormanager/release.py.in | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/mirrorlist-server/mirrorlist_client.wsgi b/mirrorlist-server/mirrorlist_client.wsgi
index c208323..8855595 100755
--- a/mirrorlist-server/mirrorlist_client.wsgi
+++ b/mirrorlist-server/mirrorlist_client.wsgi
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
-# Copyright (c) 2007 Dell, Inc.
+# Copyright (c) 2007-2013 Dell, Inc.
# by Matt Domsch <Matt_Domsch(a)dell.com>
# Licensed under the MIT/X11 license
diff --git a/mirrorlist-server/mirrorlist_server.py b/mirrorlist-server/mirrorlist_server.py
index 8be7373..1624f3e 100755
--- a/mirrorlist-server/mirrorlist_server.py
+++ b/mirrorlist-server/mirrorlist_server.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
-# Copyright (c) 2007,2008,2009 Dell, Inc.
+# Copyright (c) 2007-2013 Dell, Inc.
# by Matt Domsch <Matt_Domsch(a)dell.com>
# Licensed under the MIT/X11 license
diff --git a/mirrorlist-server/test/server_tester.py b/mirrorlist-server/test/server_tester.py
index 0cab5e0..8b28e37 100755
--- a/mirrorlist-server/test/server_tester.py
+++ b/mirrorlist-server/test/server_tester.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
-# Copyright (c) 2007 Dell, Inc.
+# Copyright (c) 2007-2013 Dell, Inc.
# by Matt Domsch <Matt_Domsch(a)dell.com>
# Licensed under the MIT/X11 license
diff --git a/mirrorlist-server/weighted_shuffle.py b/mirrorlist-server/weighted_shuffle.py
index 0c26b07..9a70b18 100644
--- a/mirrorlist-server/weighted_shuffle.py
+++ b/mirrorlist-server/weighted_shuffle.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2008 Dell, Inc.
+# Copyright (c) 2008,2013 Dell, Inc.
# by Matt Domsch <Matt_Domsch(a)dell.com>
# Licensed under the MIT/X11 license
diff --git a/server/generate-worldmap b/server/generate-worldmap
index d1ab750..3fd9800 100755
--- a/server/generate-worldmap
+++ b/server/generate-worldmap
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
-# Copyright 2007 Dell, Inc.
+# Copyright 2007,2008,2010,2012 Dell, Inc.
# by Matt Domsch <Matt_Domsch(a)dell.com>
# Based on examples from python-GeoIP and python-basemap-examples
# Licensed under the GNU General Public License v2
diff --git a/server/import_centos b/server/import_centos
index eb29612..265bb37 100755
--- a/server/import_centos
+++ b/server/import_centos
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
-# Copyright 2011 Dell, Inc.
+# Copyright 2013 Dell, Inc.
# by Matt Domsch <Matt_Domsch(a)dell.com>
# MIT/X11 license
diff --git a/server/manage-repo-redirects b/server/manage-repo-redirects
index 14f5478..62d5032 100755
--- a/server/manage-repo-redirects
+++ b/server/manage-repo-redirects
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
-# Copyright 2007 Dell, Inc.
+# Copyright 2007-2010 Dell, Inc.
# by Matt Domsch <Matt_Domsch(a)dell.com>
# MIT/X11 license
diff --git a/server/mirrormanager/release.py.in b/server/mirrormanager/release.py.in
index 563bd1e..9f05ce8 100644
--- a/server/mirrormanager/release.py.in
+++ b/server/mirrormanager/release.py.in
@@ -6,7 +6,7 @@ description = "MirrorManager"
long_description = "Fedora Content Mirror Tracker"
author = "Matt Domsch"
email = "Matt_Domsch(a)dell.com"
-copyright = "Copyright 2006-2010 Dell, Inc."
+copyright = "Copyright 2006-2013 Dell, Inc."
# if it's open source, you might want to specify these
url = "http://mirrormanager.org"
11 years