spacewalk-commits February 2014

spacewalk-commits@lists.fedorahosted.org

10 participants
275 discussions

Changes to 'refs/tags/spacewalk-schema-2.1.43-1'
by Milan Zazrivec 12 Feb '14

12 Feb '14

Tag 'spacewalk-schema-2.1.43-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2014-02-12 14:55 +0000 Tagging package [spacewalk-schema] version [2.1.43-1] in directory [schema/spacewalk/]. Changes since spacewalk-web-2.1.56-1: Milan Zazrivec (2): 1063821 - lock rhnServerNeededCache to avoid a db deadlock Automatic commit of package [spacewalk-schema] release [2.1.43-1]. --- rel-eng/packages/spacewalk-schema | 2 schema/spacewalk/oracle/packages/rhn_channel.pkb | 23 schema/spacewalk/oracle/packages/rhn_server.pkb | 6 schema/spacewalk/postgres/packages/rhn_channel.pkb | 25 schema/spacewalk/postgres/packages/rhn_server.pkb | 9 schema/spacewalk/spacewalk-schema.spec | 5 schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.oracle | 23 schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql | 25 schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.oracle | 790 --------- schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql | 829 ---------- 10 files changed, 60 insertions(+), 1677 deletions(-) ---

1 0

2 commits - rel-eng/packages schema/spacewalk
by Milan Zazrivec 12 Feb '14

12 Feb '14

rel-eng/packages/spacewalk-schema | 2 schema/spacewalk/oracle/packages/rhn_channel.pkb | 23 schema/spacewalk/oracle/packages/rhn_server.pkb | 6 schema/spacewalk/postgres/packages/rhn_channel.pkb | 25 schema/spacewalk/postgres/packages/rhn_server.pkb | 9 schema/spacewalk/spacewalk-schema.spec | 5 schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.oracle | 23 schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql | 25 schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.oracle | 790 --------- schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql | 829 ---------- 10 files changed, 60 insertions(+), 1677 deletions(-) New commits: commit 891de33651bb0e42e2a16f6cad9fb79b101a87a5 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Wed Feb 12 15:55:29 2014 +0100 Automatic commit of package [spacewalk-schema] release [2.1.43-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index b3c33d7..4bb5dd5 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -2.1.42-1 schema/spacewalk/ +2.1.43-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 4f7a513..53427f5 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -4,7 +4,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 2.1.42 +Version: 2.1.43 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Wed Feb 12 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.43-1 +- 1063821 - lock rhnServerNeededCache to avoid a db deadlock + * Wed Feb 12 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.42-1 - Add missing GMT+3 timezone as Saudi Arabia commit 797782c1e260e773c4c0a3c24fbf356f517e98ad Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Wed Feb 12 15:41:07 2014 +0100 1063821 - lock rhnServerNeededCache to avoid a db deadlock rhn_server.update_needed_cache() and rhn_channel.(un)subscribe_server() need to sync on rhnServerNeededCache table to avoid a deadlock (rather than rhnServer). diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb index 57bfa05..492f324 100644 --- a/schema/spacewalk/oracle/packages/rhn_channel.pkb +++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb @@ -63,11 +63,6 @@ IS is_fve CHAR(1) := 'N'; update_lock number; BEGIN - select 1 - into update_lock - from rhnServer - where id = server_id_in - for update; if user_id_in is not null then allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe'); else @@ -160,6 +155,13 @@ IS from rhnChannel c where c.id = channel_id_in ); + + select 1 + into update_lock + from rhnServerNeededCache + where server_id = server_id_in + for update; + UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve); IF recalcfamily_in > 0 @@ -483,11 +485,6 @@ IS and c.id = sc.channel_id and sc.server_id = server_id_in; BEGIN - select 1 - into update_lock - from rhnServer - where id = server_id_in - for update; FOR child IN local_chk_server_parent_memb(server_id_in, channel_id_in) LOOP if unsubscribe_children_in = 1 then @@ -525,6 +522,12 @@ IS where c.id = channel_id_in ); + select 1 + into update_lock + from rhnServerNeededCache + where server_id = server_id_in + for update; + UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; end if; diff --git a/schema/spacewalk/oracle/packages/rhn_server.pkb b/schema/spacewalk/oracle/packages/rhn_server.pkb index 40939b2..36b711c 100644 --- a/schema/spacewalk/oracle/packages/rhn_server.pkb +++ b/schema/spacewalk/oracle/packages/rhn_server.pkb @@ -747,13 +747,7 @@ is procedure update_needed_cache(server_id_in in number) is - update_lock number; begin - select 1 - into update_lock - from rhnServer - where id = server_id_in - for update; delete from rhnServerNeededCache where server_id = server_id_in; insert into rhnServerNeededCache diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/spacewalk/postgres/packages/rhn_channel.pkb index 7f9adec..2db8fad 100644 --- a/schema/spacewalk/postgres/packages/rhn_channel.pkb +++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 cc1b86fd8db5758d5f3a7ccc146f38954454def1 +-- oracle equivalent source sha1 3f65e7873daaa42b5ba247a903dc78d07c505bbc -- -- Copyright (c) 2008--2013 Red Hat, Inc. -- @@ -67,11 +67,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ is_fve_char char(1) := 'N'; update_lock numeric; BEGIN - select 1 - into update_lock - from rhnServer - where id = server_id_in - for update; if user_id_in is not null then allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe'); else @@ -153,6 +148,13 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ from rhnChannel c where c.id = channel_id_in ); + + select 1 + into update_lock + from rhnServerNeededCache + where server_id = server_id_in + for update; + UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve_char); IF recalcfamily_in > 0 @@ -502,11 +504,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ and label = 'rhn-satellite'; child record; BEGIN - select 1 - into update_lock - from rhnServer - where id = server_id_in - for update; -- In PostgreSQL recursion with opened cursors is not allowed so we use -- FOR IN SELECT form which is ok. FOR child IN select c.id @@ -547,6 +544,12 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ where c.id = channel_id_in ); + select 1 + into update_lock + from rhnServerNeededCache + where server_id = server_id_in + for update; + UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; end if; diff --git a/schema/spacewalk/postgres/packages/rhn_server.pkb b/schema/spacewalk/postgres/packages/rhn_server.pkb index d47df86..41f2e9a 100644 --- a/schema/spacewalk/postgres/packages/rhn_server.pkb +++ b/schema/spacewalk/postgres/packages/rhn_server.pkb @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 07b6ab3867e4d4ebf772b6ee9731f83e33f4d7ae +-- oracle equivalent source sha1 b6947eea546edc7a66c7b53d0b62dc734ce3ca8a -- -- Copyright (c) 2008--2012 Red Hat, Inc. -- @@ -789,14 +789,7 @@ update pg_settings set setting = 'rhn_server,' || setting where name = 'search_p create or replace function update_needed_cache( server_id_in in numeric ) returns void as $$ - declare - update_lock numeric; begin - select 1 - into update_lock - from rhnServer - where id = server_id_in - for update; delete from rhnServerNeededCache where server_id = server_id_in; insert into rhnServerNeededCache diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.oracle index 74680f3..3b573e5 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.oracle +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.oracle @@ -63,11 +63,6 @@ IS is_fve CHAR(1) := 'N'; update_lock number; BEGIN - select 1 - into update_lock - from rhnServer - where id = server_id_in - for update; if user_id_in is not null then allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe'); else @@ -160,6 +155,13 @@ IS from rhnChannel c where c.id = channel_id_in ); + + select 1 + into update_lock + from rhnServerNeededCache + where server_id = server_id_in + for update; + UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve); IF recalcfamily_in > 0 @@ -483,11 +485,6 @@ IS and c.id = sc.channel_id and sc.server_id = server_id_in; BEGIN - select 1 - into update_lock - from rhnServer - where id = server_id_in - for update; FOR child IN local_chk_server_parent_memb(server_id_in, channel_id_in) LOOP if unsubscribe_children_in = 1 then @@ -525,6 +522,12 @@ IS where c.id = channel_id_in ); + select 1 + into update_lock + from rhnServerNeededCache + where server_id = server_id_in + for update; + UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; end if; diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql index 6708d12..e59c5d4 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.postgresql @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 2687a15d4354aa84c0af253684b234ed82900c66 +-- oracle equivalent source sha1 7f21173dd16ae3c29c150aa42623feba45894363 -- -- Copyright (c) 2008--2013 Red Hat, Inc. -- @@ -67,11 +67,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ is_fve_char char(1) := 'N'; update_lock numeric; BEGIN - select 1 - into update_lock - from rhnServer - where id = server_id_in - for update; if user_id_in is not null then allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe'); else @@ -153,6 +148,13 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ from rhnChannel c where c.id = channel_id_in ); + + select 1 + into update_lock + from rhnServerNeededCache + where server_id = server_id_in + for update; + UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve_char); IF recalcfamily_in > 0 @@ -502,11 +504,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ and label = 'rhn-satellite'; child record; BEGIN - select 1 - into update_lock - from rhnServer - where id = server_id_in - for update; -- In PostgreSQL recursion with opened cursors is not allowed so we use -- FOR IN SELECT form which is ok. FOR child IN select c.id @@ -547,6 +544,12 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ where c.id = channel_id_in ); + select 1 + into update_lock + from rhnServerNeededCache + where server_id = server_id_in + for update; + UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; end if; diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.oracle deleted file mode 100644 index b910b56..0000000 --- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.oracle +++ /dev/null @@ -1,790 +0,0 @@ --- --- Copyright (c) 2008--2012 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. --- --- --- --- - -create or replace -package body rhn_server -is - function system_service_level( - server_id_in in number, - service_level_in in varchar2 - ) return number is - - cursor ents is - select label from rhnServerEntitlementView - where server_id = server_id_in; - - retval number := 0; - - begin - for ent in ents loop - retval := rhn_entitlements.entitlement_grants_service (ent.label, service_level_in); - if retval = 1 then - return retval; - end if; - end loop; - - return retval; - - end system_service_level; - - - function can_change_base_channel(server_id_in IN NUMBER) - return number - is - throwaway number; - begin - -- the idea: if we get past this query, the server is - -- neither sat nor proxy, so base channel is changeable - - select 1 into throwaway - from rhnServer S - where S.id = server_id_in - and not exists (select 1 from rhnSatelliteInfo SI where SI.server_id = S.id) - and not exists (select 1 from rhnProxyInfo PI where PI.server_id = S.id); - - return 1; - exception - when no_data_found - then - return 0; - end can_change_base_channel; - - procedure set_custom_value( - server_id_in in number, - user_id_in in number, - key_label_in in varchar2, - value_in in varchar2 - ) is - key_id_val number; - begin - select CDK.id into key_id_val - from rhnCustomDataKey CDK, - rhnServer S - where S.id = server_id_in - and S.org_id = CDK.org_id - and CDK.label = key_label_in; - - begin - insert into rhnServerCustomDataValue (server_id, key_id, value, created_by, last_modified_by) - values (server_id_in, key_id_val, value_in, user_id_in, user_id_in); - exception - when DUP_VAL_ON_INDEX - then - update rhnServerCustomDataValue - set value = value_in, - last_modified_by = user_id_in - where server_id = server_id_in - and key_id = key_id_val; - end; - - end set_custom_value; - - function bulk_set_custom_value( - key_label_in in varchar2, - value_in in varchar2, - set_label_in in varchar2, - set_uid_in in number - ) - return integer - is - i integer := 0; - begin - i := 0; - for server in ( - SELECT user_id, label, element, element_two - FROM rhnSet - WHERE label = set_label_in - AND user_id = set_uid_in - ) loop - if rhn_server.system_service_level(server.element, 'provisioning') = 1 then - rhn_server.set_custom_value(server.element, set_uid_in, key_label_in, value_in); - i := i + 1; - end if; - end loop server; - return i; - end bulk_set_custom_value; - - procedure bulk_snapshot_tag( - org_id_in in number, - tagname_in in varchar2, - set_label_in in varchar2, - set_uid_in in number - ) is - snapshot_id number; - begin - for server in ( - SELECT user_id, label, element, element_two - FROM rhnSet - WHERE label = set_label_in - AND user_id = set_uid_in - ) loop - if rhn_server.system_service_level(server.element, 'provisioning') = 1 then - begin - select max(id) into snapshot_id - from rhnSnapshot - where server_id = server.element; - exception - when NO_DATA_FOUND then - rhn_server.snapshot_server(server.element, 'tagging system: ' || tagname_in); - - select max(id) into snapshot_id - from rhnSnapshot - where server_id = server.element; - end; - - -- now have a snapshot_id to work with... - begin - rhn_server.tag_snapshot(snapshot_id, org_id_in, tagname_in); - exception - when DUP_VAL_ON_INDEX - then - -- do nothing, be forgiving... - null; - end; - end if; - end loop server; - end bulk_snapshot_tag; - - procedure tag_delete( - server_id_in in number, - tag_id_in in number - ) is - cursor snapshots is - select snapshot_id - from rhnSnapshotTag - where tag_id = tag_id_in; - tag_id_tmp number; - begin - select id into tag_id_tmp - from rhnTag - where id = tag_id_in - for update; - - delete - from rhnSnapshotTag - where server_id = server_id_in - and tag_id = tag_id_in; - for snapshot in snapshots loop - return; - end loop; - delete - from rhnTag - where id = tag_id_in; - end tag_delete; - - procedure tag_snapshot( - snapshot_id_in in number, - org_id_in in number, - tagname_in in varchar2 - ) is - begin - insert into rhnSnapshotTag (snapshot_id, server_id, tag_id) - select snapshot_id_in, server_id, lookup_tag(org_id_in, tagname_in) - from rhnSnapshot - where id = snapshot_id_in; - end tag_snapshot; - - procedure bulk_snapshot( - reason_in in varchar2, - set_label_in in varchar2, - set_uid_in in number - ) is - begin - for server in ( - SELECT user_id, label, element, element_two - FROM rhnSet - WHERE label = set_label_in - AND user_id = set_uid_in - ) loop - if rhn_server.system_service_level(server.element, 'provisioning') = 1 then - rhn_server.snapshot_server(server.element, reason_in); - end if; - end loop server; - end bulk_snapshot; - - procedure snapshot_server( - server_id_in in number, - reason_in in varchar2 - ) is - snapshot_id number; - cursor revisions is - select distinct - cr.id - from rhnConfigRevision cr, - rhnConfigFileName cfn, - rhnConfigFile cf, - rhnConfigChannel cc, - rhnServerConfigChannel scc - where 1=1 - and scc.server_id = server_id_in - and scc.config_channel_id = cc.id - and cc.id = cf.config_channel_id - and cf.id = cr.config_file_id - and cr.id = cf.latest_config_revision_id - and cf.config_file_name_id = cfn.id - and cf.id = lookup_first_matching_cf(scc.server_id, cfn.path); - locked integer; - begin - select rhn_snapshot_id_seq.nextval into snapshot_id from dual; - - insert into rhnSnapshot (id, org_id, server_id, reason) ( - select snapshot_id, - s.org_id, - server_id_in, - reason_in - from rhnServer s - where s.id = server_id_in - ); - insert into rhnSnapshotChannel (snapshot_id, channel_id) ( - select snapshot_id, sc.channel_id - from rhnServerChannel sc - where sc.server_id = server_id_in - ); - insert into rhnSnapshotServerGroup (snapshot_id, server_group_id) ( - select snapshot_id, sgm.server_group_id - from rhnServerGroupMembers sgm - where sgm.server_id = server_id_in - ); - locked := 0; - while true loop - begin - insert into rhnPackageNEVRA (id, name_id, evr_id, package_arch_id) - select rhn_pkgnevra_id_seq.nextval, sp.name_id, sp.evr_id, sp.package_arch_id - from rhnServerPackage sp - where sp.server_id = server_id_in - and not exists - (select 1 - from rhnPackageNEVRA nevra - where nevra.name_id = sp.name_id - and nevra.evr_id = sp.evr_id - and (nevra.package_arch_id = sp.package_arch_id - or (nevra.package_arch_id is null - and sp.package_arch_id is null))); - exit; - exception when dup_val_on_index then - if locked = 1 then - raise; - else - lock table rhnPackageNEVRA in exclusive mode; - locked := 1; - end if; - end; - end loop; - insert into rhnSnapshotPackage (snapshot_id, nevra_id) ( - select distinct snapshot_id, nevra.id - from rhnServerPackage sp, rhnPackageNEVRA nevra - where sp.server_id = server_id_in - and nevra.name_id = sp.name_id - and nevra.evr_id = sp.evr_id - and (nevra.package_arch_id = sp.package_arch_id - or (nevra.package_arch_id is null - and sp.package_arch_id is null)) - ); - - insert into rhnSnapshotConfigChannel ( snapshot_id, config_channel_id ) ( - select snapshot_id, scc.config_channel_id - from rhnServerConfigChannel scc - where server_id = server_id_in - ); - - for revision in revisions loop - insert into rhnSnapshotConfigRevision ( - snapshot_id, config_revision_id - ) values ( - snapshot_id, revision.id - ); - end loop; - end snapshot_server; - - procedure remove_action( - server_id_in in number, - action_id_in in number - ) is - -- this really wants "nulls last", but 8.1.7.3.0 sucks ass. - -- instead, we make a local table that holds our - -- list of ids with null prereqs. There's surely a better way - -- (an array instead of a table maybe? who knows...) - -- but I've got code to do this handy that I can look at ;) - cursor chained_actions is - select id, prerequisite - from rhnAction - start with id = action_id_in - connect by prior id = prerequisite - order by prerequisite desc; - cursor sessions is - select s.id - from rhnKickstartSession s - where server_id_in in (s.old_server_id, s.new_server_id) - and s.action_id = action_id_in - and not exists ( - select 1 - from rhnKickstartSessionState ss - where ss.id = s.state_id - and ss.label in ('failed','complete') - ); - type chain_end_type is table of number index by binary_integer; - chain_ends chain_end_type; - i number; - prereq number := 1; - begin - select prerequisite - into prereq - from rhnAction - where id = action_id_in; - - if prereq is not null then - rhn_exception.raise_exception('action_is_child'); - end if; - - i := 0; - for action in chained_actions loop - if action.prerequisite is null then - chain_ends(i) := action.id; - i := i + 1; - else - delete from rhnServerAction - where server_id = server_id_in - and action_id = action.id; - end if; - end loop; - i := chain_ends.first; - while i is not null loop - delete from rhnServerAction - where server_id = server_id_in - and action_id = chain_ends(i); - i := chain_ends.next(i); - end loop; - for s in sessions loop - update rhnKickstartSession - set state_id = ( - select id - from rhnKickstartSessionState - where label = 'failed' - ), - action_id = null - where id = s.id; - set_ks_session_history_message(s.id, 'failed', 'Kickstart cancelled due to action removal'); - end loop; - end remove_action; - - function check_user_access(server_id_in in number, user_id_in in number) - return number - is - has_access number; - begin - -- first check; if this returns no rows, then the server/user are in different orgs, and we bail - select 1 into has_access - from rhnServer S, - web_contact wc - where wc.org_id = s.org_id - and s.id = server_id_in - and wc.id = user_id_in; - - -- okay, so they're in the same org. if we have an org admin, they get a free pass - if rhn_user.check_role(user_id_in, 'org_admin') = 1 - then - return 1; - end if; - - select 1 into has_access - from rhnServerGroupMembers SGM, - rhnUserServerGroupPerms USG - where SGM.server_group_id = USG.server_group_id - and SGM.server_id = server_id_in - and USG.user_id = user_id_in - and rownum = 1; - - return 1; - exception - when no_data_found - then - return 0; - end check_user_access; - - -- ******************************************************************* - -- FUNCTION: can_server_consume_virt_slot - -- Returns 1 if the server id is eligible to consume a virtual slot, - -- else returns 0. - -- Called by: insert_into_servergroup, delete_from_servergroup - -- ******************************************************************* - function can_server_consume_virt_slot(server_id_in in number, - group_type_in in - rhnServerGroupType.label%TYPE) - return number - is - - cursor server_virt_slots is - select vi.VIRTUAL_SYSTEM_ID - from - rhnVirtualInstance vi - where - -- server id is a virtual instance - vi.VIRTUAL_SYSTEM_ID = server_id_in - -- server id's host is virt entitled - and exists ( select 1 - from rhnServerEntitlementView sev - where vi.HOST_SYSTEM_ID = sev.server_id - and sev.label in ('virtualization_host', - 'virtualization_host_platform') ) - -- server id's host also has the ent we want - and exists ( select 1 - from rhnServerEntitlementView sev2 - where vi.HOST_SYSTEM_ID = sev2.server_id - and sev2.label = group_type_in ); - - begin - for server_virt_slot in server_virt_slots loop - return 1; - end loop; - return 0; - end can_server_consume_virt_slot; - - - procedure insert_into_servergroup ( - server_id_in in number, - server_group_id_in in number - ) is - used_slots number; - max_slots number; - org_id number; - mgmt_available number; - mgmt_upgrade number; - mgmt_sgid number; - prov_available number; - prov_upgrade number; - prov_sgid number; - group_label rhnServerGroupType.label%TYPE; - group_type number; - begin - -- frist, group_type = null, because it's easy... - - -- this will rowlock the servergroup we're trying to change; - -- we probably need to lock the other one, but I think the chances - -- of it being a real issue are very small for now... - select sg.group_type, sg.org_id, sg.current_members, sg.max_members - into group_type, org_id, used_slots, max_slots - from rhnServerGroup sg - where sg.id = server_group_id_in - for update of sg.current_members; - - if group_type is null then - if used_slots >= max_slots then - rhn_exception.raise_exception('servergroup_max_members'); - end if; - - insert into rhnServerGroupMembers( - server_id, server_group_id - ) values ( - server_id_in, server_group_id_in - ); - update rhnServerGroup - set current_members = current_members + 1 - where id = server_group_id_in; - - rhn_cache.update_perms_for_server_group(server_group_id_in); - return; - end if; - - -- now for group_type != null - -- - select label - into group_label - from rhnServerGroupType sgt - where sgt.id = group_type; - - -- the naive easy path that gets hit most often and has to be quickest. - if group_label in ('sw_mgr_entitled', - 'enterprise_entitled', - 'monitoring_entitled', - 'provisioning_entitled', - 'virtualization_host', - 'virtualization_host_platform') then - if used_slots >= max_slots and - (can_server_consume_virt_slot(server_id_in, group_label) != 1) - then - rhn_exception.raise_exception('servergroup_max_members'); - end if; - - insert into rhnServerGroupMembers( - server_id, server_group_id - ) values ( - server_id_in, server_group_id_in - ); - - -- Only update current members if the system in consuming a - -- physical slot. - if can_server_consume_virt_slot(server_id_in, group_label) = 0 then - update rhnServerGroup - set current_members = current_members + 1 - where id = server_group_id_in; - end if; - - return; - end if; - end; - - function insert_into_servergroup_maybe ( - server_id_in in number, - server_group_id_in in number - ) return number is - retval number := 0; - cursor servergroups is - select s.id server_id, - sg.id server_group_id - from rhnServerGroup sg, - rhnServer s - where s.id = server_id_in - and sg.id = server_group_id_in - and s.org_id = sg.org_id - and not exists ( - select 1 - from rhnServerGroupMembers sgm - where sgm.server_id = s.id - and sgm.server_group_id = sg.id - ); - begin - for sgm in servergroups loop - rhn_server.insert_into_servergroup(sgm.server_id, sgm.server_group_id); - retval := retval + 1; - end loop; - return retval; - end insert_into_servergroup_maybe; - - procedure insert_set_into_servergroup ( - server_group_id_in in number, - user_id_in in number, - set_label_in in varchar2 - ) is - cursor servers is - select st.element id - from rhnSet st - where st.user_id = user_id_in - and st.label = set_label_in - and exists ( - select 1 - from rhnUserManagedServerGroups umsg - where umsg.server_group_id = server_group_id_in - and umsg.user_id = user_id_in - ) - and not exists ( - select 1 - from rhnServerGroupMembers sgm - where sgm.server_id = st.element - and sgm.server_group_id = server_group_id_in - ); - begin - for s in servers loop - rhn_server.insert_into_servergroup(s.id, server_group_id_in); - end loop; - end insert_set_into_servergroup; - - procedure delete_from_servergroup ( - server_id_in in number, - server_group_id_in in number - ) is - cursor server_virt_groups is - select 1 - from rhnServerEntitlementVirtual sev - where sev.server_id = server_id_in - and sev.server_group_id = server_group_id_in; - - oid number; - mgmt_sgid number; - label rhnServerGroupType.label%TYPE; - group_type number; - begin - begin - select sg.group_type, sg.org_id - into group_type, oid - from rhnServerGroupMembers sgm, - rhnServerGroup sg - where sg.id = server_group_id_in - and sg.id = sgm.server_group_id - and sgm.server_id = server_id_in - for update of sg.current_members; - exception - when no_data_found then - rhn_exception.raise_exception('server_not_in_group'); - end; - - -- do group_type is null first - if group_type is null then - delete from rhnServerGroupMembers - where server_group_id = server_group_id_in - and server_id = server_id_in; - update rhnServerGroup - set current_members = current_members - 1 - where id = server_group_id_in; - rhn_cache.update_perms_for_server_group(server_group_id_in); - return; - end if; - - select sgt.label - into label - from rhnServerGroupType sgt - where sgt.id = group_type; - - if label in ('sw_mgr_entitled', - 'enterprise_entitled', - 'provisioning_entitled', - 'monitoring_entitled', - 'virtualization_host', - 'virtualization_host_platform') then - - -- Only update current members if the system is consuming - -- a physical slot. - for server_virt_group in server_virt_groups loop - delete from rhnServerGroupMembers - where server_group_id = server_group_id_in - and server_id = server_id_in; - return; - end loop; - - delete from rhnServerGroupMembers - where server_group_id = server_group_id_in - and server_id = server_id_in; - - update rhnServerGroup - set current_members = current_members - 1 - where id = server_group_id_in; - - end if; - end; - - procedure delete_set_from_servergroup ( - server_group_id_in in number, - user_id_in in number, - set_label_in in varchar2 - ) is - cursor servergroups is - select sgm.server_id, sgm.server_group_id - from rhnSet st, - rhnServerGroupMembers sgm - where sgm.server_group_id = server_group_id_in - and st.user_id = user_id_in - and st.label = set_label_in - and sgm.server_id = st.element - and exists ( - select 1 - from rhnUserManagedServerGroups usgp - where usgp.server_group_id = server_group_id_in - and usgp.user_id = user_id_in - ); - begin - for sgm in servergroups loop - rhn_server.delete_from_servergroup(sgm.server_id, server_group_id_in); - end loop; - end delete_set_from_servergroup; - - procedure clear_servergroup ( - server_group_id_in in number - ) is - cursor servers is - select sgm.server_id id - from rhnServerGroupMembers sgm - where sgm.server_group_id = server_group_id_in; - begin - for s in servers loop - rhn_server.delete_from_servergroup(s.id, server_group_id_in); - end loop; - end clear_servergroup; - - procedure delete_from_org_servergroups ( - server_id_in in number - ) is - cursor servergroups is - select sgm.server_group_id id - from rhnServerGroup sg, - rhnServerGroupMembers sgm - where sgm.server_id = server_id_in - and sgm.server_group_id = sg.id - and sg.group_type is null; - begin - for sg in servergroups loop - rhn_server.delete_from_servergroup(server_id_in, sg.id); - end loop; - end delete_from_org_servergroups; - - function get_ip_address ( - server_id_in in number - ) return varchar2 is - cursor interfaces is - select ni.name as name, na4.address as address - from rhnServerNetInterface ni, - rhnServerNetAddress4 na4 - where ni.server_id = server_id_in - and ni.id = na4.interface_id - and na4.address != '127.0.0.1'; - cursor addresses is - select ipaddr ip_addr - from rhnServerNetwork - where server_id = server_id_in - and ipaddr != '127.0.0.1'; - begin - for addr in addresses loop - return addr.ip_addr; - end loop; - for iface in interfaces loop - return iface.address; - end loop; - return NULL; - end get_ip_address; - - procedure update_needed_cache(server_id_in in number) - is - update_lock number; - begin - select 1 - into update_lock - from rhnServer - where id = server_id_in - for update; - delete from rhnServerNeededCache - where server_id = server_id_in; - insert into rhnServerNeededCache - (server_id, errata_id, package_id, channel_id) - (select distinct sp.server_id, x.errata_id, p.id, x.channel_id - FROM (SELECT sp_sp.server_id, sp_sp.name_id, - sp_sp.package_arch_id, max(sp_pe.evr) AS max_evr - FROM rhnServerPackage sp_sp - join rhnPackageEvr sp_pe ON sp_pe.id = sp_sp.evr_id - GROUP BY sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id) sp - join rhnPackage p ON p.name_id = sp.name_id - join rhnPackageEvr pe ON pe.id = p.evr_id - AND sp.max_evr < pe.evr - join rhnPackageUpgradeArchCompat puac - ON puac.package_arch_id = sp.package_arch_id - AND puac.package_upgrade_arch_id = p.package_arch_id - join rhnServerChannel sc ON sc.server_id = sp.server_id - join rhnChannelPackage cp ON cp.package_id = p.id - AND cp.channel_id = sc.channel_id - left join (SELECT ep.errata_id, ce.channel_id, ep.package_id - FROM rhnChannelErrata ce - join rhnErrataPackage ep - ON ep.errata_id = ce.errata_id - join rhnServerChannel sc_sc - ON sc_sc.channel_id = ce.channel_id - WHERE sc_sc.server_id = server_id_in) x - ON x.channel_id = sc.channel_id - AND x.package_id = cp.package_id - where sp.server_id = server_id_in); - end update_needed_cache; - -end rhn_server; -/ -SHOW ERRORS diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql deleted file mode 100644 index ee89929..0000000 --- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/049-rhn_server.pkb.postgresql +++ /dev/null @@ -1,829 +0,0 @@ --- oracle equivalent source sha1 d15b33804b83137c38edd4ca8b7981741cd93e98 --- --- Copyright (c) 2008--2012 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. --- --- --- --- - --- create schema rhn_server; - ---update pg_setting -update pg_settings set setting = 'rhn_server,' || setting where name = 'search_path'; - - create or replace function system_service_level( - server_id_in in numeric, - service_level_in in varchar - ) returns numeric as $$ - declare - ents cursor is - select label from rhnServerEntitlementView - where server_id = server_id_in; - - retval numeric := 0; - - begin - for ent in ents loop - retval := rhn_entitlements.entitlement_grants_service (ent.label, service_level_in); - if retval = 1 then - return retval; - end if; - end loop; - - return retval; - - end$$ language plpgsql; - - - create or replace function can_change_base_channel(server_id_in IN NUMERIC) - returns numeric - as $$ - declare - throwaway numeric; - begin - -- the idea: if we get past this query, the server is - -- neither sat nor proxy, so base channel is changeable - - select 1 into throwaway - from rhnServer S - where S.id = server_id_in - and not exists (select 1 from rhnSatelliteInfo SI where SI.server_id = S.id) - and not exists (select 1 from rhnProxyInfo PI where PI.server_id = S.id); - - if not found then - return 0; - end if; - - return 1; - end$$ language plpgsql; - - create or replace function set_custom_value( - server_id_in in numeric, - user_id_in in numeric, - key_label_in in varchar, - value_in in varchar - ) returns void - as $$ - declare - key_id_val numeric; - begin - select CDK.id into strict key_id_val - from rhnCustomDataKey CDK, - rhnServer S - where S.id = server_id_in - and S.org_id = CDK.org_id - and CDK.label = key_label_in; - - begin - insert into rhnServerCustomDataValue (server_id, key_id, value, created_by, last_modified_by) - values (server_id_in, key_id_val, value_in, user_id_in, user_id_in); - exception - when UNIQUE_VIOLATION - then - update rhnServerCustomDataValue - set value = value_in, - last_modified_by = user_id_in - where server_id = server_id_in - and key_id = key_id_val; - end; - - end$$ language plpgsql; - - create or replace function bulk_set_custom_value( - key_label_in in varchar, - value_in in varchar, - set_label_in in varchar, - set_uid_in in numeric - ) - returns integer - as $$ - declare - i integer; - server record; - begin - i := 0; - for server in ( - SELECT user_id, label, element, element_two - FROM rhnSet - WHERE label = set_label_in - AND user_id = set_uid_in - ) loop - if rhn_server.system_service_level(server.element, 'provisioning') = 1 then - perform rhn_server.set_custom_value(server.element, set_uid_in, key_label_in, value_in); - i := i + 1; - end if; - end loop; - return i; - end$$ language plpgsql; - - create or replace function bulk_snapshot_tag( - org_id_in in numeric, - tagname_in in varchar, - set_label_in in varchar, - set_uid_in in numeric - ) returns void - as $$ - declare - server record; - snapshot_id numeric; - begin - for server in ( - SELECT user_id, label, element, element_two - FROM rhnSet - WHERE label = set_label_in - AND user_id = set_uid_in - ) loop - if rhn_server.system_service_level(server.element, 'provisioning') = 1 then - select max(id) into snapshot_id - from rhnSnapshot - where server_id = server.element; - - if snapshot_id is null then - perform rhn_server.snapshot_server(server.element, 'tagging system: ' || tagname_in); - - select max(id) into snapshot_id - from rhnSnapshot - where server_id = server.element; - end if; - - -- now have a snapshot_id to work with... - begin - perform rhn_server.tag_snapshot(snapshot_id, org_id_in, tagname_in); - exception - when UNIQUE_VIOLATION - then - -- do nothing, be forgiving... - null; - end; - end if; - end loop; - end$$ language plpgsql; - - create or replace function tag_delete( - server_id_in in numeric, - tag_id_in in numeric - ) returns void - as $$ - declare - snapshots cursor is - select snapshot_id - from rhnSnapshotTag - where tag_id = tag_id_in; - tag_id_tmp numeric; - begin - select id into tag_id_tmp - from rhnTag - where id = tag_id_in - for update; - - delete - from rhnSnapshotTag - where server_id = server_id_in - and tag_id = tag_id_in; - for snapshot in snapshots loop - return; - end loop; - delete - from rhnTag - where id = tag_id_in; - end$$ language plpgsql; - - create or replace function tag_snapshot( - snapshot_id_in in numeric, - org_id_in in numeric, - tagname_in in varchar - ) returns void - as $$ - begin - insert into rhnSnapshotTag (snapshot_id, server_id, tag_id) - select snapshot_id_in, server_id, lookup_tag(org_id_in, tagname_in) - from rhnSnapshot - where id = snapshot_id_in; - end$$ language plpgsql; - - create or replace function bulk_snapshot( - reason_in in varchar, - set_label_in in varchar, - set_uid_in in numeric - ) returns void - as $$ - declare - server record; - begin - for server in ( - SELECT user_id, label, element, element_two - FROM rhnSet - WHERE label = set_label_in - AND user_id = set_uid_in - ) loop - if rhn_server.system_service_level(server.element, 'provisioning') = 1 then - perform rhn_server.snapshot_server(server.element, reason_in); - end if; - end loop; - end$$ language plpgsql; - - create or replace function snapshot_server( - server_id_in in numeric, - reason_in in varchar - ) returns void - as $$ - declare - snapshot_id_v numeric; - revisions cursor is - select distinct - cr.id - from rhnConfigRevision cr, - rhnConfigFileName cfn, - rhnConfigFile cf, - rhnConfigChannel cc, - rhnServerConfigChannel scc - where 1=1 - and scc.server_id = server_id_in - and scc.config_channel_id = cc.id - and cc.id = cf.config_channel_id - and cf.id = cr.config_file_id - and cr.id = cf.latest_config_revision_id - and cf.config_file_name_id = cfn.id - and cf.id = lookup_first_matching_cf(scc.server_id, cfn.path); - locked integer; - begin - select nextval('rhn_snapshot_id_seq') into snapshot_id_v; - - insert into rhnSnapshot (id, org_id, server_id, reason) ( - select snapshot_id_v, - s.org_id, - server_id_in, - reason_in - from rhnServer s - where s.id = server_id_in - ); - insert into rhnSnapshotChannel (snapshot_id, channel_id) ( - select snapshot_id_v, sc.channel_id - from rhnServerChannel sc - where sc.server_id = server_id_in - ); - insert into rhnSnapshotServerGroup (snapshot_id, server_group_id) ( - select snapshot_id_v, sgm.server_group_id - from rhnServerGroupMembers sgm - where sgm.server_id = server_id_in - ); - locked := 0; - <<iloop>> - while true loop - begin - insert into rhnPackageNEVRA (id, name_id, evr_id, package_arch_id) - select nextval('rhn_pkgnevra_id_seq'), sp.name_id, sp.evr_id, sp.package_arch_id - from rhnServerPackage sp - where sp.server_id = server_id_in - and not exists - (select 1 - from rhnPackageNEVRA nevra - where nevra.name_id = sp.name_id - and nevra.evr_id = sp.evr_id - and (nevra.package_arch_id = sp.package_arch_id - or (nevra.package_arch_id is null - and sp.package_arch_id is null))); - exit iloop; - exception when unique_violation then - if locked = 1 then - raise; - else - lock table rhnPackageNEVRA in exclusive mode; - locked := 1; - end if; - end; - end loop; - insert into rhnSnapshotPackage (snapshot_id, nevra_id) ( - select distinct snapshot_id_v, nevra.id - from rhnServerPackage sp, rhnPackageNEVRA nevra - where sp.server_id = server_id_in - and nevra.name_id = sp.name_id - and nevra.evr_id = sp.evr_id - and (nevra.package_arch_id = sp.package_arch_id - or (nevra.package_arch_id is null - and sp.package_arch_id is null)) - ); - - insert into rhnSnapshotConfigChannel ( snapshot_id, config_channel_id ) ( - select snapshot_id_v, scc.config_channel_id - from rhnServerConfigChannel scc - where server_id = server_id_in - ); - - for revision in revisions loop - insert into rhnSnapshotConfigRevision ( - snapshot_id, config_revision_id - ) values ( - snapshot_id_v, revision.id - ); - end loop; - end$$ language plpgsql; - - create or replace function remove_action( - server_id_in in numeric, - action_id_in in numeric - ) returns void - as $$ - declare - -- this really wants "nulls last", but 8.1.7.3.0 sucks ass. - -- instead, we make a local table that holds our - -- list of ids with null prereqs. There's surely a better way - -- (an array instead of a table maybe? who knows...) - -- but I've got code to do this handy that I can look at ;) - chained_actions cursor is - with recursive r(id, prerequisite) as ( - select id, prerequisite - from rhnAction - where id = action_id_in - union all - select r1.id, r1.prerequisite - from rhnAction r1, r - where r.id = r1.prerequisite - ) - select * from r - order by prerequisite desc; - sessions cursor is - select s.id - from rhnKickstartSession s - where server_id_in in (s.old_server_id, s.new_server_id) - and s.action_id = action_id_in - and not exists ( - select 1 - from rhnKickstartSessionState ss - where ss.id = s.state_id - and ss.label in ('failed','complete') - ); - chain_ends numeric[]; - i numeric; - prereq numeric := 1; - begin - select prerequisite - into prereq - from rhnAction - where id = action_id_in; - - if prereq is not null then - perform rhn_exception.raise_exception('action_is_child'); - end if; - - chain_ends := '{}'; - i := 1; - for action in chained_actions loop - if action.prerequisite is null then - chain_ends[i] := action.id; - i := i + 1; - else - delete from rhnServerAction - where server_id = server_id_in - and action_id = action.id; - end if; - end loop; - - delete from rhnServerAction - where server_id = server_id_in - and action_id = any(chain_ends); - - for s in sessions loop - update rhnKickstartSession - set state_id = ( - select id - from rhnKickstartSessionState - where label = 'failed' - ), - action_id = null - where id = s.id; - perform set_ks_session_history_message(s.id, 'failed', 'Kickstart cancelled due to action removal'); - end loop; - end$$ language plpgsql; - - create or replace function check_user_access(server_id_in in numeric, user_id_in in numeric) - returns numeric - as $$ - declare - has_access numeric; - begin - -- first check; if this returns no rows, then the server/user are in different orgs, and we bail - select 1 into has_access - from rhnServer S, - web_contact wc - where wc.org_id = s.org_id - and s.id = server_id_in - and wc.id = user_id_in; - - if not found then - return 0; - end if; - - -- okay, so they're in the same org. if we have an org admin, they get a free pass - if rhn_user.check_role(user_id_in, 'org_admin') = 1 - then - return 1; - end if; - - select 1 into has_access - from rhnServerGroupMembers SGM, - rhnUserServerGroupPerms USG - where SGM.server_group_id = USG.server_group_id - and SGM.server_id = server_id_in - and USG.user_id = user_id_in; - - if not found then - return 0; - end if; - - return 1; - end$$ language plpgsql; - - -- ******************************************************************* - -- FUNCTION: can_server_consume_virt_slot - -- Returns 1 if the server id is eligible to consume a virtual slot, - -- else returns 0. - -- Called by: insert_into_servergroup, delete_from_servergroup - -- ******************************************************************* - create or replace function can_server_consume_virt_slot(server_id_in in numeric, - group_type_in in varchar) - returns numeric - as $$ - declare - server_virt_slots cursor is - select vi.VIRTUAL_SYSTEM_ID - from - rhnVirtualInstance vi - where - -- server id is a virtual instance - vi.VIRTUAL_SYSTEM_ID = server_id_in - -- server id's host is virt entitled - and exists ( select 1 - from rhnServerEntitlementView sev - where vi.HOST_SYSTEM_ID = sev.server_id - and sev.label in ('virtualization_host', - 'virtualization_host_platform') ) - -- server id's host also has the ent we want - and exists ( select 1 - from rhnServerEntitlementView sev2 - where vi.HOST_SYSTEM_ID = sev2.server_id - and sev2.label = group_type_in ); - - begin - for server_virt_slot in server_virt_slots loop - return 1; - end loop; - return 0; - end$$ language plpgsql; - - - create or replace function insert_into_servergroup ( - server_id_in in numeric, - server_group_id_in in numeric - ) returns void - as $$ - declare - used_slots numeric; - max_slots numeric; - org_id numeric; - mgmt_available numeric; - mgmt_upgrade numeric; - mgmt_sgid numeric; - prov_available numeric; - prov_upgrade numeric; - prov_sgid numeric; - group_label varchar; - group_type numeric; - begin - -- first, group_type = null, because it's easy... - - -- this will rowlock the servergroup we're trying to change; - -- we probably need to lock the other one, but I think the chances - -- of it being a real issue are very small for now... - select sg.group_type, sg.org_id, sg.current_members, sg.max_members - into group_type, org_id, used_slots, max_slots - from rhnServerGroup sg - where sg.id = server_group_id_in - for update of sg; - - if group_type is null then - if used_slots >= max_slots then - perform rhn_exception.raise_exception('servergroup_max_members'); - end if; - - insert into rhnServerGroupMembers( - server_id, server_group_id - ) values ( - server_id_in, server_group_id_in - ); - update rhnServerGroup - set current_members = current_members + 1 - where id = server_group_id_in; - - perform rhn_cache.update_perms_for_server_group(server_group_id_in); - return; - end if; - - -- now for group_type != null - -- - select label - into group_label - from rhnServerGroupType sgt - where sgt.id = group_type; - - -- the naive easy path that gets hit most often and has to be quickest. - if group_label in ('sw_mgr_entitled', - 'enterprise_entitled', - 'monitoring_entitled', - 'provisioning_entitled', - 'virtualization_host', - 'virtualization_host_platform') then - if used_slots >= max_slots and - (rhn_server.can_server_consume_virt_slot(server_id_in, group_label) != 1) - then - perform rhn_exception.raise_exception('servergroup_max_members'); - end if; - - insert into rhnServerGroupMembers( - server_id, server_group_id - ) values ( - server_id_in, server_group_id_in - ); - - -- Only update current members if the system in consuming a - -- physical slot. - if rhn_server.can_server_consume_virt_slot(server_id_in, group_label) = 0 then - update rhnServerGroup - set current_members = current_members + 1 - where id = server_group_id_in; - end if; - - return; - end if; - end$$ language plpgsql; - - create or replace function insert_into_servergroup_maybe ( - server_id_in in numeric, - server_group_id_in in numeric - ) returns numeric as $$ - declare - retval numeric := 0; - servergroups cursor is - select s.id server_id, - sg.id server_group_id - from rhnServerGroup sg, - rhnServer s - where s.id = server_id_in - and sg.id = server_group_id_in - and s.org_id = sg.org_id - and not exists ( - select 1 - from rhnServerGroupMembers sgm - where sgm.server_id = s.id - and sgm.server_group_id = sg.id - ); - begin - for sgm in servergroups loop - perform rhn_server.insert_into_servergroup(sgm.server_id, sgm.server_group_id); - retval := retval + 1; - end loop; - return retval; - end$$ language plpgsql; - - create or replace function insert_set_into_servergroup ( - server_group_id_in in numeric, - user_id_in in numeric, - set_label_in in varchar - ) returns void - as $$ - declare - servers cursor is - select st.element id - from rhnSet st - where st.user_id = user_id_in - and st.label = set_label_in - and exists ( - select 1 - from rhnUserManagedServerGroups umsg - where umsg.server_group_id = server_group_id_in - and umsg.user_id = user_id_in - ) - and not exists ( - select 1 - from rhnServerGroupMembers sgm - where sgm.server_id = st.element - and sgm.server_group_id = server_group_id_in - ); - begin - for s in servers loop - perform rhn_server.insert_into_servergroup(s.id, server_group_id_in); - end loop; - end$$ language plpgsql; - - create or replace function delete_from_servergroup ( - server_id_in in numeric, - server_group_id_in in numeric - ) returns void - as $$ - declare - server_virt_groups cursor is - select 1 - from rhnServerEntitlementVirtual sev - where sev.server_id = server_id_in - and sev.server_group_id = server_group_id_in; - - oid numeric; - mgmt_sgid numeric; - label varchar; - group_type numeric; - begin - select sg.group_type, sg.org_id - into group_type, oid - from rhnServerGroupMembers sgm, - rhnServerGroup sg - where sg.id = server_group_id_in - and sg.id = sgm.server_group_id - and sgm.server_id = server_id_in - for update of sg; - - if not found then - perform rhn_exception.raise_exception('server_not_in_group'); - end if; - - -- do group_type is null first - if group_type is null then - delete from rhnServerGroupMembers - where server_group_id = server_group_id_in - and server_id = server_id_in; - update rhnServerGroup - set current_members = current_members - 1 - where id = server_group_id_in; - perform rhn_cache.update_perms_for_server_group(server_group_id_in); - return; - end if; - - select sgt.label - into label - from rhnServerGroupType sgt - where sgt.id = group_type; - - if label in ('sw_mgr_entitled', - 'enterprise_entitled', - 'provisioning_entitled', - 'monitoring_entitled', - 'virtualization_host', - 'virtualization_host_platform') then - - -- Only update current members if the system is consuming - -- a physical slot. - for server_virt_group in server_virt_groups loop - delete from rhnServerGroupMembers - where server_group_id = server_group_id_in - and server_id = server_id_in; - return; - end loop; - - delete from rhnServerGroupMembers - where server_group_id = server_group_id_in - and server_id = server_id_in; - - update rhnServerGroup - set current_members = current_members - 1 - where id = server_group_id_in; - - end if; - end$$ language plpgsql; - - create or replace function delete_set_from_servergroup ( - server_group_id_in in numeric, - user_id_in in numeric, - set_label_in in varchar - ) returns void - as $$ - declare - servergroups cursor is - select sgm.server_id, sgm.server_group_id - from rhnSet st, - rhnServerGroupMembers sgm - where sgm.server_group_id = server_group_id_in - and st.user_id = user_id_in - and st.label = set_label_in - and sgm.server_id = st.element - and exists ( - select 1 - from rhnUserManagedServerGroups usgp - where usgp.server_group_id = server_group_id_in - and usgp.user_id = user_id_in - ); - begin - for sgm in servergroups loop - perform rhn_server.delete_from_servergroup(sgm.server_id, server_group_id_in); - end loop; - end$$ language plpgsql; - - create or replace function clear_servergroup ( - server_group_id_in in numeric - ) returns void - as $$ - declare - servers cursor is - select sgm.server_id id - from rhnServerGroupMembers sgm - where sgm.server_group_id = server_group_id_in; - begin - for s in servers loop - perform rhn_server.delete_from_servergroup(s.id, server_group_id_in); - end loop; - end$$ language plpgsql; - - create or replace function delete_from_org_servergroups ( - server_id_in in numeric - ) returns void - as $$ - declare - servergroups cursor is - select sgm.server_group_id id - from rhnServerGroup sg, - rhnServerGroupMembers sgm - where sgm.server_id = server_id_in - and sgm.server_group_id = sg.id - and sg.group_type is null; - begin - for sg in servergroups loop - perform rhn_server.delete_from_servergroup(server_id_in, sg.id); - end loop; - end$$ language plpgsql; - - create or replace function get_ip_address ( - server_id_in in numeric - ) returns varchar as $$ - declare - interfaces cursor is - select ni.name as name, na4.address as address - from rhnServerNetInterface ni, - rhnServerNetAddress4 na4 - where server_id = server_id_in - and ni.id = na4.interface_id - and na4.address != '127.0.0.1'; - addresses cursor is - select ipaddr ip_addr - from rhnServerNetwork - where server_id = server_id_in - and ipaddr != '127.0.0.1'; - begin - for addr in addresses loop - return addr.ip_addr; - end loop; - for iface in interfaces loop - return iface.address; - end loop; - return NULL; - end$$ language plpgsql; - - create or replace function update_needed_cache( - server_id_in in numeric - ) returns void as $$ - declare - update_lock numeric; - begin - select 1 - into update_lock - from rhnServer - where id = server_id_in - for update; - delete from rhnServerNeededCache - where server_id = server_id_in; - insert into rhnServerNeededCache - (server_id, errata_id, package_id, channel_id) - (select distinct sp.server_id, x.errata_id, p.id, x.channel_id - FROM (SELECT sp_sp.server_id, sp_sp.name_id, - sp_sp.package_arch_id, max(sp_pe.evr) AS max_evr - FROM rhnServerPackage sp_sp - join rhnPackageEvr sp_pe ON sp_pe.id = sp_sp.evr_id - GROUP BY sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id) sp - join rhnPackage p ON p.name_id = sp.name_id - join rhnPackageEvr pe ON pe.id = p.evr_id AND sp.max_evr < pe.evr - join rhnPackageUpgradeArchCompat puac - ON puac.package_arch_id = sp.package_arch_id - AND puac.package_upgrade_arch_id = p.package_arch_id - join rhnServerChannel sc ON sc.server_id = sp.server_id - join rhnChannelPackage cp ON cp.package_id = p.id - AND cp.channel_id = sc.channel_id - left join (SELECT ep.errata_id, ce.channel_id, ep.package_id - FROM rhnChannelErrata ce - join rhnErrataPackage ep - ON ep.errata_id = ce.errata_id - join rhnServerChannel sc_sc - ON sc_sc.channel_id = ce.channel_id - WHERE sc_sc.server_id = server_id_in) x - ON x.channel_id = sc.channel_id AND x.package_id = cp.package_id - where sp.server_id = server_id_in); - end$$ language plpgsql; --- restore the original setting -update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_server')+1) ) where name = 'search_path';

1 0

Changes to 'refs/tags/spacewalk-web-2.1.56-1'
by Tomáš Kašpárek 12 Feb '14

12 Feb '14

Tag 'spacewalk-web-2.1.56-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2014-02-12 14:38 +0000 Tagging package [spacewalk-web] version [2.1.56-1] in directory [web/]. Changes since spacewalk-schema-2.1.42-1: Tomas Kasparek (1): Automatic commit of package [spacewalk-web] release [2.1.56-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages web/spacewalk-web.spec
by Tomáš Kašpárek 12 Feb '14

12 Feb '14

rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) New commits: commit 96d0964751733492751c827510513bb66bb0c47a Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Wed Feb 12 15:38:39 2014 +0100 Automatic commit of package [spacewalk-web] release [2.1.56-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 37ee506..01d5512 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.55-1 web/ +2.1.56-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 494c202..566a4a6 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.55 +Version: 2.1.56 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -269,6 +269,14 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Wed Feb 12 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.56-1 +- Fixes bar going from 0..9 A..Z on + /rhn/systems/details/packages/PackageList.do but A..Z 0..9 on + /rhn/systems/SystemEntitlements.do and + /network/systems/system_list/regular_in_channel_family.pxt +- different set of pagination arrows on + /network/systems/system_list/regular_in_channel_family.pxt + * Tue Feb 11 2014 Grant Gainey 2.1.55-1 - 1063915, CVE-2013-4415 - Missed changing Search.do to post, perl-side

1 0

Changes to 'refs/tags/spacewalk-schema-2.1.42-1'
by Tomáš Kašpárek 12 Feb '14

12 Feb '14

Tag 'spacewalk-schema-2.1.42-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2014-02-12 14:36 +0000 Tagging package [spacewalk-schema] version [2.1.42-1] in directory [schema/spacewalk/]. Changes since spacewalk-java-2.1.149-1: Tomas Kasparek (1): Automatic commit of package [spacewalk-schema] release [2.1.42-1]. --- rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages schema/spacewalk
by Tomáš Kašpárek 12 Feb '14

12 Feb '14

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 83107d74910c32d48a1a3d65d7f500d5bacd4ed0 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Wed Feb 12 15:36:57 2014 +0100 Automatic commit of package [spacewalk-schema] release [2.1.42-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index e8fb97a..b3c33d7 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -2.1.41-1 schema/spacewalk/ +2.1.42-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 1856fc5..4f7a513 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -4,7 +4,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 2.1.41 +Version: 2.1.42 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Wed Feb 12 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.42-1 +- Add missing GMT+3 timezone as Saudi Arabia + * Tue Feb 11 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.41-1 - fix sha1 sums

1 0

Changes to 'refs/tags/spacewalk-java-2.1.149-1'
by Tomáš Kašpárek 12 Feb '14

12 Feb '14

Tag 'spacewalk-java-2.1.149-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2014-02-12 14:35 +0000 Tagging package [spacewalk-java] version [2.1.149-1] in directory [java/]. Changes since spacewalk-branding-2.1.27-1: Duncan Mac-Vicar P (10): fix spanish translation for selected systems (string does not take a parameter anymore) fix unclosed that broke the top pagination selected count /rhn/admin/config/MonitoringConfig.do panel inside a panel in rhn/configuration/Overview.do, just different set of pagination arrows on /network/systems/system_list/regular_in_channel_family.pxt Fixes bar going from 0..9 A..Z on /rhn/systems/details/packages/PackageList.do but A..Z 0..9 on /rhn/systems/SystemEntitlements.do and /network/systems/system_list/regular_in_channel_family.pxt Unstyled elements in /rhn/errata/manage/AddPackages.do?eid=... /rhn/systems/ssm/MigrateSystems.do popup menu (aka select) after 'Target Orgenization' is not styled use help-block for help text in form /rhn/systems/details/configuration/addfiles/CreateFile.do?sid=... Johannes Renner (1): Add missing GMT+3 timezone as Saudi Arabia Michael Mraka (1): query should not end with semicolon in oracle Tomas Kasparek (4): style CreateUser page so it resembles old look Revert "fix spanish translation for selected systems (string does not take a parameter anymore)" fix spanish translation for selected systems (string does not take a parameter anymore) Automatic commit of package [spacewalk-java] release [2.1.149-1]. --- backend/satellite_tools/spacewalk-remove-channel | 2 branding/css/spacewalk-theme.less | 11 + java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml | 6 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 2 java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 2 java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp | 22 ++ java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 12 - java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 100 ++++------ java/code/webapp/WEB-INF/pages/errata/packages/add.jsp | 50 ++--- java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp | 40 ++-- java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 10 - java/spacewalk-java.spec | 25 ++ rel-eng/packages/spacewalk-java | 2 schema/spacewalk/common/data/rhnTimezone.sql | 6 schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/050-rhnTimezone-data.sql | 12 + web/modules/sniglets/Sniglets/ListView/List.pm | 10 - 16 files changed, 187 insertions(+), 125 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek 12 Feb '14

12 Feb '14

java/spacewalk-java.spec | 25 ++++++++++++++++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) New commits: commit f9d0ad8e370e420b92013cb271349b9948ffd7ef Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Wed Feb 12 15:35:15 2014 +0100 Automatic commit of package [spacewalk-java] release [2.1.149-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index c88916b..7e078b8 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.148 +Version: 2.1.149 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -801,6 +801,29 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Feb 12 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.149-1 +- fix spanish translation for selected systems (string does not take a + parameter anymore) +- Revert "fix spanish translation for selected systems (string does not take a + parameter anymore)" +- Add missing GMT+3 timezone as Saudi Arabia +- style CreateUser page so it resembles old look +- /rhn/systems/details/configuration/addfiles/CreateFile.do?sid=... too much + space between radios due to wrong usage of form-group. +- use help-block for help text in form +- /rhn/systems/ssm/MigrateSystems.do popup menu (aka select) after 'Target + Orgenization' is not styled +- Unstyled elements in /rhn/errata/manage/AddPackages.do?eid=... +- panel inside a panel in rhn/configuration/Overview.do, just give a title to + the list, which is already a panel. +- /rhn/admin/config/MonitoringConfig.do help texts ((e.g. 'redhat.com' for + myemail@…)) should be bellow input bars (see + /rhn/activationkeys/Edit.do?tid=1 how it should look like) +- fix unclosed that broke the top pagination selected count for example + /rhn/systems/DuplicateIPList.do +- fix spanish translation for selected systems (string does not take a + parameter anymore) + * Tue Feb 11 2014 Grant Gainey <ggainey(a)redhat.com> 2.1.148-1 - 1063915, CVE-2013-4415 - Fix XSS flaws in Spacewalk-search - 1063915, CVE-2013-4415 - Fix XSS in new-list-tag by escaping _LABEL_SELECTED diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 1342778..22ed532 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.148-1 java/ +2.1.149-1 java/

1 0

2 commits - java/buildconf
by Tomáš Kašpárek 12 Feb '14

12 Feb '14

java/buildconf/build-taskdefs.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit 8e3f257dad0311933f9718a8f65d4374938747bc Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Wed Feb 12 15:02:09 2014 +0100 fix spanish translation for selected systems (string does not take a parameter anymore) diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index 9e31510..3156157 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -1350,7 +1350,7 @@ 5 systems selected </context> </context-group> - <target>{0} sistemas seleccionados</target> + <target>sistemas seleccionados</target> </trans-unit>  <trans-unit id="footer.jsp.copyright"> commit 703702ab00e78bcdc7ade98e0079b6966d48a5f7 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Wed Feb 12 14:57:33 2014 +0100 Revert "fix spanish translation for selected systems (string does not take a parameter anymore)" This reverts commit 268ad12a92fcc26cc71ec9a1cdcffc69aac519fa. buildconf changes did it there accidentaly reverting diff --git a/java/buildconf/build-taskdefs.xml b/java/buildconf/build-taskdefs.xml index 551bc59..121905f 100644 --- a/java/buildconf/build-taskdefs.xml +++ b/java/buildconf/build-taskdefs.xml @@ -1,17 +1,17 @@ <project name="build-taskdefs"> <target name="init-ivy" depends="boot-deps" unless="installbuild"> <taskdef name="ivy-retrieve" - classname="org.apache.ivy.ant.IvyRetrieve" - classpathref="bootjars" /> + classname="fr.jayasoft.ivy.ant.IvyRetrieve" + classpathref="bootjars"/> <taskdef name="ivy-configure" - classname="org.apache.ivy.ant.IvyConfigure" - classpathref="bootjars" /> + classname="fr.jayasoft.ivy.ant.IvyConfigure" + classpathref="bootjars"/> <taskdef name="ivy-resolve" - classname="org.apache.ivy.ant.IvyResolve" - classpathref="bootjars" /> + classname="fr.jayasoft.ivy.ant.IvyResolve" + classpathref="bootjars"/> <taskdef name="ivy-publish" - classname="org.apache.ivy.ant.IvyPublish" - classpathref="bootjars" /> + classname="fr.jayasoft.ivy.ant.IvyPublish" + classpathref="bootjars"/> </target> <target name="init-taskdefs" depends="link-jars,compile-internal" diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index 3156157..9e31510 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -1350,7 +1350,7 @@ 5 systems selected </context> </context-group> - <target>sistemas seleccionados</target> + <target>{0} sistemas seleccionados</target> </trans-unit>  <trans-unit id="footer.jsp.copyright">

1 0

backend/satellite_tools
by Michael Mraka 12 Feb '14

12 Feb '14

backend/satellite_tools/spacewalk-remove-channel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fe7eae1b5e7b5fae73ecf145b6fa25d753c087a0 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Feb 12 14:17:49 2014 +0100 query should not end with semicolon in oracle diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel index 5b5380f..e40b288 100755 --- a/backend/satellite_tools/spacewalk-remove-channel +++ b/backend/satellite_tools/spacewalk-remove-channel @@ -559,7 +559,7 @@ def _delete_ks_files(channel_labels): join rhnChannel cx on cx.id = ktx.channel_id where replace(ktx.base_path, :mnt_point, '') = replace(kt.base_path, :mnt_point, '') - and cx.label not in (%s)); + and cx.label not in (%s)) """ params, bind_params = _bind_many(channel_labels)

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits February 2014