schema/spacewalk
by Milan Zazrivec
schema/spacewalk/oracle/procs/delete_server.sql | 2
schema/spacewalk/postgres/procs/delete_server.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.oracle | 238 +++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.postgresql | 240 ++++++++++
4 files changed, 482 insertions(+)
New commits:
commit 90e5ec5daa5d5e45b111a65d714fbe4ebe9791e5
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri May 20 16:32:48 2011 +0200
679333 - update rhnPushClient when deleting server
diff --git a/schema/spacewalk/oracle/procs/delete_server.sql b/schema/spacewalk/oracle/procs/delete_server.sql
index c9abd56..afd104a 100644
--- a/schema/spacewalk/oracle/procs/delete_server.sql
+++ b/schema/spacewalk/oracle/procs/delete_server.sql
@@ -232,6 +232,8 @@ begin
( select sat_cluster_id from rhn_sat_node where server_id = server_id_in );
delete from rhn_sat_node where server_id = server_id_in;
+
+ delete from rhnPushClient where server_id = server_id_in;
-- now get rhnServer itself.
delete
diff --git a/schema/spacewalk/postgres/procs/delete_server.sql b/schema/spacewalk/postgres/procs/delete_server.sql
index 2c01408..ad35b39 100644
--- a/schema/spacewalk/postgres/procs/delete_server.sql
+++ b/schema/spacewalk/postgres/procs/delete_server.sql
@@ -236,6 +236,8 @@ begin
delete from rhn_sat_node where server_id = server_id_in;
+ delete from rhnPushClient where server_id = server_id_in;
+
-- now get rhnServer itself.
delete
from rhnServer
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.oracle
new file mode 100644
index 0000000..4e1cc4d
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.oracle
@@ -0,0 +1,238 @@
+create or replace
+procedure delete_server (
+ server_id_in in number
+) is
+ cursor servergroups is
+ select server_id, server_group_id
+ from rhnServerGroupMembers sgm
+ where sgm.server_id = server_id_in;
+ cursor configchannels is
+ select cc.id
+ from rhnConfigChannel cc,
+ rhnConfigChannelType cct,
+ rhnServerConfigChannel scc
+ where 1=1
+ and scc.server_id = server_id_in
+ and scc.config_channel_id = cc.id
+ -- these config channel types are reserved
+ -- for use by a single server, so we don't
+ -- need to check for other servers subscribed
+ and cct.label in
+ ('local_override','server_import')
+ and cct.id = cc.confchan_type_id;
+ type filelistsid_t is table of rhnServerPreserveFileList.file_list_id%type;
+ filelistsid_c filelistsid_t;
+
+ type probesid_t is table of rhn_check_probe.probe_id%type;
+ probesid_c probesid_t;
+
+ is_virt number := 0;
+begin
+ rhn_channel.delete_server_channels(server_id_in);
+ -- rhn_channel.clear_subscriptions(server_id_in);
+
+ -- filelists
+ select spfl.file_list_id id bulk collect into filelistsid_c
+ from rhnServerPreserveFileList spfl
+ where spfl.server_id = server_id_in
+ and not exists (
+ select 1
+ from rhnServerPreserveFileList
+ where file_list_id = spfl.file_list_id
+ and server_id != server_id_in
+ union
+ select 1
+ from rhnKickstartPreserveFileList
+ where file_list_id = spfl.file_list_id
+ );
+ if filelistsid_c.first is not null then
+ forall i in filelistsid_c.first..filelistsid_c.last
+ delete from rhnFileList where id = filelistsid_c(i);
+ end if;
+
+ for configchannel in configchannels loop
+ rhn_config.delete_channel(configchannel.id);
+ end loop;
+
+ select count(1) into is_virt
+ from rhnServerEntitlementView
+ where server_id = server_id_in
+ and label in ('virtualization_host', 'virtualization_host_platform')
+ and rownum <= 1;
+
+ for sgm in servergroups loop
+ rhn_server.delete_from_servergroup(
+ sgm.server_id, sgm.server_group_id);
+ end loop;
+
+ if is_virt = 1 then
+ rhn_entitlements.repoll_virt_guest_entitlements(server_id_in);
+ end if;
+
+ -- we're handling this instead of letting an "on delete
+ -- set null" do it so that we don't run the risk
+ -- of setting off the triggers and killing us with a
+ -- mutating table
+
+ -- this is merge of two single updates:
+ -- update ... set old_server_id = null where old_server_id = server_id_in;
+ -- update ... set new_server_id = null where new_server_id = server_id_in;
+ -- so we scan rhnKickstartSession table only once
+ update rhnKickstartSession
+ set old_server_id = case when old_server_id = server_id_in then null else old_server_id end,
+ new_server_id = case when new_server_id = server_id_in then null else new_server_id end
+ where old_server_id = server_id_in
+ or new_server_id = server_id_in;
+
+ rhn_channel.clear_subscriptions(server_id_in,1);
+
+ -- A little complicated here, but the goal is to
+ -- delete records from rhnVirtualInstace only if we don't
+ -- care about them anymore. We don't care about records
+ -- in rhnVirtualInstance if we are deleting the host
+ -- system and the virtual system is already null, or
+ -- vice-versa. We *do* care about them if either the
+ -- host or virtual system is still registered because we
+ -- still want them to show up in the UI.
+ -- If there's a newer row in rhnVirtualInstance with the same
+ -- uuid, this guest must have been re-registered, so we can clean
+ -- this data up.
+
+ delete from rhnVirtualInstance vi
+ where (host_system_id = server_id_in and virtual_system_id is null)
+ or (virtual_system_id = server_id_in and host_system_id is null)
+ or (vi.virtual_system_id = server_id_in and vi.modified < (select max(vi2.modified)
+ from rhnVirtualInstance vi2 where vi2.uuid = vi.uuid));
+
+ -- this is merge of two single updates:
+ -- update ... set host_system_id = null where host_system_id = server_id_in;
+ -- update ... set virtual_system_id = null where virtual_system_id = server_id_in;
+ -- so we scan rhnVirtualInstance table only once
+ update rhnVirtualInstance
+ set host_system_id = case when host_system_id = server_id_in then null else host_system_id end,
+ virtual_system_id = case when virtual_system_id = server_id_in then null else virtual_system_id end
+ where host_system_id = server_id_in
+ or virtual_system_id = server_id_in;
+
+ -- this is merge of two single updates:
+ -- update ... set old_host_system_id = null when old_host_system_id = server_id_in;
+ -- update ... set new_host_system_id = null when new_host_system_id = server_id_in;
+ -- so we scan rhnVirtualInstanceEventLog table only once
+ update rhnVirtualInstanceEventLog
+ set old_host_system_id = case when old_host_system_id = server_id_in then null else old_host_system_id end,
+ new_host_system_id = case when new_host_system_id = server_id_in then null else new_host_system_id end
+ where old_host_system_id = server_id_in
+ or new_host_system_id = server_id_in;
+
+ -- We're deleting everything with a foreign key to rhnServer
+ -- here, now. I'm hoping this will help aleviate our deadlock
+ -- problem.
+
+ delete from rhnActionConfigChannel where server_id = server_id_in;
+ delete from rhnActionConfigRevision where server_id = server_id_in;
+ delete from rhnActionPackageRemovalFailure where server_id = server_id_in;
+ delete from rhnClientCapability where server_id = server_id_in;
+ delete from rhnCpu where server_id = server_id_in;
+ -- there's still a cascade here, because the constraint keeps the
+ -- table locked for too long to rebuild it. Ugh...
+ delete from rhnDevice where server_id = server_id_in;
+ delete from rhnProxyInfo where server_id = server_id_in;
+ delete from rhnRam where server_id = server_id_in;
+ delete from rhnRegToken where server_id = server_id_in;
+ delete from rhnSatelliteInfo where server_id = server_id_in;
+ -- this cascades to rhnActionConfigChannel and rhnActionConfigFileName
+ delete from rhnServerAction where server_id = server_id_in;
+ delete from rhnServerActionPackageResult where server_id = server_id_in;
+ delete from rhnServerActionScriptResult where server_id = server_id_in;
+ delete from rhnServerActionVerifyResult where server_id = server_id_in;
+ delete from rhnServerActionVerifyMissing where server_id = server_id_in;
+ -- counts are handled above. this should be a delete_ function.
+ delete from rhnServerChannel where server_id = server_id_in;
+ delete from rhnServerConfigChannel where server_id = server_id_in;
+ delete from rhnServerCustomDataValue where server_id = server_id_in;
+ delete from rhnServerDMI where server_id = server_id_in;
+ delete from rhnServerEvent where server_id = server_id_in;
+ delete from rhnServerHistory where server_id = server_id_in;
+ delete from rhnServerInfo where server_id = server_id_in;
+ delete from rhnServerInstallInfo where server_id = server_id_in;
+ delete from rhnServerLocation where server_id = server_id_in;
+ delete from rhnServerLock where server_id = server_id_in;
+ delete from rhnServerNeededCache where server_id = server_id_in;
+ delete from rhnServerNetwork where server_id = server_id_in;
+ delete from rhnServerNotes where server_id = server_id_in;
+ -- I'm not removing the foreign key from rhnServerPackage; that'll
+ -- take forever. Do the delete anyway.
+ delete from rhnServerPackage where server_id = server_id_in;
+ delete from rhnServerTokenRegs where server_id = server_id_in;
+ delete from rhnSnapshotTag where server_id = server_id_in;
+ -- this cascades to:
+ -- rhnSnapshotChannel, rhnSnapshotConfigChannel, rhnSnapshotPackage,
+ -- rhnSnapshotConfigRevision, rhnSnapshotServerGroup,
+ -- rhnSnapshotTag.
+ -- We may want to consider delete_snapshot() at some point, but
+ -- I don't think we need to yet.
+ delete from rhnSnapshot where server_id = server_id_in;
+ delete from rhnUserServerPrefs where server_id = server_id_in;
+ -- hrm, this one's interesting... we _probably_ should delete
+ -- everything for the parent server_id when we delete the proxy,
+ -- but we don't currently.
+ delete from rhnServerPath where server_id_in in (server_id, proxy_server_id);
+ delete from rhnUserServerPerms where server_id = server_id_in;
+
+ delete from rhnServerNetInterface where server_id = server_id_in;
+ delete from rhn_server_monitoring_info where recid = server_id_in;
+
+ delete from rhnAppInstallSession where server_id = server_id_in;
+ delete from rhnServerUuid where server_id = server_id_in;
+ -- We delete all the probes running directly against this system
+ -- and any probes that were using this Server as a Proxy Scout.
+ SELECT CP.probe_id bulk collect into probesid_c
+ FROM rhn_check_probe CP
+ WHERE CP.host_id = server_id_in
+ OR CP.sat_cluster_id in
+ (SELECT SN.sat_cluster_id
+ FROM rhn_sat_node SN
+ WHERE SN.server_id = server_id_in);
+
+ if probesid_c.first is not null then
+ FORALL i IN probesid_c.first..probesid_c.last
+ DELETE FROM rhn_probe_state PS WHERE PS.probe_id = probesid_c(i);
+ FORALL i IN probesid_c.first..probesid_c.last
+ DELETE FROM rhn_probe P WHERE P.recid = probesid_c(i);
+ FORALL i IN probesid_c.first..probesid_c.last
+ DELETE /*+index(time_series time_series_probe_id_idx)*/
+ FROM time_series
+ WHERE substr(o_id, instr(o_id, '-') + 1,
+ (instr(o_id, '-', instr(o_id, '-') + 1) - instr(o_id, '-')) - 1) = probesid_c(i);
+ end if;
+
+ delete from rhn_check_probe where host_id = server_id_in;
+ delete from rhn_host_probe where host_id = server_id_in;
+
+ delete from rhn_sat_cluster where recid in
+ ( select sat_cluster_id from rhn_sat_node where server_id = server_id_in );
+
+ delete from rhn_sat_node where server_id = server_id_in;
+
+ delete from rhnPushClient where server_id = server_id_in;
+
+ -- now get rhnServer itself.
+ delete
+ from rhnServer
+ where id = server_id_in;
+
+ delete
+ from rhnSet
+ where 1=1
+ and user_id in (
+ select wc.id
+ from rhnServer rs,
+ web_contact wc
+ where rs.id = server_id_in
+ and rs.org_id = wc.org_id
+ )
+ and label = 'system_list'
+ and element = server_id_in;
+end delete_server;
+/
+show errors;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.postgresql
new file mode 100644
index 0000000..55c6067
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.postgresql
@@ -0,0 +1,240 @@
+create or replace
+function delete_server (
+ server_id_in in numeric
+) returns void
+as
+$$
+declare
+ servergroups cursor for
+ select server_id, server_group_id
+ from rhnServerGroupMembers sgm
+ where sgm.server_id = server_id_in;
+
+ configchannels cursor for
+ select cc.id
+ from rhnConfigChannel cc,
+ rhnConfigChannelType cct,
+ rhnServerConfigChannel scc
+ where 1=1
+ and scc.server_id = server_id_in
+ and scc.config_channel_id = cc.id
+ -- these config channel types are reserved
+ -- for use by a single server, so we don't
+ -- need to check for other servers subscribed
+ and cct.label in
+ ('local_override','server_import')
+ and cct.id = cc.confchan_type_id;
+
+ is_virt boolean;
+begin
+ perform rhn_channel.delete_server_channels(server_id_in);
+ -- rhn_channel.clear_subscriptions(server_id_in);
+
+ -- filelists
+ delete from rhnFileList where id in (
+ select spfl.file_list_id
+ from rhnServerPreserveFileList spfl
+ where spfl.server_id = server_id_in
+ and not exists (
+ select 1
+ from rhnServerPreserveFileList
+ where file_list_id = spfl.file_list_id
+ and server_id != server_id_in
+ union all
+ select 1
+ from rhnKickstartPreserveFileList
+ where file_list_id = spfl.file_list_id
+ )
+ );
+
+ for configchannel in configchannels loop
+ perform rhn_config.delete_channel(configchannel.id);
+ end loop;
+
+ is_virt := exists (
+ select 1
+ from rhnServerEntitlementView
+ where server_id = server_id_in
+ and label in ('virtualization_host', 'virtualization_host_platform')
+ );
+
+ for sgm in servergroups loop
+ perform rhn_server.delete_from_servergroup(
+ sgm.server_id, sgm.server_group_id);
+ end loop;
+
+ if is_virt then
+ perform rhn_entitlements.repoll_virt_guest_entitlements(server_id_in);
+ end if;
+
+ -- we're handling this instead of letting an "on delete
+ -- set null" do it so that we don't run the risk
+ -- of setting off the triggers and killing us with a
+ -- mutating table
+
+ -- this is merge of two single updates:
+ -- update ... set old_server_id = null where old_server_id = server_id_in;
+ -- update ... set new_server_id = null where new_server_id = server_id_in;
+ -- so we scan rhnKickstartSession table only once
+ update rhnKickstartSession
+ set old_server_id = case when old_server_id = server_id_in then null else old_server_id end,
+ new_server_id = case when new_server_id = server_id_in then null else new_server_id end
+ where old_server_id = server_id_in
+ or new_server_id = server_id_in;
+
+ perform rhn_channel.clear_subscriptions(server_id_in,1);
+
+ -- A little complicated here, but the goal is to
+ -- delete records from rhnVirtualInstace only if we don't
+ -- care about them anymore. We don't care about records
+ -- in rhnVirtualInstance if we are deleting the host
+ -- system and the virtual system is already null, or
+ -- vice-versa. We *do* care about them if either the
+ -- host or virtual system is still registered because we
+ -- still want them to show up in the UI.
+ -- If there's a newer row in rhnVirtualInstance with the same
+ -- uuid, this guest must have been re-registered, so we can clean
+ -- this data up.
+
+ delete from rhnVirtualInstance vi
+ where (host_system_id = server_id_in and virtual_system_id is null)
+ or (virtual_system_id = server_id_in and host_system_id is null)
+ or (vi.virtual_system_id = server_id_in and vi.modified < (select max(vi2.modified)
+ from rhnVirtualInstance vi2 where vi2.uuid = vi.uuid));
+
+ -- this is merge of two single updates:
+ -- update ... set host_system_id = null where host_system_id = server_id_in;
+ -- update ... set virtual_system_id = null where virtual_system_id = server_id_in;
+ -- so we scan rhnVirtualInstance table only once
+ update rhnVirtualInstance
+ set host_system_id = case when host_system_id = server_id_in then null else host_system_id end,
+ virtual_system_id = case when virtual_system_id = server_id_in then null else virtual_system_id end
+ where host_system_id = server_id_in
+ or virtual_system_id = server_id_in;
+
+ -- this is merge of two single updates:
+ -- update ... set old_host_system_id = null when old_host_system_id = server_id_in;
+ -- update ... set new_host_system_id = null when new_host_system_id = server_id_in;
+ -- so we scan rhnVirtualInstanceEventLog table only once
+ update rhnVirtualInstanceEventLog
+ set old_host_system_id = case when old_host_system_id = server_id_in then null else old_host_system_id end,
+ new_host_system_id = case when new_host_system_id = server_id_in then null else new_host_system_id end
+ where old_host_system_id = server_id_in
+ or new_host_system_id = server_id_in;
+
+ -- We're deleting everything with a foreign key to rhnServer
+ -- here, now. I'm hoping this will help aleviate our deadlock
+ -- problem.
+
+ delete from rhnActionConfigChannel where server_id = server_id_in;
+ delete from rhnActionConfigRevision where server_id = server_id_in;
+ delete from rhnActionPackageRemovalFailure where server_id = server_id_in;
+ delete from rhnClientCapability where server_id = server_id_in;
+ delete from rhnCpu where server_id = server_id_in;
+ -- there's still a cascade here, because the constraint keeps the
+ -- table locked for too long to rebuild it. Ugh...
+ delete from rhnDevice where server_id = server_id_in;
+ delete from rhnProxyInfo where server_id = server_id_in;
+ delete from rhnRam where server_id = server_id_in;
+ delete from rhnRegToken where server_id = server_id_in;
+ delete from rhnSatelliteInfo where server_id = server_id_in;
+ -- this cascades to rhnActionConfigChannel and rhnActionConfigFileName
+ delete from rhnServerAction where server_id = server_id_in;
+ delete from rhnServerActionPackageResult where server_id = server_id_in;
+ delete from rhnServerActionScriptResult where server_id = server_id_in;
+ delete from rhnServerActionVerifyResult where server_id = server_id_in;
+ delete from rhnServerActionVerifyMissing where server_id = server_id_in;
+ -- counts are handled above. this should be a delete_ function.
+ delete from rhnServerChannel where server_id = server_id_in;
+ delete from rhnServerConfigChannel where server_id = server_id_in;
+ delete from rhnServerCustomDataValue where server_id = server_id_in;
+ delete from rhnServerDMI where server_id = server_id_in;
+ delete from rhnServerEvent where server_id = server_id_in;
+ delete from rhnServerHistory where server_id = server_id_in;
+ delete from rhnServerInfo where server_id = server_id_in;
+ delete from rhnServerInstallInfo where server_id = server_id_in;
+ delete from rhnServerLocation where server_id = server_id_in;
+ delete from rhnServerLock where server_id = server_id_in;
+ delete from rhnServerNeededCache where server_id = server_id_in;
+ delete from rhnServerNetwork where server_id = server_id_in;
+ delete from rhnServerNotes where server_id = server_id_in;
+ -- I'm not removing the foreign key from rhnServerPackage; that'll
+ -- take forever. Do the delete anyway.
+ delete from rhnServerPackage where server_id = server_id_in;
+ delete from rhnServerTokenRegs where server_id = server_id_in;
+ delete from rhnSnapshotTag where server_id = server_id_in;
+ -- this cascades to:
+ -- rhnSnapshotChannel, rhnSnapshotConfigChannel, rhnSnapshotPackage,
+ -- rhnSnapshotConfigRevision, rhnSnapshotServerGroup,
+ -- rhnSnapshotTag.
+ -- We may want to consider delete_snapshot() at some point, but
+ -- I don't think we need to yet.
+ delete from rhnSnapshot where server_id = server_id_in;
+ delete from rhnUserServerPrefs where server_id = server_id_in;
+ -- hrm, this one's interesting... we _probably_ should delete
+ -- everything for the parent server_id when we delete the proxy,
+ -- but we don't currently.
+ delete from rhnServerPath where server_id_in in (server_id, proxy_server_id);
+ delete from rhnUserServerPerms where server_id = server_id_in;
+
+ delete from rhnServerNetInterface where server_id = server_id_in;
+ delete from rhn_server_monitoring_info where recid = server_id_in;
+
+ delete from rhnAppInstallSession where server_id = server_id_in;
+ delete from rhnServerUuid where server_id = server_id_in;
+
+ -- We delete all the probes running directly against this system
+ -- and any probes that were using this Server as a Proxy Scout.
+ DELETE FROM rhn_probe_state PS WHERE PS.probe_id IN (
+ SELECT CP.probe_id
+ FROM rhn_check_probe CP
+ WHERE CP.host_id = server_id_in
+ OR CP.sat_cluster_id in
+ (SELECT SN.sat_cluster_id
+ FROM rhn_sat_node SN
+ WHERE SN.server_id = server_id_in)
+ );
+
+ DELETE FROM rhn_probe P WHERE P.recid IN (
+ SELECT CP.probe_id
+ FROM rhn_check_probe CP
+ WHERE CP.host_id = server_id_in
+ OR CP.sat_cluster_id in
+ (SELECT SN.sat_cluster_id
+ FROM rhn_sat_node SN
+ WHERE SN.server_id = server_id_in)
+ );
+
+ -- delete from time_series TODO
+
+ delete from rhn_check_probe where host_id = server_id_in;
+ delete from rhn_host_probe where host_id = server_id_in;
+
+ delete from rhn_sat_cluster where recid in
+ ( select sat_cluster_id from rhn_sat_node where server_id = server_id_in );
+
+ delete from rhn_sat_node where server_id = server_id_in;
+
+ delete from rhnPushClient where server_id = server_id_in;
+
+ -- now get rhnServer itself.
+ delete
+ from rhnServer
+ where id = server_id_in;
+
+ delete
+ from rhnSet
+ where 1=1
+ and user_id in (
+ select wc.id
+ from rhnServer rs,
+ web_contact wc
+ where rs.id = server_id_in
+ and rs.org_id = wc.org_id
+ )
+ and label = 'system_list'
+ and element = server_id_in;
+end;
+$$
+language plpgsql;
+
12 years, 11 months
Changes to 'refs/tags/spacewalk-backend-1.5.27-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.5.27-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-20 14:10 +0000
Tagging package [spacewalk-backend] version [1.5.27-1] in directory [backend/].
Changes since spacewalk-utils-1.5.3-1:
Jan Pazdziora (2):
Removing %{pythonrhnroot}/common/UserDictCase.py* from %files, to match its removal from sources.
Automatic commit of package [spacewalk-backend] release [1.5.27-1].
---
backend/spacewalk-backend.spec | 6 ++++--
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
---
12 years, 11 months
2 commits - backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 6 ++++--
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit d0f8a80c996397ae0ed14cf660078ae876ba16a5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 20 16:10:50 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.27-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 1930be6..bfd4ebe 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,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.5.26
+Version: 1.5.27
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -681,6 +681,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri May 20 2011 Jan Pazdziora 1.5.27-1
+- Removing %{pythonrhnroot}/common/UserDictCase.py* from %files.
+
* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.26-1
- package path should contain epoch
- 694735 - incremental exports: honor rhn_date / sync_date for ks files
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index b597b6d..30004c1 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.26-1 backend/
+1.5.27-1 backend/
commit f6bf969cf2fd4b10e58d03fd610e11f451989dd6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 20 16:10:22 2011 +0200
Removing %{pythonrhnroot}/common/UserDictCase.py* from %files, to match its removal from sources.
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index dc953e2..1930be6 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -354,7 +354,6 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/common/rhnTB.py*
%{pythonrhnroot}/common/rhnRepository.py*
%{pythonrhnroot}/common/rhnTranslate.py*
-%{pythonrhnroot}/common/UserDictCase.py*
%{pythonrhnroot}/common/RPC_Base.py*
%attr(770,root,apache) %dir %{_var}/log/rhn
# config files
12 years, 11 months
Changes to 'refs/tags/spacewalk-utils-1.5.3-1'
by Michael Mraka
Tag 'spacewalk-utils-1.5.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-20 13:30 +0000
Tagging package [spacewalk-utils] version [1.5.3-1] in directory [utils/].
Changes since spacewalk-backend-1.5.26-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-utils] release [1.5.3-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 11 months
rel-eng/packages utils/spacewalk-utils.spec
by Michael Mraka
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c1a406e4b3ed251b59ba54d822a9035fc2072faf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 15:30:16 2011 +0200
Automatic commit of package [spacewalk-utils] release [1.5.3-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index eecf8b1..efa52bd 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.5.2-1 utils/
+1.5.3-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 7678121..40c3f42 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.5.2
+Version: 1.5.3
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.3-1
+- fix broken (non-utf8) changelog entries
+
* Fri Apr 29 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.2-1
- fixed base channel for spacewalk on F14
- added spacewalk nightly entries
12 years, 11 months
Changes to 'refs/tags/spacewalk-backend-1.5.26-1'
by Michael Mraka
Tag 'spacewalk-backend-1.5.26-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-20 13:30 +0000
Tagging package [spacewalk-backend] version [1.5.26-1] in directory [backend/].
Changes since spacewalk-java-1.5.33-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-backend] release [1.5.26-1].
---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 11 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4c916f0bb1c72ed353374b46f9ec62ff3a11620f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 15:29:59 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.26-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index ed70bd8..dc953e2 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,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.5.25
+Version: 1.5.26
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -682,6 +682,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.26-1
+- package path should contain epoch
+- 694735 - incremental exports: honor rhn_date / sync_date for ks files
+
* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.25-1
- merged backend/common/UserDictCase.py into rhnlib/rhn/UserDictCase.py
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 9938210..b597b6d 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.25-1 backend/
+1.5.26-1 backend/
12 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.5.33-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.5.33-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-20 13:27 +0000
Tagging package [spacewalk-java] version [1.5.33-1] in directory [java/].
Changes since spacewalk-certs-tools-1.5.2-1:
Jan Pazdziora (2):
706399 - replacing rhnServerNeededView with custom subselect which is generally equivalent, in the errataqueue_find_autoupdate_servers context.
Automatic commit of package [spacewalk-java] release [1.5.33-1].
Michael Mraka (2):
fix broken (non-utf8) changelog entries
package path should contain epoch
Milan Zazrivec (1):
694735 - incremental exports: honor rhn_date / sync_date for ks files
---
backend/satellite_tools/disk_dumper/iss.py | 14 +-
backend/server/rhnPackageUpload.py | 2
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 51 +++++++++-
java/spacewalk-java.spec | 5
rel-eng/packages/spacewalk-java | 2
utils/spacewalk-dump-schema | 1
6 files changed, 67 insertions(+), 8 deletions(-)
---
12 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e65abc8acd9e5f80e02d9ff9767704e55d2434e3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 20 15:27:35 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.33-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d40944f..79b2163 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.32
+Version: 1.5.33
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri May 20 2011 Jan Pazdziora 1.5.33-1
+- 706399 - replacing rhnServerNeededView with custom subselect
+
* Thu May 19 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.32-1
- 659138 - fix Custom Quartz format error handling (tlestach(a)redhat.com)
- 659138 - fix repeat-task-picker input tag (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 31026b6..eb22bf3 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.32-1 java/
+1.5.33-1 java/
12 years, 11 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 51 +++++++++-
1 file changed, 50 insertions(+), 1 deletion(-)
New commits:
commit b23243af080795e44268cb2a67e1442d1e970966
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 20 14:46:23 2011 +0200
706399 - replacing rhnServerNeededView with custom subselect which is generally equivalent, in the errataqueue_find_autoupdate_servers context.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index fb03411..caf9ddf 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -140,7 +140,56 @@ SELECT DISTINCT
SELECT DISTINCT
S.id AS server_id, S.org_id org_id
FROM rhnServer S
- JOIN rhnServerNeededView SNV
+ JOIN (
+--
+select rhnChannelErrata.errata_id, rhnChannelErrata.channel_id, rhnServerChannel.server_id, rhnErrataPackage.package_id
+from rhnChannelErrata, rhnErrataPackage, rhnChannelNewestPackage, rhnPackageEVR,
+ rhnServerChannel, rhnServerPackage, rhnPackageUpgradeArchCompat
+where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
+--
+ and rhnChannelErrata.channel_id = rhnChannelNewestPackage.channel_id
+ and rhnErrataPackage.package_id = rhnChannelNewestPackage.package_id
+--
+ and rhnChannelErrata.channel_id = rhnServerChannel.channel_id
+ and rhnChannelNewestPackage.name_id = rhnServerPackage.name_id
+ and rhnServerChannel.server_id = rhnServerPackage.server_id
+--
+ and rhnChannelNewestPackage.evr_id = rhnPackageEVR.id
+--
+ and rhnServerPackage.package_arch_id = rhnPackageUpgradeArchCompat.package_arch_id
+ and rhnPackageUpgradeArchCompat.package_upgrade_arch_id = rhnChannelNewestPackage.package_arch_id
+--
+ and not exists (
+ -- rule out records where channels with lower id exist == get min
+ select 1 from rhnChannelPackage cp, rhnServerChannel csc
+ where cp.channel_id = csc.channel_id
+ and rhnChannelNewestPackage.package_id = cp.package_id
+ and rhnServerChannel.server_id = csc.server_id
+ and cp.channel_id < rhnChannelNewestPackage.channel_id
+ )
+ and not exists (
+ -- rule out records where the server has the same package name with higher evr
+ select 1 from rhnServerPackage sp, rhnPackageEVR sevr, rhnPackageUpgradeArchCompat puac
+ where rhnServerPackage.server_id = sp.server_id
+ and rhnServerPackage.name_id = sp.name_id
+ and sp.evr_id = sevr.id
+ and rhnPackageEVR.evr <= sevr.evr
+ and rhnServerPackage.package_arch_id = puac.package_arch_id
+ and puac.package_upgrade_arch_id = sp.package_arch_id
+ )
+ and not exists (
+ -- rule out records where other channel provides the same package name with higher evr
+ select 1 from rhnServerChannel csc, rhnChannelNewestPackage ocnp, rhnPackageEVR oevr, rhnPackageUpgradeArchCompat puac
+ where rhnServerChannel.server_id = csc.server_id
+ and csc.channel_id = ocnp.channel_id
+ and rhnServerPackage.name_id = ocnp.name_id
+ and ocnp.evr_id = oevr.id
+ and rhnPackageEVR.evr < oevr.evr
+ and rhnServerPackage.package_arch_id = puac.package_arch_id
+ and puac.package_upgrade_arch_id = ocnp.package_arch_id
+ )
+--
+ ) SNV
on SNV.server_id = S.id
WHERE SNV.channel_id = :channel_id
AND SNV.errata_id = :errata_id
12 years, 11 months