client/tools rel-eng/packages
by Milan Zazrivec
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a562fc613d767cbe67cf536a187d237eb71c0e44
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Sep 5 14:51:47 2013 +0200
Automatic commit of package [rhncfg] release [5.10.58-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 27dcb77..5a2a746 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.57
+Version: 5.10.58
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -120,6 +120,9 @@ fi
# $Id$
%changelog
+* Thu Sep 05 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 5.10.58-1
+- 1002880 - Selinux status check for diff function from cli
+
* Wed Sep 04 2013 Stephen Herr <sherr(a)redhat.com> 5.10.57-1
- 908011 - require correct rhn-client-tools for RHEL 5
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 7579000..2f1eb62 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.57-1 client/tools/rhncfg/
+5.10.58-1 client/tools/rhncfg/
10 years, 9 months
client/tools
by Milan Zazrivec
client/tools/rhncfg/config_client/rhncfgcli_verify.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 0dac0283cb9e285c3491a70b0a7c2c7490fabf3b
Author: Neha Rawat <nerawat(a)redhat.com>
Date: Fri Aug 30 15:18:09 2013 +0530
1002880 - Selinux status check for diff function from cli
Signed-off-by: Neha Rawat <nerawat(a)redhat.com>
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_verify.py b/client/tools/rhncfg/config_client/rhncfgcli_verify.py
index 22d6195..93cc280 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_verify.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_verify.py
@@ -21,11 +21,14 @@ import os
import stat
import pwd, grp
try:
- from selinux import lgetfilecon
+ from selinux import lgetfilecon, is_selinux_enabled
except:
# on rhel4 we do not support selinux
def lgetfilecon(path):
return [0, '']
+ def is_selinux_enabled():
+ return 0
+
class Handler(handler_base.HandlerBase):
_usage_options = handler_base.HandlerBase._usage_options + " [ files ... ]"
@@ -251,6 +254,8 @@ class Handler(handler_base.HandlerBase):
dst_selinux = lgetfilecon(dst)[1]
except OSError:
dst_selinux = ""
+ if not is_selinux_enabled():
+ dst_selinux = ""
if dst_selinux == None:
dst_selinux = ""
else:
10 years, 9 months
Changes to 'refs/tags/spacewalk-schema-2.1.15-1'
by StephenHerr
Tag 'spacewalk-schema-2.1.15-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-09-05 12:47 +0000
Tagging package [spacewalk-schema] version [2.1.15-1] in directory [schema/spacewalk/].
Changes since spacewalk-backend-2.1.16-1:
Grant Gainey (1):
Make checkstyle happy
Stephen Herr (2):
999453 - move the rhnServerNeededView sql into the function for performance
Automatic commit of package [spacewalk-schema] release [2.1.15-1].
Tomas Lestach (1):
998951 - fix configchannel.getEncodedFileRevision API doc
---
java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemAction.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/SystemRemoteCommandAction.java | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 3
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/views/views.deps | 5
schema/spacewalk/oracle/packages/packages.deps | 5
schema/spacewalk/oracle/packages/rhn_server.pkb | 36
schema/spacewalk/oracle/procs/procs.deps | 5
schema/spacewalk/oracle/procs/queue_server.sql | 7
schema/spacewalk/postgres/packages/packages.deps | 5
schema/spacewalk/postgres/packages/rhn_server.pkb | 35
schema/spacewalk/postgres/procs/procs.deps | 5
schema/spacewalk/postgres/procs/queue_server.sql | 7
schema/spacewalk/spacewalk-schema.spec | 7
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/016-rhnServerNeededView.sql.oracle | 790 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/016-rhnServerNeededView.sql.postgresql | 63
16 files changed, 938 insertions(+), 45 deletions(-)
---
10 years, 9 months
2 commits - rel-eng/packages schema/spacewalk
by StephenHerr
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/views/views.deps | 5
schema/spacewalk/oracle/packages/packages.deps | 5
schema/spacewalk/oracle/packages/rhn_server.pkb | 36
schema/spacewalk/oracle/procs/procs.deps | 5
schema/spacewalk/oracle/procs/queue_server.sql | 7
schema/spacewalk/postgres/packages/packages.deps | 5
schema/spacewalk/postgres/packages/rhn_server.pkb | 35
schema/spacewalk/postgres/procs/procs.deps | 5
schema/spacewalk/postgres/procs/queue_server.sql | 7
schema/spacewalk/spacewalk-schema.spec | 7
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/016-rhnServerNeededView.sql.oracle | 790 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/016-rhnServerNeededView.sql.postgresql | 63
13 files changed, 930 insertions(+), 42 deletions(-)
New commits:
commit 9b6f61aeb06f636148e424af6857514d333727c2
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Sep 5 08:47:35 2013 -0400
Automatic commit of package [spacewalk-schema] release [2.1.15-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 1d06682..ef085f2 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-2.1.14-1 schema/spacewalk/
+2.1.15-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index cf10118..dcad2f8 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.14
+Version: 2.1.15
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu Sep 05 2013 Stephen Herr <sherr(a)redhat.com> 2.1.15-1
+- 999453 - move the rhnServerNeededView sql into the function for performance
+- Revert "999453 - update rhnServerNeededView to make it easier to optimize for
+ fast execution"
+
* Thu Aug 29 2013 Stephen Herr <sherr(a)redhat.com> 2.1.14-1
- 999453 - update rhnServerNeededView to make it easier to optimize for fast
execution
commit f70898d4a5a3ea33d4870c02ba3f45e592e8e9c7
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Sep 4 16:19:29 2013 -0400
999453 - move the rhnServerNeededView sql into the function for performance
diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps
index 1c4d2c5..7ab1235 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -92,11 +92,6 @@ rhnSharedChannelView :: rhnChannel rhnChannelTrust rhnTrustedOrgs
rhnSharedChannelTreeView :: rhnSharedChannelView
rhnUserActionOverview :: rhnActionStatus rhnUserServerPerms rhnServerAction \
rhnActionOverview
-rhnServerNeededView :: rhnPackage rhnChannelNewestPackage \
- rhnPackageEVR rhnServerPackage \
- rhnChannelPackage rhnServerChannel \
- rhnServer rhnErrataPackage \
- rhnChannelErrata rhnPackageUpgradeArchCompat
rhnPackageChangeLog :: rhnPackageChangeLogData rhnPackageChangeLogRec
rhnUserReceiveNotifications :: rhnUserServerPerms rhnWebContactDisabled web_contact \
rhnUserInfo web_user_personal_info rhnUserServerPrefs
diff --git a/schema/spacewalk/oracle/packages/packages.deps b/schema/spacewalk/oracle/packages/packages.deps
index cae18dc..9606b8e 100644
--- a/schema/spacewalk/oracle/packages/packages.deps
+++ b/schema/spacewalk/oracle/packages/packages.deps
@@ -65,5 +65,8 @@ rhn_server.pkb :: rhnServerChannel rhnConfigFileName \
rhnUserManagedServerGroups rhnServerEntitlementVirtual \
rhnSatelliteInfo rhnProxyInfo \
lookup_functions lookup_first_matching_cf \
- set_ks_session_history_message
+ set_ks_session_history_message \
+ rhnPackage rhnChannelNewestPackage \
+ rhnPackageEVR rhnChannelPackage rhnErrataPackage \
+ rhnChannelErrata rhnPackageUpgradeArchCompat
rhn_user.pkb :: rhnUserTypeBase
diff --git a/schema/spacewalk/oracle/packages/rhn_server.pkb b/schema/spacewalk/oracle/packages/rhn_server.pkb
index 66ad3ce..261a2ed 100644
--- a/schema/spacewalk/oracle/packages/rhn_server.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_server.pkb
@@ -748,13 +748,35 @@ is
procedure update_needed_cache(server_id_in in number)
is
begin
- delete from rhnServerNeededCache
- where server_id = server_id_in;
- insert into rhnServerNeededCache
- (server_id, errata_id, package_id)
- (select distinct server_id, errata_id, package_id
- from rhnServerNeededView
- where server_id = server_id_in);
+ delete from rhnServerNeededCache
+ where server_id = server_id_in;
+ insert into rhnServerNeededCache
+ (server_id, errata_id, package_id)
+ (select distinct sp.server_id, x.errata_id, p.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;
diff --git a/schema/spacewalk/oracle/procs/procs.deps b/schema/spacewalk/oracle/procs/procs.deps
index 3cfd11a..2dd94e3 100644
--- a/schema/spacewalk/oracle/procs/procs.deps
+++ b/schema/spacewalk/oracle/procs/procs.deps
@@ -129,9 +129,8 @@ lookup_xccdf_ident :: insert_xccdf_ident \
lookup_xccdf_profile :: insert_xccdf_profile \
rhnXccdfProfile
pxt_session_cleanup :: PXTSessions
-queue_server :: rhnServerNeededPackageCache rhnTaskQueue \
- rhnServer \
- rhnServerNeededErrataCache rhnServerNeededView
+queue_server :: rhnTaskQueue rhnServer \
+ rhn_server.update_needed_cache
rhn_install_org_satellites :: rhn_command_queue_instances rhn_ll_netsaint \
rhn_sat_cluster web_customer \
diff --git a/schema/spacewalk/oracle/procs/queue_server.sql b/schema/spacewalk/oracle/procs/queue_server.sql
index 7bf0703..5c1aede 100644
--- a/schema/spacewalk/oracle/procs/queue_server.sql
+++ b/schema/spacewalk/oracle/procs/queue_server.sql
@@ -27,12 +27,7 @@ IS
BEGIN
IF immediate_in > 0
THEN
- DELETE FROM rhnServerNeededCache WHERE server_id = server_id_in;
- INSERT INTO rhnServerNeededCache
- (SELECT server_id, errata_id, package_id
- FROM rhnServerNeededView
- WHERE server_id = server_id_in);
-
+ rhn_server.update_needed_cache(server_id_in);
ELSE
SELECT org_id INTO org_id_tmp FROM rhnServer WHERE id = server_id_in;
diff --git a/schema/spacewalk/postgres/packages/packages.deps b/schema/spacewalk/postgres/packages/packages.deps
index 0cfb397..e81d97e 100644
--- a/schema/spacewalk/postgres/packages/packages.deps
+++ b/schema/spacewalk/postgres/packages/packages.deps
@@ -64,4 +64,7 @@ rhn_server.pkb :: rhnServerChannel rhnConfigFileName \
rhnUserManagedServerGroups rhnServerEntitlementVirtual \
rhnSatelliteInfo rhnProxyInfo \
lookup_functions lookup_first_matching_cf \
- set_ks_session_history_message
+ set_ks_session_history_message \
+ rhnPackage rhnChannelNewestPackage \
+ rhnPackageEVR rhnChannelPackage rhnErrataPackage \
+ rhnChannelErrata rhnPackageUpgradeArchCompat
diff --git a/schema/spacewalk/postgres/packages/rhn_server.pkb b/schema/spacewalk/postgres/packages/rhn_server.pkb
index d50f1d1..8c2fd63 100644
--- a/schema/spacewalk/postgres/packages/rhn_server.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_server.pkb
@@ -790,14 +790,33 @@ update pg_settings set setting = 'rhn_server,' || setting where name = 'search_p
server_id_in in numeric
) returns void as $$
begin
- delete from rhnServerNeededCache
- where server_id = server_id_in;
- insert into rhnServerNeededCache
- (server_id, errata_id, package_id)
- (select distinct server_id, errata_id, package_id
- from rhnServerNeededView
- where server_id = server_id_in);
+ delete from rhnServerNeededCache
+ where server_id = server_id_in;
+ insert into rhnServerNeededCache
+ (server_id, errata_id, package_id)
+ (select distinct sp.server_id, x.errata_id, p.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';
diff --git a/schema/spacewalk/postgres/procs/procs.deps b/schema/spacewalk/postgres/procs/procs.deps
index 1733902..95e5d87 100644
--- a/schema/spacewalk/postgres/procs/procs.deps
+++ b/schema/spacewalk/postgres/procs/procs.deps
@@ -112,9 +112,8 @@ lookup_xccdf_ident :: rhnXccdfIdentSystem \
lookup_xccdf_profile :: rhnXccdfProfile \
pg_dblink_exec
pxt_session_cleanup :: PXTSessions
-queue_server :: rhnServerNeededPackageCache rhnTaskQueue \
- rhnServer \
- rhnServerNeededErrataCache rhnServerNeededView
+queue_server :: rhnTaskQueue rhnServer \
+ rhn_server.update_needed_cache
rhn_install_org_satellites :: rhn_command_queue_instances rhn_ll_netsaint \
rhn_sat_cluster web_customer \
diff --git a/schema/spacewalk/postgres/procs/queue_server.sql b/schema/spacewalk/postgres/procs/queue_server.sql
index aaf08a1..5c39ca8 100644
--- a/schema/spacewalk/postgres/procs/queue_server.sql
+++ b/schema/spacewalk/postgres/procs/queue_server.sql
@@ -33,12 +33,7 @@ DECLARE
BEGIN
IF immediate_in > 0
THEN
- DELETE FROM rhnServerNeededCache WHERE server_id = server_id_in;
- INSERT INTO rhnServerNeededCache
- (SELECT server_id, errata_id, package_id
- FROM rhnServerNeededView
- WHERE server_id = server_id_in);
-
+ PERFORM rhn_server.update_needed_cache(server_id_in);
ELSE
SELECT org_id INTO STRICT org_id_tmp
FROM rhnServer WHERE id = server_id_in;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/016-rhnServerNeededView.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/016-rhnServerNeededView.sql.oracle
new file mode 100644
index 0000000..3d1f643
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/016-rhnServerNeededView.sql.oracle
@@ -0,0 +1,790 @@
+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
+ begin
+ delete from rhnServerNeededCache
+ where server_id = server_id_in;
+ insert into rhnServerNeededCache
+ (server_id, errata_id, package_id)
+ (select distinct sp.server_id, x.errata_id, p.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
+
+CREATE OR REPLACE PROCEDURE
+queue_server(server_id_in IN NUMBER, immediate_in IN NUMBER := 1)
+IS
+ org_id_tmp NUMBER;
+BEGIN
+ IF immediate_in > 0
+ THEN
+ rhn_server.update_needed_cache(server_id_in);
+ ELSE
+ SELECT org_id INTO org_id_tmp FROM rhnServer WHERE id = server_id_in;
+
+ INSERT
+ INTO rhnTaskQueue
+ (org_id, task_name, task_data)
+ VALUES (org_id_tmp,
+ 'update_server_errata_cache',
+ server_id_in);
+ END IF;
+END queue_server;
+/
+SHOW ERRORS
+
+DROP VIEW rhnServerNeededView;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/016-rhnServerNeededView.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/016-rhnServerNeededView.sql.postgresql
new file mode 100644
index 0000000..79e61fb
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/016-rhnServerNeededView.sql.postgresql
@@ -0,0 +1,63 @@
+update pg_settings set setting = 'rhn_server,' || setting where name = 'search_path';
+
+ create or replace function update_needed_cache(
+ server_id_in in numeric
+ ) returns void as $$
+ begin
+ delete from rhnServerNeededCache
+ where server_id = server_id_in;
+ insert into rhnServerNeededCache
+ (server_id, errata_id, package_id)
+ (select distinct sp.server_id, x.errata_id, p.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;
+
+update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_server')+1) ) where name = 'search_path';
+
+CREATE OR REPLACE FUNCTION
+queue_server(server_id_in IN NUMERIC, immediate_in IN NUMERIC DEFAULT 1)
+RETURNS VOID
+AS
+$$
+DECLARE
+ org_id_tmp NUMERIC;
+BEGIN
+ IF immediate_in > 0
+ THEN
+ PERFORM rhn_server.update_needed_cache(server_id_in);
+ ELSE
+ SELECT org_id INTO STRICT org_id_tmp
+ FROM rhnServer WHERE id = server_id_in;
+
+ INSERT
+ INTO rhnTaskQueue
+ (org_id, task_name, task_data)
+ VALUES (org_id_tmp,
+ 'update_server_errata_cache',
+ server_id_in);
+ END IF;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP VIEW IF EXISTS rhnServerNeededView;
10 years, 9 months
java/code
by Grant Gainey
java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemAction.java | 4 +++-
java/code/src/com/redhat/rhn/frontend/action/systems/SystemRemoteCommandAction.java | 4 +++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 3 ++-
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 3c02740bbe2be278fb03bf5fe142feeb12640e97
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Thu Sep 5 08:21:35 2013 -0400
Make checkstyle happy
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemAction.java
index 962154f..c8f81c7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemAction.java
@@ -53,7 +53,9 @@ public class RebootSystemAction
extends RhnListAction
implements Listable {
- @Override
+ /**
+ * {@inheritDoc}
+ */
public ActionForward execute(ActionMapping mapping,
ActionForm actionForm,
HttpServletRequest request,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemRemoteCommandAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemRemoteCommandAction.java
index 2f9915f..3a3cda3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemRemoteCommandAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemRemoteCommandAction.java
@@ -264,7 +264,9 @@ public class SystemRemoteCommandAction extends RhnAction {
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
public ActionForward execute(ActionMapping mapping,
ActionForm actionForm,
HttpServletRequest request,
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
index b889990..7ec1473 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
@@ -214,7 +214,8 @@ public class ConfigChannelHandler extends BaseHandler {
* @param revision The configuration file revision.
* @return Revisions of the configuration file, errors out otherwise.
*
- * @xmlrpc.doc Get revision of the specified configuration file and transmit the contents as base64 encoded.
+ * @xmlrpc.doc Get revision of the specified configuration file and transmit the
+ * contents as base64 encoded.
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "configChannelLabel",
* "label of config channel to lookup on")
10 years, 9 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 38e817b7af8fbb3c227419b3b63b9180648f8fde
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 5 11:35:52 2013 +0200
998951 - fix configchannel.getEncodedFileRevision API doc
according to the online API doc
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
index 1f04aed..b889990 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
@@ -214,7 +214,7 @@ public class ConfigChannelHandler extends BaseHandler {
* @param revision The configuration file revision.
* @return Revisions of the configuration file, errors out otherwise.
*
- * @xmlrpc.doc Get revision of the specified config file
+ * @xmlrpc.doc Get revision of the specified configuration file and transmit the contents as base64 encoded.
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "configChannelLabel",
* "label of config channel to lookup on")
10 years, 9 months
Changes to 'refs/tags/spacewalk-backend-2.1.16-1'
by Jan Dobes
Tag 'spacewalk-backend-2.1.16-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-09-05 07:33 +0000
Tagging package [spacewalk-backend] version [2.1.16-1] in directory [backend/].
Changes since spacewalk-java-2.1.36-1:
Jan Dobes (1):
Automatic commit of package [spacewalk-backend] release [2.1.16-1].
Shannon Hughes (1):
883242 - check for empty result before printing software entitlement
---
backend/satellite_tools/rhn-entitlement-report | 4 ++++
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
---
10 years, 9 months
2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Jan Dobes
backend/satellite_tools/rhn-entitlement-report | 4 ++++
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit b09bdd55d202ac3d4cb99afad3e5452f3e0e08fb
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Sep 5 09:33:09 2013 +0200
Automatic commit of package [spacewalk-backend] release [2.1.16-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 7a8fc7e..b7c89f6 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
-Version: 2.1.15
+Version: 2.1.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -628,6 +628,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Sep 05 2013 Jan Dobes 2.1.16-1
+- 883242 - check for empty result before printing software entitlement
+
* Tue Sep 03 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.15-1
- 1002041 - don't upload crash file if over the size limit or the upload is
disabled
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 60281b6..48770bd 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.15-1 backend/
+2.1.16-1 backend/
commit 18d5b2f5ecaed6598a5ccb13d38abaf88a16442a
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed Sep 4 16:39:55 2013 -0400
883242 - check for empty result before printing software entitlement
diff --git a/backend/satellite_tools/rhn-entitlement-report b/backend/satellite_tools/rhn-entitlement-report
index 2c93957..77d94d4 100755
--- a/backend/satellite_tools/rhn-entitlement-report
+++ b/backend/satellite_tools/rhn-entitlement-report
@@ -30,6 +30,10 @@ def printAcrossSatelliteUsage():
print ("Software Channel Entitlements Across " + PRODUCT_NAME + " :")
query = "SELECT cfo.label,SUM(cfo.max_members) as total,SUM(cfo.current_members) as used,(SELECT (cfo2.max_members) - (cfo2.current_members) FROM rhnChannelFamilyOverview cfo2 WHERE cfo2.label = cfo.label AND cfo2.org_id = 1) as available,SUM(cfo.fve_max_members) as total_flex,SUM(cfo.fve_current_members) as used_flex,(SELECT (cfo2.fve_max_members) - (cfo2.fve_current_members) FROM rhnChannelFamilyOverview cfo2 WHERE cfo2.label = cfo.label AND cfo2.org_id = 1) as available_flex FROM rhnChannelFamilyOverview cfo WHERE cfo.max_members is not null and (cfo.current_members !=0 or cfo.fve_current_members!=0) GROUP BY cfo.label, cfo.name HAVING (SUM(cfo.max_members) is not null) ORDER by cfo.name DESC"
list = run_query(query)
+ if list == None:
+ print("")
+ return
+
print("%35s %s %s %s %s %s %s" % ("Channel Label"," Total ","Regular Used","Available","Total Flex","Flex Used","Available Flex"))
print("%35s %s %s %s %s %s %s" % ("-------------","----------","------------","---------","----------","---------","--------------"))
10 years, 9 months
Changes to 'refs/tags/spacewalk-java-2.1.36-1'
by Grant Gainey
Tag 'spacewalk-java-2.1.36-1' created by Grant Gainey <ggainey(a)redhat.com> at 2013-09-04 22:27 +0000
Tagging package [spacewalk-java] version [2.1.36-1] in directory [java/].
Changes since rhncfg-5.10.57-1:
Grant Gainey (2):
1004547 - fixed API doc for some ISS calls
Automatic commit of package [spacewalk-java] release [2.1.36-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java | 18 +++----
java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/slave/SlaveHandler.java | 24 +++++-----
java/spacewalk-java.spec | 8 ++-
rel-eng/packages/spacewalk-java | 2
4 files changed, 29 insertions(+), 23 deletions(-)
---
10 years, 9 months
java/spacewalk-java.spec rel-eng/packages
by Grant Gainey
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit f666dc127fe94e41b263d19b229e2f0b531a452c
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Wed Sep 4 18:27:23 2013 -0400
Automatic commit of package [spacewalk-java] release [2.1.36-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 34a0dd1..90fb7db 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.35
+Version: 2.1.36
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -771,6 +771,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Sep 04 2013 Grant Gainey <ggainey(a)redhat.com> 2.1.36-1
+- 1004547 - fixed API doc for some ISS calls
+- 1003565 - packages.getPackage returns a binary object, not a base64 encoded
+ package
+- making OrgChannelFamily serializable
+
* Tue Sep 03 2013 Jan Dobes 2.1.35-1
- 976136 - unsubsribe from all channels before migration
- Unnecessary fully qualified names.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 748bac5..2c25c13 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.35-1 java/
+2.1.36-1 java/
10 years, 9 months