backend/server/importlib/packageImport.py | 7 ++++++-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit e12d75abe180886af22df24f8ce403f69ad39235
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 26 11:56:07 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.7.10-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 01884a6..0825683 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.7.9
+Version: 1.7.10
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -675,6 +675,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Jan 26 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.7.10-1
+- fixed rhnpush ERROR: unhandled exception occurred: (timed out)
+
* Tue Jan 24 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.7.9-1
- Use shutil instead of os to push packages
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 995b90e..c0e75d2 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.7.9-1 backend/
+1.7.10-1 backend/
commit c5a49b519e08023cb9f58f4a8e40e856336be71f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 25 16:55:51 2012 +0100
fixed rhnpush ERROR: unhandled exception occurred: (timed out)
refreshing channel by package id is good idea but only if you push small
number of packages otherwise is must be done at once
fixing performance slowdown due to commit df4ab6bd0216725c2414915e03de10a2b5fd6c47
diff --git a/backend/server/importlib/packageImport.py
b/backend/server/importlib/packageImport.py
index dabf6e2..7a5eb94 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -129,7 +129,12 @@ class ChannelPackageSubscription(GenericPackageImport):
raise
self.compute_affected_channels(affected_channels)
- name_ids = [pkg['name_id'] for pkg in self.batch]
+ if len(self.batch) < 10:
+ # update small batch per package
+ name_ids = [pkg['name_id'] for pkg in self.batch]
+ else:
+ # update bigger batch at once
+ name_ids = []
self.backend.update_newest_package_cache(caller=self.caller,
affected_channels=self.affected_channel_packages, name_ids=name_ids)
# Now that channel is updated, schedule the repo generation