2 commits - backend/satellite_tools backend/server java/code monitoring/NPalert monitoring/PerlModules monitoring/SputLite schema/spacewalk search-server/spacewalk-search web/modules
by Jan Pazdziora
backend/satellite_tools/satCerts.py | 4
backend/satellite_tools/updatePackages.py | 2
backend/server/action_extra_data/script.py | 4
java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 4
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 10 +-
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 12 +-
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 4
java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 4
java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml | 4
monitoring/NPalert/NotificationDB.pm | 4
monitoring/PerlModules/NP/OracleDB/CF_DB.pm | 4
monitoring/SputLite/html/cgi-bin/create_commands.cgi | 4
monitoring/SputLite/lib/UploadResults.pm | 2
schema/spacewalk/postgres/packages/rhn_channel.pkb | 4
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.postgresql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/011-rhn_channel.pkb.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/011-rhn_channel.pkb.sql.postgresql | 47 ++++++++++
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml | 4
web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml | 4
web/modules/rhn/RHN/DB/KSTree.pm | 2
web/modules/rhn/RHN/DB/TableClass.pm | 4
web/modules/rhn/RHN/DB/TinyURL.pm | 2
22 files changed, 91 insertions(+), 43 deletions(-)
New commits:
commit 25c78c2166d97631f471081e9a2925797a5bc778
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 25 15:30:35 2013 +0100
Use to_timestamp instead of to_date which should bring the second precision to PostgreSQL.
diff --git a/backend/satellite_tools/satCerts.py b/backend/satellite_tools/satCerts.py
index 863598b..50e6973 100644
--- a/backend/satellite_tools/satCerts.py
+++ b/backend/satellite_tools/satCerts.py
@@ -528,8 +528,8 @@ _query_insert_cert = rhnSQL.Statement("""
INSERT into rhnSatelliteCert
(label, version, cert, expires, issued)
VALUES (:label, :version, empty_blob(),
- TO_DATE(:expires, 'YYYY-MM-DD HH24:MI:SS'),
- TO_DATE(:issued, 'YYYY-MM-DD HH24:MI:SS'))
+ TO_TIMESTAMP(:expires, 'YYYY-MM-DD HH24:MI:SS'),
+ TO_TIMESTAMP(:issued, 'YYYY-MM-DD HH24:MI:SS'))
""")
_query_update_web_customer = rhnSQL.Statement("""
diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py
index 2018f82..ee108b3 100644
--- a/backend/satellite_tools/updatePackages.py
+++ b/backend/satellite_tools/updatePackages.py
@@ -433,7 +433,7 @@ insert_packagefile = """
values (
:pid, lookup_package_capability(:name, null),
:device, :inode, :file_mode, :username, :groupname,
- :rdev, :file_size, to_date(:mtime, 'YYYY-MM-DD HH24:MI:SS'), :linkto,
+ :rdev, :file_size, to_timestamp(:mtime, 'YYYY-MM-DD HH24:MI:SS'), :linkto,
:flags, :verifyflags, :lang, lookup_checksum(:ctype, :csum)
)
"""
diff --git a/backend/server/action_extra_data/script.py b/backend/server/action_extra_data/script.py
index 26a30fb..f3586a9 100644
--- a/backend/server/action_extra_data/script.py
+++ b/backend/server/action_extra_data/script.py
@@ -45,8 +45,8 @@ values (
from rhnActionScript ascript
where ascript.action_id = :action_id),
:output,
- TO_DATE(:process_start, 'YYYY-MM-DD HH24:MI:SS'),
- TO_DATE(:process_end, 'YYYY-MM-DD HH24:MI:SS'),
+ TO_TIMESTAMP(:process_start, 'YYYY-MM-DD HH24:MI:SS'),
+ TO_TIMESTAMP(:process_end, 'YYYY-MM-DD HH24:MI:SS'),
:return_code)
""")
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
index b5162ca..de38fb0 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
@@ -13,8 +13,8 @@ SELECT EVENT_ID as ID,
DETAILS
FROM (SELECT SH.id EVENT_ID,
SH.summary SUMMARY,
- TO_DATE(NULL,NULL) AS created,
- TO_DATE(NULL,NULL) AS picked_up,
+ TO_TIMESTAMP(NULL,NULL) AS created,
+ TO_TIMESTAMP(NULL,NULL) AS picked_up,
SH.created as completed, -- view this as the "completed" date for sorting reasons
NULL AS history_status,
NULL AS history_type,
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
index 934b0d5..69027df 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
@@ -284,8 +284,8 @@ SELECT DISTINCT
E.id, E.issue_date
FROM rhnErrata E
WHERE
- E.issue_date >= TO_DATE(:start_date_str, 'YYYY-MM-DD')
- AND E.issue_date <= TO_DATE(:end_date_str, 'YYYY-MM-DD')
+ E.issue_date >= TO_TIMESTAMP(:start_date_str, 'YYYY-MM-DD')
+ AND E.issue_date <= TO_TIMESTAMP(:end_date_str, 'YYYY-MM-DD')
ORDER BY E.issue_date DESC
</query>
</mode>
@@ -348,8 +348,8 @@ SELECT DISTINCT E.id,
rhnChannelErrata CE
WHERE CE.channel_id = :cid
AND CE.errata_id = E.id
- AND E.issue_date >= TO_DATE(:start_date_str, 'YYYY-MM-DD HH24:MI:SS')
- AND E.issue_date <= TO_DATE(:end_date_str, 'YYYY-MM-DD HH24:MI:SS')
+ AND E.issue_date >= TO_TIMESTAMP(:start_date_str, 'YYYY-MM-DD HH24:MI:SS')
+ AND E.issue_date <= TO_TIMESTAMP(:end_date_str, 'YYYY-MM-DD HH24:MI:SS')
ORDER BY issue_date DESC
</query>
</mode>
@@ -367,7 +367,7 @@ SELECT DISTINCT
rhnChannelErrata CE
WHERE CE.channel_id = :cid
AND CE.errata_id = E.id
- AND E.issue_date >= TO_DATE(:start_date_str, 'YYYY-MM-DD HH24:MI:SS')
+ AND E.issue_date >= TO_TIMESTAMP(:start_date_str, 'YYYY-MM-DD HH24:MI:SS')
ORDER BY issue_date DESC
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index b204428..1971ce6 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -1168,7 +1168,7 @@ SELECT
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
- AND P.last_modified >= TO_DATE(:start_date_str, 'YYYY-MM-DD HH24:MI:SS')
+ AND P.last_modified >= TO_TIMESTAMP(:start_date_str, 'YYYY-MM-DD HH24:MI:SS')
ORDER BY UPPER(PN.name), P.id
</query>
</mode>
@@ -1192,8 +1192,8 @@ SELECT
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
- AND P.last_modified >= TO_DATE(:start_date_str, 'YYYY-MM-DD HH24:MI:SS')
- AND P.last_modified <= TO_DATE(:end_date_str, 'YYYY-MM-DD HH24:MI:SS')
+ AND P.last_modified >= TO_TIMESTAMP(:start_date_str, 'YYYY-MM-DD HH24:MI:SS')
+ AND P.last_modified <= TO_TIMESTAMP(:end_date_str, 'YYYY-MM-DD HH24:MI:SS')
ORDER BY UPPER(PN.name), P.id
</query>
</mode>
@@ -1238,7 +1238,7 @@ SELECT
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
- AND P.last_modified >= TO_DATE(:start_date_str, 'YYYY-MM-DD HH24:MI:SS')
+ AND P.last_modified >= TO_TIMESTAMP(:start_date_str, 'YYYY-MM-DD HH24:MI:SS')
ORDER BY last_modified
</query>
</mode>
@@ -1262,8 +1262,8 @@ SELECT
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
- AND P.last_modified >= TO_DATE(:start_date_str, 'YYYY-MM-DD HH24:MI:SS')
- AND P.last_modified <= TO_DATE(:end_date_str, 'YYYY-MM-DD HH24:MI:SS')
+ AND P.last_modified >= TO_TIMESTAMP(:start_date_str, 'YYYY-MM-DD HH24:MI:SS')
+ AND P.last_modified <= TO_TIMESTAMP(:end_date_str, 'YYYY-MM-DD HH24:MI:SS')
ORDER BY last_modified
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 116b5e6..03fea23 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -795,7 +795,7 @@ SELECT DISTINCT S.id, S.NAME,
AND P.evr_id = SP.evr_id
AND P.name_id = SP.name_id
AND EP.errata_id = E.id AND EP.package_id = P.id
- AND (to_date('1970-01-01', 'YYYY-MM-DD') + numtodsinterval(S.last_boot, 'second')) < SP.installtime
+ AND (to_timestamp('1970-01-01', 'YYYY-MM-DD') + numtodsinterval(S.last_boot, 'second')) < SP.installtime
AND E.id IN (SELECT EK.errata_id FROM rhnErrataKeyword EK WHERE EK.keyword = :keyword)
</query>
@@ -826,7 +826,7 @@ SELECT DISTINCT S.id, S.NAME,
AND P.evr_id = SP.evr_id
AND P.name_id = SP.name_id
AND EP.errata_id = E.id AND EP.package_id = P.id
- AND (to_date('1970-01-01', 'YYYY-MM-DD') + numtodsinterval(S.last_boot, 'second')) < SP.installtime
+ AND (to_timestamp('1970-01-01', 'YYYY-MM-DD') + numtodsinterval(S.last_boot, 'second')) < SP.installtime
AND E.id IN (SELECT EK.errata_id FROM rhnErrataKeyword EK WHERE EK.keyword = :keyword)
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
index 6793874..868bac4 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
@@ -823,7 +823,7 @@ ORDER BY SA.completion_time DESC
WHERE A.Action_type = ( select id from rhnActionType where label = 'configfiles.deploy' )
AND A.org_id = :org_id
AND USP.user_id = :user_id
- AND A.earliest_action > TO_DATE(:date, 'YYYY-MM-DD HH24:MI:SS')
+ AND A.earliest_action > TO_TIMESTAMP(:date, 'YYYY-MM-DD HH24:MI:SS')
ORDER BY A.earliest_action desc ) TC
where rownum <= :num
</query>
@@ -847,7 +847,7 @@ ORDER BY SA.completion_time DESC
WHERE A.Action_type = ( select id from rhnActionType where label = 'configfiles.deploy' )
AND A.org_id = :org_id
AND USP.user_id = :user_id
- AND A.earliest_action > TO_DATE(:date, 'YYYY-MM-DD HH24:MI:SS')
+ AND A.earliest_action > TO_TIMESTAMP(:date, 'YYYY-MM-DD HH24:MI:SS')
ORDER BY A.earliest_action desc
LIMIT :num
</query>
diff --git a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
index 5635249..6a5f9c0 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
@@ -146,8 +146,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
from com.redhat.rhn.domain.errata.impl.PublishedErrata as e
where :channel in elements(e.channels) and
(e.org = :org or e.org is null) and
- (e.lastModified > to_date(:start_date, 'YYYY-MM-DD HH24:MI:SS')) and
- (e.lastModified < to_date(:end_date, 'YYYY-MM-DD HH24:MI:SS'))
+ (e.lastModified > to_timestamp(:start_date, 'YYYY-MM-DD HH24:MI:SS')) and
+ (e.lastModified < to_timestamp(:end_date, 'YYYY-MM-DD HH24:MI:SS'))
order by e.issueDate
]]>
</query>
diff --git a/monitoring/NPalert/NotificationDB.pm b/monitoring/NPalert/NotificationDB.pm
index f6dbd58..5196bde 100644
--- a/monitoring/NPalert/NotificationDB.pm
+++ b/monitoring/NPalert/NotificationDB.pm
@@ -874,7 +874,7 @@ sub _create {
if ($fields{$col} =~ /sysdate/i) {
push(@bindvars, $fields{$col});
} else {
- push(@bindvars, "TO_DATE(?, '" . DEF_DB_DATE_FMT . "')");
+ push(@bindvars, "TO_TIMESTAMP(?, '" . DEF_DB_DATE_FMT . "')");
push(@bindvals, $self->timestamp_to_string($fields{$col}));
}
} else {
@@ -1069,7 +1069,7 @@ sub _wherephrase {
if ($val =~ /sysdate/i) {
push(@wherephrases, "$col = $val");
} else {
- push(@wherephrases, "$col = TO_DATE(?, '" . DEF_DB_DATE_FMT . "')");
+ push(@wherephrases, "$col = TO_TIMESTAMP(?, '" . DEF_DB_DATE_FMT . "')");
push(@bindvals, $self->timestamp_to_string($val));
}
} else {
diff --git a/monitoring/PerlModules/NP/OracleDB/CF_DB.pm b/monitoring/PerlModules/NP/OracleDB/CF_DB.pm
index fdf209b..455f0a3 100644
--- a/monitoring/PerlModules/NP/OracleDB/CF_DB.pm
+++ b/monitoring/PerlModules/NP/OracleDB/CF_DB.pm
@@ -1377,7 +1377,7 @@ sub createCQ_Session {
my $expdate = sprintf("%-04d-%-02d-%-02d %-02d:%-02d:%-02d",
$year+1900, $mon+1, $mday, $hour, $min, $sec);
- my $values = ['?', '?', "TO_DATE(?, 'YYYY-MM-DD HH24:MI:SS')"];
+ my $values = ['?', '?', "TO_TIMESTAMP(?, 'YYYY-MM-DD HH24:MI:SS')"];
push(@$bindvars, $contact, $sid, $expdate);
$self->CQ_Sessions('insert', $values, $bindvars);
@@ -1403,7 +1403,7 @@ sub updateCQ_Session {
$year+1900, $mon+1, $mday, $hour, $min, $sec);
my $values = ['session_id = ?',
- "expiration_date = TO_DATE(?, 'YYYY-MM-DD HH24:MI:SS')"];
+ "expiration_date = TO_TIMESTAMP(?, 'YYYY-MM-DD HH24:MI:SS')"];
push(@$bindvars, $sid, $expdate);
diff --git a/monitoring/SputLite/html/cgi-bin/create_commands.cgi b/monitoring/SputLite/html/cgi-bin/create_commands.cgi
index 4340fb3..f693ee1 100755
--- a/monitoring/SputLite/html/cgi-bin/create_commands.cgi
+++ b/monitoring/SputLite/html/cgi-bin/create_commands.cgi
@@ -509,7 +509,7 @@ sub execute {
my $now = str2time($CF_DB->get_sysdate);
my $timestamp = $now + $q->param('expiremin') * 60 + $q->param('expirehours') * 60 * 60 + $q->param('expiredays') * 60 * 60 * 24;
my $expstring = strftime($F_DATE_FORMAT,gmtime($timestamp));
- my $expdate = "TO_DATE('$expstring', '$DB_DATE_FORMAT')";
+ my $expdate = "TO_TIMESTAMP('$expstring', '$DB_DATE_FORMAT')";
my $instance_id = $CF_DB->createCQ_Instance(
$q->param('command_id'), # COMMAND_ID
@@ -977,7 +977,7 @@ my $val = $q->param("val_field$_");
$err .= "Invalid date time format entered for \"$desc\".\n";
last
}
- $val = sprintf("TO_DATE('%s','DD-MM-YY HH24:MI:SS')",strftime('%d-%m-%Y %H:%M:%S',gmtime($ts)));
+ $val = sprintf("TO_TIMESTAMP('%s','DD-MM-YY HH24:MI:SS')",strftime('%d-%m-%Y %H:%M:%S',gmtime($ts)));
} elsif ($op =~ /like/) {
$val=uc($val);
$val = "'%$val%'"
diff --git a/monitoring/SputLite/lib/UploadResults.pm b/monitoring/SputLite/lib/UploadResults.pm
index b341877..5f097b3 100644
--- a/monitoring/SputLite/lib/UploadResults.pm
+++ b/monitoring/SputLite/lib/UploadResults.pm
@@ -41,7 +41,7 @@ sub ProcessInput {
if ($field eq 'date_executed') {
my($sec,$min,$hour,$mday,$mon,$year) = gmtime($value);
- my $timespec = "TO_DATE(?, ?)";
+ my $timespec = "TO_TIMESTAMP(?, ?)";
my $timestr = sprintf("%s/%s/%s %s:%s:%s",
$mon+1, $mday, $year+1900, $hour, $min, $sec);
push(@values, "$field = $timespec");
diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/spacewalk/postgres/packages/rhn_channel.pkb
index 11ff70e..5931562 100644
--- a/schema/spacewalk/postgres/packages/rhn_channel.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb
@@ -1248,14 +1248,14 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
where channel_id = channel_id_in
) loop
if row.relative_filename = path_in
- and row.last_modified = to_date(timestamp_in, 'YYYYMMDDHH24MISS') then
+ and row.last_modified = to_timestamp(timestamp_in, 'YYYYMMDDHH24MISS') then
return;
end if;
end loop;
delete from rhnChannelComps
where channel_id = channel_id_in;
insert into rhnChannelComps (id, channel_id, relative_filename, last_modified, created, modified)
- values (sequence_nextval('rhn_channelcomps_id_seq'), channel_id_in, path_in, to_date(timestamp_in, 'YYYYMMDDHH24MISS'), current_timestamp, current_timestamp);
+ values (sequence_nextval('rhn_channelcomps_id_seq'), channel_id_in, path_in, to_timestamp(timestamp_in, 'YYYYMMDDHH24MISS'), current_timestamp, current_timestamp);
end$$ language plpgsql;
-- restore the original setting
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/011-rhn_channel.pkb.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/011-rhn_channel.pkb.sql.oracle
new file mode 100644
index 0000000..b7b00b1
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/011-rhn_channel.pkb.sql.oracle
@@ -0,0 +1 @@
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/011-rhn_channel.pkb.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/011-rhn_channel.pkb.sql.postgresql
new file mode 100644
index 0000000..f49a640
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/011-rhn_channel.pkb.sql.postgresql
@@ -0,0 +1,47 @@
+-- oracle equivalent source sha1 b14267384bc104605623a41b755e68e0103b5aa8
+--
+-- Copyright (c) 2008--2013 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_channel;
+
+--update pg_setting
+update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_path';
+
+ create or replace function set_comps(channel_id_in in numeric, path_in in varchar, timestamp_in in varchar) returns void
+ as $$
+ declare
+ row record;
+ begin
+ for row in (
+ select relative_filename, last_modified
+ from rhnChannelComps
+ where channel_id = channel_id_in
+ ) loop
+ if row.relative_filename = path_in
+ and row.last_modified = to_timestamp(timestamp_in, 'YYYYMMDDHH24MISS') then
+ return;
+ end if;
+ end loop;
+ delete from rhnChannelComps
+ where channel_id = channel_id_in;
+ insert into rhnChannelComps (id, channel_id, relative_filename, last_modified, created, modified)
+ values (sequence_nextval('rhn_channelcomps_id_seq'), channel_id_in, path_in, to_timestamp(timestamp_in, 'YYYYMMDDHH24MISS'), current_timestamp, current_timestamp);
+ end$$ language plpgsql;
+
+-- restore the original setting
+update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_channel')+1) ) where name = 'search_path';
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml
index 6dc5f19..4fa590d 100644
--- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml
+++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml
@@ -42,8 +42,8 @@
ac.org_id = wc.org_id and
ps.web_user_id = wc.id and
ps.id = #sessionId# and
- E.issue_date >= TO_DATE(#param0#, 'YYYY-MM-DD HH24:MI:SS')
- AND E.issue_date <= TO_DATE(#param1#, 'YYYY-MM-DD HH24:MI:SS')
+ E.issue_date >= TO_TIMESTAMP(#param0#, 'YYYY-MM-DD HH24:MI:SS')
+ AND E.issue_date <= TO_TIMESTAMP(#param1#, 'YYYY-MM-DD HH24:MI:SS')
ORDER BY E.issue_date ASC
</select>
</sqlMap>
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml
index e7b4caf..87dae3f 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml
@@ -38,8 +38,8 @@ SELECT EVENT_ID,
HISTORY_STATUS
FROM (SELECT SH.id EVENT_ID,
SH.summary SUMMARY,
- TO_DATE(NULL, NULL) AS created,
- TO_DATE(NULL, NULL) AS picked_up,
+ TO_TIMESTAMP(NULL, NULL) AS created,
+ TO_TIMESTAMP(NULL, NULL) AS picked_up,
SH.created as completed, -- view this as the "completed" date for sorting reasons
NULL AS history_status,
NULL AS history_type,
diff --git a/web/modules/rhn/RHN/DB/KSTree.pm b/web/modules/rhn/RHN/DB/KSTree.pm
index 5588202..4864c98 100644
--- a/web/modules/rhn/RHN/DB/KSTree.pm
+++ b/web/modules/rhn/RHN/DB/KSTree.pm
@@ -195,7 +195,7 @@ sub commit_files {
INSERT INTO rhnKSTreeFile
(kstree_id, relative_filename, checksum_id, last_modified, file_size)
VALUES
- (:tree_id, :relative_filename, lookup_checksum('md5', :md5sum), TO_DATE(:last_modified, 'YYYY-MM-DD HH24:MI:SS'), :file_size)
+ (:tree_id, :relative_filename, lookup_checksum('md5', :md5sum), TO_TIMESTAMP(:last_modified, 'YYYY-MM-DD HH24:MI:SS'), :file_size)
EOQ
$sth->execute_h(tree_id => $self->id, map { $_ => $file->{+uc $_} } qw/relative_filename md5sum last_modified file_size/)
diff --git a/web/modules/rhn/RHN/DB/TableClass.pm b/web/modules/rhn/RHN/DB/TableClass.pm
index 6ef044e..990fcd0 100644
--- a/web/modules/rhn/RHN/DB/TableClass.pm
+++ b/web/modules/rhn/RHN/DB/TableClass.pm
@@ -80,10 +80,10 @@ sub type_to_placeholder {
my $ret;
if ($self->column_flags($type) eq 'longdate') {
- $ret = "TO_DATE($fieldname, 'YYYY-MM-DD HH24:MI:SS')";
+ $ret = "TO_TIMESTAMP($fieldname, 'YYYY-MM-DD HH24:MI:SS')";
}
elsif ($self->column_flags($type) eq 'shortdate') {
- $ret = "TO_DATE($fieldname, 'YYYY-MM-DD')";
+ $ret = "TO_TIMESTAMP($fieldname, 'YYYY-MM-DD')";
}
else {
$ret = "$fieldname";
diff --git a/web/modules/rhn/RHN/DB/TinyURL.pm b/web/modules/rhn/RHN/DB/TinyURL.pm
index e9e4ebd..ee59c74 100644
--- a/web/modules/rhn/RHN/DB/TinyURL.pm
+++ b/web/modules/rhn/RHN/DB/TinyURL.pm
@@ -65,7 +65,7 @@ sub create {
INSERT INTO rhnTinyURL
(token, url, enabled, expires)
VALUES
- (:token, :url, 'Y', TO_DATE(:expires, 'YYYY-MM-DD HH24:MI:SS') + 1/6)
+ (:token, :url, 'Y', TO_TIMESTAMP(:expires, 'YYYY-MM-DD HH24:MI:SS') + 1/6)
EOS
$sth->execute_h(token => $token, url => $url, expires => $expires);
$dbh->commit;
commit 53257058ba0b52b56948fc90798d5c599e535172
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 26 08:56:24 2013 +0100
Fixing schema upgrade of rhnCpu.nrsocket.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.postgresql
index 9eb1edc..514bf8d 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.postgresql
@@ -1,3 +1,3 @@
--- oracle equivalent source sha1 c9998dc4e416dc187bd61828c345991580dac5dd
+-- oracle equivalent source sha1 542a4a49150b8cecd6c9ef947357a1608b1d9f04
-alter table rhnCpu add column nrsocket NUMERIC
+alter table rhnCpu add column nrsocket NUMERIC;
11 years, 2 months
rel-eng/tito.props
by Jan Pazdziora
rel-eng/tito.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d589b43950e47c6be52ee6b92806799a609fa94e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 26 08:45:22 2013 +0100
With mod_perl-2.0.7-12.20130221svn1448242.fc18 in Fedora 18 repo, we no longer want to build our rpm.
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index e56b1ef..a78e26a 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -22,4 +22,4 @@ blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient sm
[spacewalk-nightly-fedora18]
disttag = .fc18
-blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata oracle-rhnsat-selinux
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata oracle-rhnsat-selinux mod_perl
11 years, 2 months
Changes to 'refs/tags/spacewalk-java-1.10.28-1'
by StephenHerr
Tag 'spacewalk-java-1.10.28-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-03-25 21:45 +0000
Tagging package [spacewalk-java] version [1.10.28-1] in directory [java/].
Changes since spacewalk-certs-tools-1.10.1-1:
Christopher Duryee (2):
add nrsocket to rhncpu
add python and java xmlrpc handlers for cpu socket info
Stephen Herr (2):
Client tools able to pass up socket info
Automatic commit of package [spacewalk-java] release [1.10.28-1].
---
backend/server/rhnServer/server_hardware.py | 6
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 67 ++++++++++
java/code/src/com/redhat/rhn/domain/server/CPU.hbm.xml | 3
java/code/src/com/redhat/rhn/domain/server/CPU.java | 15 ++
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java | 2
java/spacewalk-java.spec | 6
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/common/tables/rhnCpu.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.oracle | 2
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.postgresql | 3
10 files changed, 103 insertions(+), 5 deletions(-)
---
11 years, 2 months
Changes to 'refs/tags/spacewalk-backend-1.10.11-1'
by StephenHerr
Tag 'spacewalk-backend-1.10.11-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-03-25 21:45 +0000
Tagging package [spacewalk-backend] version [1.10.11-1] in directory [backend/].
Changes since spacewalk-certs-tools-1.10.1-1:
Christopher Duryee (2):
add nrsocket to rhncpu
add python and java xmlrpc handlers for cpu socket info
Stephen Herr (3):
Client tools able to pass up socket info
Automatic commit of package [spacewalk-java] release [1.10.28-1].
Automatic commit of package [spacewalk-backend] release [1.10.11-1].
---
backend/server/rhnServer/server_hardware.py | 6
backend/spacewalk-backend.spec | 6
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 67 ++++++++++
java/code/src/com/redhat/rhn/domain/server/CPU.hbm.xml | 3
java/code/src/com/redhat/rhn/domain/server/CPU.java | 15 ++
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java | 2
java/spacewalk-java.spec | 6
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/common/tables/rhnCpu.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.oracle | 2
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.postgresql | 3
12 files changed, 109 insertions(+), 7 deletions(-)
---
11 years, 2 months
Changes to 'refs/tags/rhn-client-tools-1.10.2-1'
by StephenHerr
Tag 'rhn-client-tools-1.10.2-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-03-25 21:45 +0000
Tagging package [rhn-client-tools] version [1.10.2-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-certs-tools-1.10.1-1:
Christopher Duryee (2):
add nrsocket to rhncpu
add python and java xmlrpc handlers for cpu socket info
Stephen Herr (4):
Client tools able to pass up socket info
Automatic commit of package [spacewalk-java] release [1.10.28-1].
Automatic commit of package [spacewalk-backend] release [1.10.11-1].
Automatic commit of package [rhn-client-tools] release [1.10.2-1].
---
backend/server/rhnServer/server_hardware.py | 6
backend/spacewalk-backend.spec | 6
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 67 ++++++++++
java/code/src/com/redhat/rhn/domain/server/CPU.hbm.xml | 3
java/code/src/com/redhat/rhn/domain/server/CPU.java | 15 ++
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java | 2
java/spacewalk-java.spec | 6
rel-eng/packages/rhn-client-tools | 2
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/common/tables/rhnCpu.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.oracle | 2
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.postgresql | 3
14 files changed, 114 insertions(+), 9 deletions(-)
---
11 years, 2 months
6 commits - backend/server backend/spacewalk-backend.spec client/rhel java/code java/spacewalk-java.spec rel-eng/packages schema/spacewalk
by StephenHerr
backend/server/rhnServer/server_hardware.py | 6
backend/spacewalk-backend.spec | 6
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 67 ++++++++++
java/code/src/com/redhat/rhn/domain/server/CPU.hbm.xml | 3
java/code/src/com/redhat/rhn/domain/server/CPU.java | 15 ++
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java | 2
java/spacewalk-java.spec | 6
rel-eng/packages/rhn-client-tools | 2
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/common/tables/rhnCpu.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.oracle | 2
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.postgresql | 3
14 files changed, 114 insertions(+), 9 deletions(-)
New commits:
commit 66737d83778f4962d248201b7fa66ef73839e650
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Mar 25 17:45:37 2013 -0400
Automatic commit of package [rhn-client-tools] release [1.10.2-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 7556ec3..7703196 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.10.1
+Version: 1.10.2
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Mon Mar 25 2013 Stephen Herr <sherr(a)redhat.com> 1.10.2-1
+- Client tools able to pass up socket info
+
* Wed Mar 20 2013 Miroslav Suchý <msuchy(a)redhat.com> 1.10.1-1
- rpm macros must not be marked as config file
- Bumping package versions for 1.9
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index e616101..4366590 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.10.1-1 client/rhel/rhn-client-tools/
+1.10.2-1 client/rhel/rhn-client-tools/
commit bc6254afffde208f648f03ea2f52200ff0731f44
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Mar 25 17:45:28 2013 -0400
Automatic commit of package [spacewalk-backend] release [1.10.11-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 60e4f65..673b131 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.10.10
+Version: 1.10.11
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Mar 25 2013 Stephen Herr <sherr(a)redhat.com> 1.10.11-1
+- Client tools able to pass up socket info
+- add python and java xmlrpc handlers for cpu socket info
+
* Thu Mar 21 2013 Jan Pazdziora 1.10.10-1
- abrt: store crash uuid
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 7819201..83a34d6 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.10-1 backend/
+1.10.11-1 backend/
commit 27188cd8ffe7225b253b9bcf4d53c400d6c64eff
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Mar 25 17:45:14 2013 -0400
Automatic commit of package [spacewalk-java] release [1.10.28-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7bc1884..ba9de20 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: 1.10.27
+Version: 1.10.28
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -678,6 +678,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Mar 25 2013 Stephen Herr <sherr(a)redhat.com> 1.10.28-1
+- Client tools able to pass up socket info
+- add python and java xmlrpc handlers for cpu socket info
+
* Mon Mar 25 2013 Jan Dobes <jdobes(a)redhat.com> 1.10.27-1
- Adding sudo Requires for spacewalk-java-lib
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 638b3c6..31cb019 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.27-1 java/
+1.10.28-1 java/
commit 36c64513d68cad3a3973d76de91529f473afdd15
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Mar 22 15:34:41 2013 -0400
Client tools able to pass up socket info
diff --git a/backend/server/handlers/xmlrpc/up2date.py b/backend/server/handlers/xmlrpc/up2date.py
index 83ca23b..def45d9 100644
--- a/backend/server/handlers/xmlrpc/up2date.py
+++ b/backend/server/handlers/xmlrpc/up2date.py
@@ -18,7 +18,6 @@
# system module import
import time
import string
-import inspect
from rhn import rpclib
from types import ListType, TupleType, StringType, IntType
@@ -30,8 +29,8 @@ from spacewalk.common.rhnTranslate import _
from spacewalk.server.rhnLib import computeSignature
from spacewalk.server.rhnHandler import rhnHandler
from spacewalk.server import rhnChannel, rhnPackage, rhnDependency,\
- rhnCapability, rhnServer, rhnSQL
-from spacewalk.server.rhnServer import server_route, server_hardware
+ rhnCapability
+from spacewalk.server.rhnServer import server_route
import re
NONSUBSCRIBABLE_CHANNELS = re.compile("(rhn-proxy|rhn-satellite)")
@@ -54,7 +53,6 @@ class Up2date(rhnHandler):
# (getting headers, source and packages done with GETs now).
self.functions.append('login')
self.functions.append('listChannels')
- self.functions.append('reportSockets')
self.functions.append('subscribeChannels')
self.functions.append('unsubscribeChannels')
self.functions.append('history')
@@ -145,26 +143,6 @@ class Up2date(rhnHandler):
return loginDict
- def reportSockets(self, system_id, num_sockets):
- """ Clients v2+ """
- log_debug(5, system_id)
- # Authenticate the system certificate
- self.auth_system('reportSockets', system_id)
- server = rhnServer.search(self.server_id)
- server.reload_hardware()
- # there can only be one CPUDevice per system,
- # see hash fe46f64d
- [cpu_device] = server.hardware_by_class(server_hardware.CPUDevice)
- cpu_device.data["nrsocket"] = num_sockets
- cpu_device.status = 1 # mark as dirty
- # log the entry
- log_debug(1, "about to save %s" % self.server_id)
- cpu_device.save(self.server_id)
- rhnSQL.commit()
- log_debug(1, "saved %s" % self.server_id)
- return "reported %s sockets" % num_sockets
-
-
def listChannels(self, system_id):
""" Clients v2+ """
log_debug(5, system_id)
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index bee609c..2b9e5ba 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -50,6 +50,13 @@ try:
except ImportError:
locale = None
+sys.path.append("/usr/share/rhsm")
+try:
+ from subscription_manager.hwprobe import Hardware as SubManHardware
+ subscription_manager_available = True
+except ImportError:
+ subscription_manager_available = False
+
# this does not change, we can cache it
_dmi_data = None
_dmi_not_available = 0
@@ -157,6 +164,61 @@ def cpu_count():
re_cpu = re.compile(r"^cpu[0-9]+$")
return len([i for i in cpu_dir if re_cpu.match(i)])
+# get the number of sockets available on this machine
+def __get_number_sockets():
+ try:
+ if subscription_manager_available:
+ return SubManHardware().getCpuInfo()['cpu.cpu_socket(s)']
+ except:
+ pass # something went wrong, let's figure it out ourselves
+
+ number_sockets = 0
+ # Try lscpu command if available
+ if os.access("/usr/bin/lscpu", os.X_OK):
+ try:
+ lines = os.popen("/usr/bin/lscpu -p").readlines()
+ max_socket_index = -1
+ for line in lines:
+ if line.startswith('#'):
+ continue
+ # get the socket index from the output
+ socket_index = int(line.split(',')[2])
+ if socket_index > max_socket_index:
+ max_socket_index = socket_index
+ if max_socket_index > -1:
+ return 1 + max_socket_index
+ except:
+ pass
+
+ # Next try parsing /proc/cpuinfo
+ if os.access("/proc/cpuinfo", os.R_OK):
+ try:
+ lines = open("/proc/cpuinfo", 'r').readlines()
+ max_socket_index = -1
+ for line in lines:
+ if 'physical id' in line:
+ socket_index = int(line.split(':')[1].strip())
+ if socket_index > max_socket_index:
+ max_socket_index = socket_index
+ if max_socket_index > -1:
+ return 1 + max_socket_index
+ except:
+ pass
+
+ # Next try dmidecode
+ if os.access("/usr/sbin/dmidecode", os.X_OK):
+ try:
+ lines = os.popen("/usr/sbin/dmidecode -t processor").readlines()
+ count = 0
+ for line in lines:
+ if 'Processor Information' in line:
+ count += 1
+ if count > 0:
+ return count
+ except:
+ pass
+
+ return None
# This has got to be one of the ugliest fucntions alive
def read_cpuinfo():
@@ -337,6 +399,11 @@ def read_cpuinfo():
else:
if hwdict["count"] == 0: # we have at least one
hwdict["count"] = 1
+
+ # If we know it add in the number of sockets
+ number_sockets = __get_number_sockets()
+ if number_sockets:
+ hwdict['socket_count'] = number_sockets
# This whole things hurts a lot.
return hwdict
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java
index 7236b4e..1c598dc 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java
@@ -39,6 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "arch")
* #prop("string", "stepping")
* #prop("string", "count")
+ * #prop("int", "socket_count (if available)")
* #struct_end()
*
*/
commit 69016b8a4d4a07d2869d92e35ea90e939a291b96
Author: Christopher Duryee <cduryee(a)redhat.com>
Date: Fri Mar 22 14:40:49 2013 -0400
add python and java xmlrpc handlers for cpu socket info
(cherry picked from commit f61ada6151905dd2c6a7219faae99ae1a4f69e1d)
diff --git a/backend/server/handlers/xmlrpc/up2date.py b/backend/server/handlers/xmlrpc/up2date.py
index def45d9..83ca23b 100644
--- a/backend/server/handlers/xmlrpc/up2date.py
+++ b/backend/server/handlers/xmlrpc/up2date.py
@@ -18,6 +18,7 @@
# system module import
import time
import string
+import inspect
from rhn import rpclib
from types import ListType, TupleType, StringType, IntType
@@ -29,8 +30,8 @@ from spacewalk.common.rhnTranslate import _
from spacewalk.server.rhnLib import computeSignature
from spacewalk.server.rhnHandler import rhnHandler
from spacewalk.server import rhnChannel, rhnPackage, rhnDependency,\
- rhnCapability
-from spacewalk.server.rhnServer import server_route
+ rhnCapability, rhnServer, rhnSQL
+from spacewalk.server.rhnServer import server_route, server_hardware
import re
NONSUBSCRIBABLE_CHANNELS = re.compile("(rhn-proxy|rhn-satellite)")
@@ -53,6 +54,7 @@ class Up2date(rhnHandler):
# (getting headers, source and packages done with GETs now).
self.functions.append('login')
self.functions.append('listChannels')
+ self.functions.append('reportSockets')
self.functions.append('subscribeChannels')
self.functions.append('unsubscribeChannels')
self.functions.append('history')
@@ -143,6 +145,26 @@ class Up2date(rhnHandler):
return loginDict
+ def reportSockets(self, system_id, num_sockets):
+ """ Clients v2+ """
+ log_debug(5, system_id)
+ # Authenticate the system certificate
+ self.auth_system('reportSockets', system_id)
+ server = rhnServer.search(self.server_id)
+ server.reload_hardware()
+ # there can only be one CPUDevice per system,
+ # see hash fe46f64d
+ [cpu_device] = server.hardware_by_class(server_hardware.CPUDevice)
+ cpu_device.data["nrsocket"] = num_sockets
+ cpu_device.status = 1 # mark as dirty
+ # log the entry
+ log_debug(1, "about to save %s" % self.server_id)
+ cpu_device.save(self.server_id)
+ rhnSQL.commit()
+ log_debug(1, "saved %s" % self.server_id)
+ return "reported %s sockets" % num_sockets
+
+
def listChannels(self, system_id):
""" Clients v2+ """
log_debug(5, system_id)
diff --git a/backend/server/rhnServer/server_hardware.py b/backend/server/rhnServer/server_hardware.py
index 8d44e1a..744a75a 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -326,7 +326,7 @@ class CPUDevice(Device):
fields = ['cpu_arch_id', 'architecture', 'bogomips', 'cache',
'family', 'mhz', 'stepping', 'flags', 'model',
'version', 'vendor', 'nrcpu', 'acpiVersion',
- 'apic', 'apmVersion', 'chipset']
+ 'apic', 'apmVersion', 'chipset', 'nrsocket']
mapping = {
"bogomips" : "bogomips",
"cache" : "cache",
@@ -339,6 +339,7 @@ class CPUDevice(Device):
"model_version" : "version",
"speed" : "mhz",
"count" : "nrcpu",
+ "socket_count" : "nrsocket",
"other" : "flags",
"desc" : None,
'class' : None,
@@ -904,7 +905,8 @@ class Hardware:
_l.append(new_dev)
self.__changed = 1
return 0
-
+
+
def delete_hardware(self, sysid = None):
""" This function deletes all hardware. """
log_debug(4, sysid)
diff --git a/java/code/src/com/redhat/rhn/domain/server/CPU.hbm.xml b/java/code/src/com/redhat/rhn/domain/server/CPU.hbm.xml
index 57d4193..a1a90a8 100644
--- a/java/code/src/com/redhat/rhn/domain/server/CPU.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/server/CPU.hbm.xml
@@ -27,6 +27,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="chipSet" column="chipset" type="string" length="64" />
<property name="nrCPU" column="nrcpu" type="long"/>
+ <property name="nrsocket" column="nrsocket" type="long"/>
<property name="created" column="created" type="timestamp"
insert="false" update="false"/>
@@ -46,4 +47,4 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/domain/server/CPU.java b/java/code/src/com/redhat/rhn/domain/server/CPU.java
index 581c3ac..6fc5cfa 100644
--- a/java/code/src/com/redhat/rhn/domain/server/CPU.java
+++ b/java/code/src/com/redhat/rhn/domain/server/CPU.java
@@ -34,6 +34,7 @@ public class CPU extends BaseDomainHelper {
private String version;
private String vendor;
private Long nrCPU;
+ private Long nrsocket;
private String acpiVersion;
private String apic;
private String apmVersion;
@@ -224,6 +225,20 @@ public class CPU extends BaseDomainHelper {
}
/**
+ * @return Returns the nrsocket.
+ */
+ public Long getNrsocket() {
+ return nrsocket;
+ }
+
+ /**
+ * @param nrSocketIn The nrSocket to set.
+ */
+ public void setNrsocket(Long nrsocketIn) {
+ this.nrsocket = nrsocketIn;
+ }
+
+ /**
* @return Returns the server.
*/
public Server getServer() {
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java
index 9ab31ac..7236b4e 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java
@@ -68,6 +68,7 @@ public class CpuSerializer implements XmlRpcCustomSerializer {
helper.add("arch", cpu.getArchName());
helper.add("stepping", cpu.getStepping());
helper.add("count", cpu.getNrCPU());
+ helper.add("socket_count", cpu.getNrsocket());
helper.writeTo(output);
}
commit 7ccda3c0bc634e96a572c4530d6839c4b7e00505
Author: Christopher Duryee <cduryee(a)redhat.com>
Date: Fri Mar 22 14:34:15 2013 -0400
add nrsocket to rhncpu
(cherry picked from commit 57167b36447816d0e26a1cc6301c6a4276e2239a)
diff --git a/schema/spacewalk/common/tables/rhnCpu.sql b/schema/spacewalk/common/tables/rhnCpu.sql
index 85b9924..36231d0 100644
--- a/schema/spacewalk/common/tables/rhnCpu.sql
+++ b/schema/spacewalk/common/tables/rhnCpu.sql
@@ -36,6 +36,8 @@ CREATE TABLE rhnCpu
vendor VARCHAR2(32),
nrcpu NUMBER
DEFAULT (1),
+ nrsocket NUMBER
+ DEFAULT (1),
acpiVersion VARCHAR2(64),
apic VARCHAR2(32),
apmVersion VARCHAR2(32),
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.oracle
new file mode 100644
index 0000000..36cf0c6
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.oracle
@@ -0,0 +1,2 @@
+ALTER TABLE rhnCpu
+ ADD nrsocket NUMBER;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.postgresql
new file mode 100644
index 0000000..9eb1edc
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.postgresql
@@ -0,0 +1,3 @@
+-- oracle equivalent source sha1 c9998dc4e416dc187bd61828c345991580dac5dd
+
+alter table rhnCpu add column nrsocket NUMERIC
11 years, 2 months
Changes to 'refs/tags/spacewalk-certs-tools-1.10.1-1'
by Jan Dobes
Tag 'spacewalk-certs-tools-1.10.1-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-03-25 18:43 +0000
Tagging package [spacewalk-certs-tools] version [1.10.1-1] in directory [spacewalk/certs-tools/].
Changes since spacewalk-java-1.10.27-1:
Jan Dobes (2):
Adding sudo Requires for spacewalk-certs-tools package
Automatic commit of package [spacewalk-certs-tools] release [1.10.1-1].
---
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
---
11 years, 2 months
2 commits - rel-eng/packages spacewalk/certs-tools
by Jan Dobes
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 227154409421f9d32a3de045eacb9f47f59d93dd
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Mon Mar 25 19:43:35 2013 +0100
Automatic commit of package [spacewalk-certs-tools] release [1.10.1-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 21f614c..b8e4346 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.9.5-1 spacewalk/certs-tools/
+1.10.1-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 9631bae..eb3f482 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2
-Version: 1.10.0
+Version: 1.10.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -57,6 +57,11 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Mon Mar 25 2013 Jan Dobes <jdobes(a)redhat.com> 1.10.1-1
+- Adding sudo Requires for spacewalk-certs-tools package
+- Bumping package versions for 1.9
+- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
+
* Thu Feb 28 2013 Jan Pazdziora 1.9.5-1
- Removing the dsn parameter from initDB, removing support for --db option.
commit 6d58cce0864d9d77fbc46f0acdf57c95e4307f8a
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Mon Mar 25 19:35:22 2013 +0100
Adding sudo Requires for spacewalk-certs-tools package
spacewalk/certs-tools/rhn-sudo-ssl-tool uses sudo
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 69926cb..9631bae 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -12,6 +12,7 @@ Requires: openssl rpm-build
Requires: rhn-client-tools
Requires: tar
Requires: spacewalk-backend-libs >= 0.8.28
+Requires: /usr/bin/sudo
BuildRequires: docbook-utils
BuildRequires: python
Obsoletes: rhns-certs < 5.3.0
11 years, 2 months
Changes to 'refs/tags/spacewalk-java-1.10.27-1'
by Jan Dobes
Tag 'spacewalk-java-1.10.27-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-03-25 18:28 +0000
Tagging package [spacewalk-java] version [1.10.27-1] in directory [java/].
Changes since spacewalk-web-1.10.11-1:
Jan Dobes (2):
Adding sudo Requires for spacewalk-java-lib
Automatic commit of package [spacewalk-java] release [1.10.27-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
11 years, 2 months
2 commits - java/spacewalk-java.spec rel-eng/packages
by Jan Dobes
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit a29fa04a1e1626a0ce517f5f4b1620dc85b70d7f
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Mon Mar 25 19:28:26 2013 +0100
Automatic commit of package [spacewalk-java] release [1.10.27-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6469059..7bc1884 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: 1.10.26
+Version: 1.10.27
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -678,6 +678,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Mar 25 2013 Jan Dobes <jdobes(a)redhat.com> 1.10.27-1
+- Adding sudo Requires for spacewalk-java-lib
+
* Mon Mar 25 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.26-1
- abrt: new api: getCrashesByUuid
- abrt: new api: getCrashOverview
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5cc4968..638b3c6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.26-1 java/
+1.10.27-1 java/
commit 35677a83cc3b612ecd444fa1ec4d4e0420f89e87
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Mon Mar 25 19:19:05 2013 +0100
Adding sudo Requires for spacewalk-java-lib
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 649adaf..6469059 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -218,6 +218,7 @@ Obsoletes: rhn-java-lib < 5.3.0
Obsoletes: rhn-java-lib-sat < 5.3.0
Provides: rhn-java-lib = %{version}-%{release}
Provides: rhn-java-lib-sat = %{version}-%{release}
+Requires: /usr/bin/sudo
%description lib
This package contains the jar files for the Spacewalk Java web application
11 years, 2 months