Changes to 'refs/tags/spacewalk-backend-0.9.9-1'
by Michael Mraka
Tag 'spacewalk-backend-0.9.9-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-03-12 15:09 +0000
Tagging package [spacewalk-backend] version [0.9.9-1] in directory [backend/].
Changes since spacewalk-schema-0.9.3-1:
Justin Sherrill (7):
558502 - fixing ordering issue with fetching items from the queue which would result in reprovisioning not correctly ordering actions such that config deployment would suceede if the files required that a package be installed from the activation key due to ownership (example: a file owned by apache needing the httpd package installed)
fixing import
fixing cfg issue with rhn_mpm.py
apidoc fixes
apidoc fixes
adding utilitiy to setup the backend for development purposes
bash != python
Michael Mraka (4):
563902 - let's make default TEMP and UNDO 1GB
563902 - tuned sql upgrade script
let mpm_checksum_type be a constant for now
Automatic commit of package [spacewalk-backend] release [0.9.9-1].
Partha Aji (2):
Fixed an irritating bug where sats that had multiple certs would throw up a constraint violation on rhnSatelliteCert table
Fixed a unit test that required an additional parameter
---
backend/rhn-conf/rhn_server.conf | 2
backend/satellite_tools/satCerts.py | 3
backend/server/handlers/xmlrpc/queue.py | 2
backend/spacewalk-backend.spec | 6 +
backend/spacewalk/common/rhn_mpm.py | 3
java/buildconf/apidoc/html/scripts.txt | 4 -
java/buildconf/apidoc/jsp/scripts.txt | 8 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/test/SyncActionsTest.java | 1
projects/oracle-server-scripts/embedded-createdb.tmpl | 6 +
rel-eng/packages/spacewalk-backend | 2
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/012-2-rhnPackageFile-data.sql | 23 ++++--
scripts/setup-backend-devel.sh | 37 ++++++++++
12 files changed, 75 insertions(+), 22 deletions(-)
---
14 years, 2 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 8e8d587d384aa17dfdd6db8acbb78cb3e2f77325
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 12 16:09:50 2010 +0100
Automatic commit of package [spacewalk-backend] release [0.9.9-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c48961f..9cd2a7e 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.9.8
+Version: 0.9.9
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -622,6 +622,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Mar 12 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.9-1
+- Fixed constraint violation when satellite had multiple certs
+- 558502 - fixed ordering issue in reprovisioning
+
* Wed Mar 10 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.8-1
- 571365 - fixed solaris mpm packages import
- spacewalk-remove-channel improvements
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 6751828..4442661 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.9.8-1 backend/
+0.9.9-1 backend/
14 years, 2 months
3 commits - backend/rhn-conf backend/spacewalk projects/oracle-server-scripts schema/spacewalk
by Michael Mraka
backend/rhn-conf/rhn_server.conf | 2
backend/spacewalk/common/rhn_mpm.py | 5 --
projects/oracle-server-scripts/embedded-createdb.tmpl | 6 +-
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/012-2-rhnPackageFile-data.sql | 23 +++++++---
4 files changed, 23 insertions(+), 13 deletions(-)
New commits:
commit 562b82abd207dc075e1cbea8f3bfbe688ebdd7b7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 12 14:14:07 2010 +0100
let mpm_checksum_type be a constant for now
well, this really should be a config option but the trouble is this lib
is shared between server and client and there is no shared config file
diff --git a/backend/rhn-conf/rhn_server.conf b/backend/rhn-conf/rhn_server.conf
index b109ce6..8a5c3fa 100644
--- a/backend/rhn-conf/rhn_server.conf
+++ b/backend/rhn-conf/rhn_server.conf
@@ -131,5 +131,3 @@ repomd_path_prefix = rhn/repodata
# Default to not using taskomatic for repomd
use_taskomatic_repomd = 1
-# default checksums
-mpm_checksum_type = sha256
diff --git a/backend/spacewalk/common/rhn_mpm.py b/backend/spacewalk/common/rhn_mpm.py
index af9cb8a..7868a79 100644
--- a/backend/spacewalk/common/rhn_mpm.py
+++ b/backend/spacewalk/common/rhn_mpm.py
@@ -22,11 +22,8 @@ from rhn.rpclib import xmlrpclib
import struct
from types import ListType, TupleType, DictType
-from common import initCFG
-from common.rhnConfig import CFG
-initCFG('server')
-MPM_CHECKSUM_TYPE = CFG.MPM_CHECKSUM_TYPE
+MPM_CHECKSUM_TYPE = 'md5' # FIXME: this should be a configuration option
def labelCompare(l1, l2):
try:
commit 32f607647e4c0214233d6de15c05a5f5f41ec542
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Mar 11 16:31:47 2010 +0100
563902 - tuned sql upgrade script
we have fit into 1GB TEMP and 1GB UNDO here
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/012-2-rhnPackageFile-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/012-2-rhnPackageFile-data.sql
index e5c3ed5..1bba1f6 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/012-2-rhnPackageFile-data.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/012-2-rhnPackageFile-data.sql
@@ -4,18 +4,23 @@ declare
max_pid number;
lmin number;
lmax number;
+ incr number;
begin
select id
into md5_id
from rhnChecksumType
where label = 'md5';
- select min(package_id), max(package_id)
- into min_pid, max_pid
+ select min(package_id)
+ into min_pid
+ from rhnPackageFile;
+ select max(package_id)
+ into max_pid
from rhnPackageFile;
+ incr := 80000;
lmin := min_pid;
- lmax := lmin + 1999;
+ lmax := lmin + incr - 1;
while lmin < max_pid loop
insert into rhnChecksum (id, checksum_type_id, checksum)
(select rhnChecksum_seq.nextval, md5_id, csum
@@ -24,13 +29,21 @@ begin
from rhnPackageFile p
where package_id between lmin and lmax
and md5 is not null
- and not exists (select /*+ index(c rhnchecksum_chsum_idx) */ 1
+ and not exists (select /*+ index(c rhnChecksum_chsum_uq) */ 1
from rhnChecksum c
where p.md5 = c.checksum
and c.checksum_type_id = md5_id)
)
);
commit;
+ lmin := lmax + 1;
+ lmax := lmin + incr -1;
+ end loop;
+
+ incr := 10000;
+ lmin := min_pid;
+ lmax := lmin + incr - 1;
+ while lmin < max_pid loop
update /*+ index(p rhn_package_file_pid_cid_uq) */ rhnPackageFile p
set checksum_id = (select id
from rhnChecksum c
@@ -40,7 +53,7 @@ begin
and md5 is not null;
commit;
lmin := lmax + 1;
- lmax := lmin + 1999;
+ lmax := lmin + incr -1;
end loop;
end;
/
commit dbf50d25c3839a113ec9065254cc8c776e0d8bad
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Mar 11 15:04:08 2010 +0100
563902 - let's make default TEMP and UNDO 1GB
and save us from many troubles during upgrades
diff --git a/projects/oracle-server-scripts/embedded-createdb.tmpl b/projects/oracle-server-scripts/embedded-createdb.tmpl
index 08b60a4..f2b7df4 100644
--- a/projects/oracle-server-scripts/embedded-createdb.tmpl
+++ b/projects/oracle-server-scripts/embedded-createdb.tmpl
@@ -30,9 +30,11 @@ create database
sysaux datafile
'RHNORA_DATA_PATH()/sysaux.dbf' size RHNORA_SPACE(500)M reuse
smallfile undo tablespace undo_tbs datafile
- 'RHNORA_DATA_PATH()/undo_01.dbf' size RHNORA_SPACE(500)M reuse
+ 'RHNORA_DATA_PATH()/undo_01.dbf' size RHNORA_SPACE(500)M reuse,
+ 'RHNORA_DATA_PATH()/undo_02.dbf' size RHNORA_SPACE(500)M reuse
smallfile default temporary tablespace temp_tbs tempfile
- 'RHNORA_DATA_PATH()/temp_01.dbf' size RHNORA_SPACE(250)M reuse
+ 'RHNORA_DATA_PATH()/temp_01.dbf' size RHNORA_SPACE(500)M reuse,
+ 'RHNORA_DATA_PATH()/temp_02.dbf' size RHNORA_SPACE(500)M reuse
logfile
group 10 (
'RHNORA_DATA_PATH()/redo_1001.log',
14 years, 2 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/test/SyncActionsTest.java | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 279a80e00a1d50ffd1fbb8828fcfe002d7ffc1a2
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Mar 11 16:17:29 2010 -0500
Fixed a unit test that required an additional parameter
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/test/SyncActionsTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/test/SyncActionsTest.java
index 0def25a..0b2c6c5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/test/SyncActionsTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/test/SyncActionsTest.java
@@ -91,6 +91,7 @@ public class SyncActionsTest extends RhnMockStrutsTestCase {
addRequestParameter(RequestContext.SID, s1.getId().toString());
addRequestParameter(RequestContext.SID + "_1", s2.getId().toString());
+ addRequestParameter("time", String.valueOf(System.currentTimeMillis()));
addRequestParameter("use_date", Boolean.FALSE.toString());
setRequestPathInfo("/systems/details/packages/profiles/SyncSystemsSubmit");
14 years, 2 months
scripts/setup-backend-devel.py scripts/setup-backend-devel.sh
by Justin Sherrill
scripts/setup-backend-devel.py | 37 -------------------------------------
scripts/setup-backend-devel.sh | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit 1df1a1ea225a86ef69820fc2caad74ab817d2bef
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Mar 11 15:14:23 2010 -0500
bash != python
diff --git a/scripts/setup-backend-devel.py b/scripts/setup-backend-devel.py
deleted file mode 100755
index 460c88e..0000000
--- a/scripts/setup-backend-devel.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# This script symlinks everything needed from you git directory into /usr/share/rhn in order
-# to run the spacewalk backend directly from git. NOTE: your spacewalk git directory must be in /spacewalk
-
-
-if [ ! -d /spacewalk ]; then
- echo "/spacewalk does not exist"
- exit -1
-fi
-
-cd /usr/share/rhn/
-
-DIRS="common satellite_exporter satellite_tools server spacewalk upload_server"
-
-for dir in $DIRS; do
-
- if [ -d $dir ]; then
- mv $dir $dir.bak
- fi
- ln -s /spacewalk/backend/$dir
-done;
-
-echo """
-
-Please add:
-
-<Directory "/usr/share/rhn/*">
- Options Indexes FollowSymLinks
- AllowOverride All
- Order allow,deny
- Allow from all
-</Directory>
-
-to /etc/httpd/conf.d/zz-spacewalk-server.conf within the virtual host definition and restart httpd
-
-"""
diff --git a/scripts/setup-backend-devel.sh b/scripts/setup-backend-devel.sh
new file mode 100755
index 0000000..460c88e
--- /dev/null
+++ b/scripts/setup-backend-devel.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# This script symlinks everything needed from you git directory into /usr/share/rhn in order
+# to run the spacewalk backend directly from git. NOTE: your spacewalk git directory must be in /spacewalk
+
+
+if [ ! -d /spacewalk ]; then
+ echo "/spacewalk does not exist"
+ exit -1
+fi
+
+cd /usr/share/rhn/
+
+DIRS="common satellite_exporter satellite_tools server spacewalk upload_server"
+
+for dir in $DIRS; do
+
+ if [ -d $dir ]; then
+ mv $dir $dir.bak
+ fi
+ ln -s /spacewalk/backend/$dir
+done;
+
+echo """
+
+Please add:
+
+<Directory "/usr/share/rhn/*">
+ Options Indexes FollowSymLinks
+ AllowOverride All
+ Order allow,deny
+ Allow from all
+</Directory>
+
+to /etc/httpd/conf.d/zz-spacewalk-server.conf within the virtual host definition and restart httpd
+
+"""
14 years, 2 months
scripts/setup-backend-devel.py
by Justin Sherrill
scripts/setup-backend-devel.py | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
New commits:
commit 3c93fefece0139876aec742d8037952bb05adb66
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Mar 11 14:36:17 2010 -0500
adding utilitiy to setup the backend for development purposes
diff --git a/scripts/setup-backend-devel.py b/scripts/setup-backend-devel.py
new file mode 100755
index 0000000..460c88e
--- /dev/null
+++ b/scripts/setup-backend-devel.py
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# This script symlinks everything needed from you git directory into /usr/share/rhn in order
+# to run the spacewalk backend directly from git. NOTE: your spacewalk git directory must be in /spacewalk
+
+
+if [ ! -d /spacewalk ]; then
+ echo "/spacewalk does not exist"
+ exit -1
+fi
+
+cd /usr/share/rhn/
+
+DIRS="common satellite_exporter satellite_tools server spacewalk upload_server"
+
+for dir in $DIRS; do
+
+ if [ -d $dir ]; then
+ mv $dir $dir.bak
+ fi
+ ln -s /spacewalk/backend/$dir
+done;
+
+echo """
+
+Please add:
+
+<Directory "/usr/share/rhn/*">
+ Options Indexes FollowSymLinks
+ AllowOverride All
+ Order allow,deny
+ Allow from all
+</Directory>
+
+to /etc/httpd/conf.d/zz-spacewalk-server.conf within the virtual host definition and restart httpd
+
+"""
14 years, 2 months
backend/satellite_tools
by Partha Aji
backend/satellite_tools/satCerts.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit bdaad4bfca4bbde23c51128d37e20c2cfea774ab
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Mar 11 14:32:31 2010 -0500
Fixed an irritating bug where sats that had multiple certs would throw up a constraint violation on rhnSatelliteCert table
diff --git a/backend/satellite_tools/satCerts.py b/backend/satellite_tools/satCerts.py
index 4d567a1..0ad4f5e 100644
--- a/backend/satellite_tools/satCerts.py
+++ b/backend/satellite_tools/satCerts.py
@@ -319,8 +319,7 @@ _query_latest_version = rhnSQL.Statement("""
ORDER BY CASE WHEN version IS NULL
THEN 0
ELSE version
- END, version
- DESC
+ END DESC
""")
def retrieve_db_cert(label='rhn-satellite-cert'):
h = rhnSQL.prepare(_query_latest_version)
14 years, 2 months
2 commits - java/buildconf
by Justin Sherrill
java/buildconf/apidoc/html/scripts.txt | 4 ++--
java/buildconf/apidoc/jsp/scripts.txt | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a8ab37e38a834c1fdcb460960b8f3865113ce671
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Mar 11 13:25:09 2010 -0500
apidoc fixes
diff --git a/java/buildconf/apidoc/html/scripts.txt b/java/buildconf/apidoc/html/scripts.txt
index ee98ca0..bd5fdac 100644
--- a/java/buildconf/apidoc/html/scripts.txt
+++ b/java/buildconf/apidoc/html/scripts.txt
@@ -31,7 +31,7 @@ $client->call('auth.logout', $session);</br>
<hr />
<p />
<h3>Python example:</h3><br />
-Below is an example of the user.listAdministeredSystemGroups call being used. Only the name of each group is printed.
+Below is an example of the user.listUsers call being used. Only the name of each group is printed.
<p />
<code>
@@ -45,7 +45,7 @@ SATELLITE_PASSWORD = "password"<br />
client = xmlrpclib.Server(SATELLITE_URL, verbose=0)<br />
<br />
key = client.auth.login(SATELLITE_LOGIN, SATELLITE_PASSWORD)<br />
-list = client.user.list_users(key, 'admin')<br />
+list = client.user.list_users(key)<br />
for user in list:<br />
print user.get('login')<br />
<br />
commit 0d2a9213947e48abcde9dda8e7338565f4427c4b
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Mar 11 13:24:31 2010 -0500
apidoc fixes
diff --git a/java/buildconf/apidoc/jsp/scripts.txt b/java/buildconf/apidoc/jsp/scripts.txt
index f7f8516..59baf14 100644
--- a/java/buildconf/apidoc/jsp/scripts.txt
+++ b/java/buildconf/apidoc/jsp/scripts.txt
@@ -36,7 +36,7 @@ $client->call('auth.logout', $session);</br>
<hr />
<p />
<h3>Python example:</h3><br />
-Below is an example of the user.listAdministeredSystemGroups call being used. Only the name of each group is printed.
+Below is an example of the user.listUsers call being used. Only the login of each user is printed.
<p />
<code>
@@ -50,9 +50,9 @@ SATELLITE_PASSWORD = "password"<br />
client = xmlrpclib.Server(SATELLITE_URL, verbose=0)<br />
<br />
key = client.auth.login(SATELLITE_LOGIN, SATELLITE_PASSWORD)<br />
-list = client.user.list_administered_system_groups(key, 'admin')<br />
-for group in list:<br />
- print group.get('name')<br />
+list = client.user.list_users(key)<br />
+for user in list:<br />
+ print user.get('login')<br />
<br />
client.auth.logout(key)<br />
</code>
14 years, 2 months
backend/spacewalk
by Justin Sherrill
backend/spacewalk/common/rhn_mpm.py | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit c08f42b97f801597bf180c02f8f25c82eea03e4b
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Mar 11 12:27:56 2010 -0500
fixing cfg issue with rhn_mpm.py
diff --git a/backend/spacewalk/common/rhn_mpm.py b/backend/spacewalk/common/rhn_mpm.py
index ed65a7e..af9cb8a 100644
--- a/backend/spacewalk/common/rhn_mpm.py
+++ b/backend/spacewalk/common/rhn_mpm.py
@@ -22,8 +22,10 @@ from rhn.rpclib import xmlrpclib
import struct
from types import ListType, TupleType, DictType
+from common import initCFG
from common.rhnConfig import CFG
+initCFG('server')
MPM_CHECKSUM_TYPE = CFG.MPM_CHECKSUM_TYPE
def labelCompare(l1, l2):
14 years, 2 months
backend/spacewalk
by Justin Sherrill
backend/spacewalk/common/rhn_mpm.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c673493bdf47110fff2e97c6993c99d95cd9301c
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Mar 11 11:56:40 2010 -0500
fixing import
diff --git a/backend/spacewalk/common/rhn_mpm.py b/backend/spacewalk/common/rhn_mpm.py
index 2920a1b..ed65a7e 100644
--- a/backend/spacewalk/common/rhn_mpm.py
+++ b/backend/spacewalk/common/rhn_mpm.py
@@ -22,7 +22,7 @@ from rhn.rpclib import xmlrpclib
import struct
from types import ListType, TupleType, DictType
-from rhnConfig import CFG
+from common.rhnConfig import CFG
MPM_CHECKSUM_TYPE = CFG.MPM_CHECKSUM_TYPE
14 years, 2 months