rel-eng/packages schema/spacewalk
by Justin Sherrill
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 863e10adf6367c9320ccc1eb1ab019fbb681061a
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 8 18:42:56 2010 -0400
Automatic commit of package [spacewalk-schema] release [1.1.12-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index c7ed202..7df2f18 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.1.11-1 schema/spacewalk/
+1.1.12-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 5a39533..90d2e5f 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.1.11
+Version: 1.1.12
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -58,6 +58,15 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Thu Jul 08 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.12-1
+- adding upgrade script for rhnAvailableChannels performance issue
+ (jsherril(a)redhat.com)
+- 603240 - fixing performance issue with rhnAvailableChannels, since one half
+ of the query looks for channels the org owns, and the other half looks for
+ channels shared to the org, changing to union all should be no problem
+ (jsherril(a)redhat.com)
+- Fixed a stored proc to only look at flex stuff (paji(a)redhat.com)
+
* Thu Jul 08 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.11-1
- fixed dependencies on rhnServerFveCapable and rhnChecksumView
- let schema population fail if there are invalid objects
13 years, 11 months
schema/spacewalk
by Justin Sherrill
schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/020-rhnAvailableChannels.sql | 79 ++++++++++
1 file changed, 79 insertions(+)
New commits:
commit d4cc0667950fd342a2dd423403ef2360913ceee4
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 8 18:42:11 2010 -0400
adding upgrade script for rhnAvailableChannels performance issue
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/020-rhnAvailableChannels.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/020-rhnAvailableChannels.sql
new file mode 100644
index 0000000..904333e
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/020-rhnAvailableChannels.sql
@@ -0,0 +1,79 @@
+--
+-- Copyright (c) 2008 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+--
+--
+--
+-- tricky view. it explodes to a full cartesian product when
+-- not queried via org_id, so DO NOT DO THAT :)
+
+create or replace view
+rhnAvailableChannels
+(
+ org_id,
+ channel_id,
+ channel_depth,
+ channel_name,
+ channel_arch_id,
+ padded_name,
+ current_members,
+ available_members,
+ last_modified,
+ channel_label,
+ parent_or_self_label,
+ parent_or_self_id
+)
+as
+select
+ ct.org_id,
+ ct.id,
+ CT.depth,
+ CT.name,
+ CT.channel_arch_id,
+ CT.padded_name,
+ (SELECT COUNT(1)
+ FROM rhnServer S
+ INNER JOIN rhnServerChannel SC
+ ON SC.server_id = S.id
+ WHERE SC.channel_id = CT.id AND
+ S.org_id = CT.org_id),
+ rhn_channel.available_chan_subscriptions(ct.id, ct.org_id),
+ CT.last_modified,
+ CT.label,
+ CT.parent_or_self_label,
+ CT.parent_or_self_id
+from
+ rhnOrgChannelTreeView CT
+UNION ALL
+select
+ ct.org_id,
+ ct.id,
+ CT.depth,
+ CT.name,
+ CT.channel_arch_id,
+ CT.padded_name,
+ (SELECT COUNT(1)
+ FROM rhnServer S
+ INNER JOIN rhnServerChannel SC
+ ON SC.server_id = S.id
+ WHERE SC.channel_id = CT.id AND
+ S.org_id = CT.org_id),
+ NULL,
+ CT.last_modified,
+ CT.label,
+ CT.parent_or_self_label,
+ CT.parent_or_self_id
+from
+ rhnSharedChannelTreeView CT
+;
+
13 years, 11 months
schema/spacewalk
by Justin Sherrill
schema/spacewalk/common/views/rhnAvailableChannels.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 78172547e9e0b5263c20ac991b71b0e2520391f9
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 8 18:39:52 2010 -0400
603240 - fixing performance issue with rhnAvailableChannels, since one half of the query looks for channels the org owns, and the other half looks for channels shared to the org, changing to union all should be no problem
diff --git a/schema/spacewalk/common/views/rhnAvailableChannels.sql b/schema/spacewalk/common/views/rhnAvailableChannels.sql
index 7aaed4b..904333e 100644
--- a/schema/spacewalk/common/views/rhnAvailableChannels.sql
+++ b/schema/spacewalk/common/views/rhnAvailableChannels.sql
@@ -54,7 +54,7 @@ select
CT.parent_or_self_id
from
rhnOrgChannelTreeView CT
-UNION
+UNION ALL
select
ct.org_id,
ct.id,
13 years, 11 months
schema/spacewalk
by Partha Aji
schema/spacewalk/oracle/packages/rhn_channel.pkb | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit a33b8c196f0c0c34c57e0efa0d3b91a228961bbf
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Jul 8 17:58:15 2010 -0400
Fixed a stored proc to only look at flex stuff
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index f9358d8..63da09b 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -66,7 +66,6 @@ IS
consenting_user NUMBER;
allowed number := 0;
is_fve CHAR(1) := 'N';
-
BEGIN
if user_id_in is not null then
allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe');
@@ -281,9 +280,12 @@ IS
RETURN NUMBER
IS
CURSOR vi_entries IS
- SELECT *
- FROM rhnVirtualInstance
- WHERE virtual_system_id = server_id_in;
+ SELECT 1
+ FROM rhnVirtualInstance vi
+ WHERE vi.virtual_system_id = server_id_in
+ and not exists(select server_id from rhnServerChannel sc where
+ sc.server_id = vi.virtual_system_id
+ and sc.is_fve='Y');
vi_count NUMBER;
BEGIN
13 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.1.21-1'
by Shannon Hughes
Tag 'spacewalk-java-1.1.21-1' created by Shannon Hughes <shughes(a)redhat.com> at 2010-07-08 18:47 +0000
Tagging package [spacewalk-java] version [1.1.21-1] in directory [java/].
Changes since spacewalk-java-1.1.20-1:
Shannon Hughes (2):
removing log5j until we get fedora approval; removed velocity since its in tempjars; adding new versions of quartz for cron taskomatic scheduler
Automatic commit of package [spacewalk-java] release [1.1.21-1].
---
java/ivy.xml | 5 ++---
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
---
13 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Shannon Hughes
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 6f46d4edace7f68b7c03c4759488d57d31eb2cea
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Thu Jul 8 14:47:13 2010 -0400
Automatic commit of package [spacewalk-java] release [1.1.21-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c649780..7734330 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.1.20
+Version: 1.1.21
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -321,6 +321,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jul 08 2010 Shannon Hughes <shughes(a)redhat.com> 1.1.21-1
+- removing log5j until we get fedora approval; removed velocity since its in
+ tempjars; adding new versions of quartz for cron taskomatic scheduler
+ (shughes(a)redhat.com)
+
* Thu Jul 08 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.20-1
- 603258 - fixing issue where channel.software.mergeErrata and mergePackages
would not populate the errata/package cache corerctly (jsherril(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 4c85ef8..a304f2c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.1.20-1 java/
+1.1.21-1 java/
13 years, 11 months
java/ivy.xml
by Shannon Hughes
java/ivy.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 2981440cb052d05ff8fa938ff27256ff57d676e2
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Thu Jul 8 14:44:14 2010 -0400
removing log5j until we get fedora approval; removed velocity since its in tempjars; adding new versions of quartz for cron taskomatic scheduler
diff --git a/java/ivy.xml b/java/ivy.xml
index 6f07179..37e0869 100644
--- a/java/ivy.xml
+++ b/java/ivy.xml
@@ -57,7 +57,8 @@
<dependency org="redhat" name="oro" rev="2.0.8" />
<dependency org="redhat" name="oscache" rev="2.0.2" />
<dependency org="redhat" name="pop3" rev="1.3.1" />
- <dependency org="redhat" name="quartz" rev="1.5.1" />
+ <dependency org="redhat" name="quartz" rev="1.8.1" />
+ <dependency org="redhat" name="quartz-oracle" rev="1.8.1" />
<dependency org="redhat" name="regexp" rev="1.3" />
<dependency org="redhat" name="servletapi5" rev="5.0.18" />
<dependency org="redhat" name="sitemesh" rev="2.1" />
@@ -72,7 +73,5 @@
<dependency org="redhat" name="xalan-j2" rev="2.6.0" />
<dependency org="redhat" name="xerces-j2" rev="2.6.2" />
<dependency org="redhat" name="xml-commons-apis" rev="1.0" />
- <dependency org="redhat" name="log5j" rev="1.2" />
- <dependency org="redhat" name="velocity" rev="1.5" />
</dependencies>
</ivy-module>
13 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.1.20-1'
by Justin Sherrill
Tag 'spacewalk-java-1.1.20-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-07-08 16:52 +0000
Tagging package [spacewalk-java] version [1.1.20-1] in directory [java/].
Changes since rhnpush-5.5.3-1:
Justin Sherrill (2):
603258 - fixingi ssue where channel.software.mergeErrata and mergePackages would not populate the errata/package cache corerctly
Automatic commit of package [spacewalk-java] release [1.1.20-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 20 ++++++++--
java/spacewalk-java.spec | 6 ++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 22 insertions(+), 6 deletions(-)
---
13 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Justin Sherrill
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 28113d6a8bb1f093ec86c23bba7e83be0586d831
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 8 12:52:20 2010 -0400
Automatic commit of package [spacewalk-java] release [1.1.20-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c6ba8b0..c649780 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.1.19
+Version: 1.1.20
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -321,6 +321,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jul 08 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.20-1
+- 603258 - fixing issue where channel.software.mergeErrata and mergePackages
+ would not populate the errata/package cache corerctly (jsherril(a)redhat.com)
+
* Thu Jul 08 2010 Tomas Lestach <tlestach(a)redhat.com> 1.1.19-1
- CobblerSyncTask fix (tlestach(a)redhat.com)
- Made entitlement logic handle flex guests when the host is virt (un)entitled
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index b791515..4c85ef8 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.1.19-1 java/
+1.1.20-1 java/
13 years, 11 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 20 ++++++++--
1 file changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 5007f7ec6db18f5bb43f709cba40e4dbade01f37
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 8 12:51:51 2010 -0400
603258 - fixingi ssue where channel.software.mergeErrata and mergePackages would not populate the errata/package cache corerctly
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index 4253701..9b80876 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -1819,6 +1819,8 @@ public class ChannelSoftwareHandler extends BaseHandler {
Channel toChannel) {
Set<Errata> toErrata = toChannel.getErratas();
Set<Errata> diffErrata = new HashSet(fromErrata);
+ List<Long> cids = new ArrayList<Long>();
+ cids.add(toChannel.getId());
for (Iterator iter = fromErrata.iterator(); iter.hasNext();) {
Errata errata = (Errata) iter.next();
@@ -1842,7 +1844,8 @@ public class ChannelSoftwareHandler extends BaseHandler {
}
}
- ErrataManager.publishErrataToChannel(toChannel, getErrataIds(diffErrata), user);
+ ErrataManager.publishErrataToChannel(toChannel, getErrataIds(diffErrata), user);
+
for (Errata errata : diffErrata) {
for (Iterator iter = errata.getPackages().iterator(); iter.hasNext();) {
Package pkg = (Package) iter.next();
@@ -1851,7 +1854,11 @@ public class ChannelSoftwareHandler extends BaseHandler {
}
ChannelFactory.save(toChannel);
ChannelManager.refreshWithNewestPackages(toChannel, "api");
-
+
+ for (Errata e : diffErrata) {
+ ErrataCacheManager.insertCacheForChannelErrataAsync(cids, e);
+ }
+
return diffErrata;
}
@@ -1918,9 +1925,10 @@ public class ChannelSoftwareHandler extends BaseHandler {
Set<Package> toPacks = mergeTo.getPackages();
Set<Package> fromPacks = mergeFrom.getPackages();
-
+ List<Long> pids = new ArrayList<Long>();
for (Package pack : fromPacks) {
if (!toPacks.contains(pack)) {
+ pids.add(pack.getId());
differentPackages.add(pack);
}
}
@@ -1932,7 +1940,11 @@ public class ChannelSoftwareHandler extends BaseHandler {
// (RHEL5+, mostly)
ChannelManager.queueChannelChange(mergeTo.getLabel(), "java::mergePackages",
loggedInUser.getLogin());
-
+
+
+ List<Long> cids = new ArrayList<Long>();
+ cids.add(mergeTo.getId());
+ ErrataCacheManager.insertCacheForChannelPackagesAsync(cids, pids);
return differentPackages.toArray();
}
13 years, 11 months