Changes to 'refs/tags/spacewalk-backend-1.10.53-1'
by StephenHerr
Tag 'spacewalk-backend-1.10.53-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-06-28 18:57 +0000
Tagging package [spacewalk-backend] version [1.10.53-1] in directory [backend/].
Changes since spacewalk-java-1.10.109-1:
Stephen Herr (2):
977878 - fixing ISS demo problem, this query should get org ids
Automatic commit of package [spacewalk-backend] release [1.10.53-1].
---
backend/satellite_exporter/satexport.py | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 3 months
2 commits - backend/satellite_exporter backend/spacewalk-backend.spec rel-eng/packages
by StephenHerr
backend/satellite_exporter/satexport.py | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit b0f0114e878f555a080e272983ae011e1f40b879
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Jun 28 14:57:31 2013 -0400
Automatic commit of package [spacewalk-backend] release [1.10.53-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index d1218b5..c04d63c 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.52
+Version: 1.10.53
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -639,6 +639,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Jun 28 2013 Stephen Herr <sherr(a)redhat.com> 1.10.53-1
+- 977878 - fixing ISS demo problem, this query should get org ids
+
* Thu Jun 27 2013 Stephen Herr <sherr(a)redhat.com> 1.10.52-1
- 977878 - trust syncing should remove trusts that no longer exist
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 10e625c..bd4d927 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.52-1 backend/
+1.10.53-1 backend/
commit ca2380db490c287abe7faeea449994606f1b94d8
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Jun 28 14:12:19 2013 -0400
977878 - fixing ISS demo problem, this query should get org ids
diff --git a/backend/satellite_exporter/satexport.py b/backend/satellite_exporter/satexport.py
index 553379b..123ab66 100644
--- a/backend/satellite_exporter/satexport.py
+++ b/backend/satellite_exporter/satexport.py
@@ -219,7 +219,7 @@ class ApacheServer(BaseApacheServer):
raise rhnFault(2004,
_('Server "%s" is not enabled for ISS.')
% remote_hostname)
- iss_slave_condition = "select id from web_contact"
+ iss_slave_condition = "select id from web_customer"
if not(row['allow_all_orgs'] == 'Y'):
iss_slave_condition = "select rhnISSSlaveOrgs.org_id from rhnISSSlaveOrgs where slave_id = %d" % row['id']
return iss_slave_condition
10 years, 3 months
Changes to 'refs/tags/spacewalk-java-1.10.109-1'
by Tomas Lestach
Tag 'spacewalk-java-1.10.109-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-06-28 15:00 +0000
Tagging package [spacewalk-java] version [1.10.109-1] in directory [java/].
Changes since spacewalk-schema-1.10.54-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-java] release [1.10.109-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 3 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 718fe81a405ca971bdcc9b15efdea9dfca8a5c2d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jun 28 17:00:25 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.109-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 2ab19c7..219e540 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.108
+Version: 1.10.109
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jun 28 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.109-1
+- mark unfinished taskomatic runs as INTERRUPTED
+- messages get displayed within layout_c.jsp
+
* Thu Jun 27 2013 Grant Gainey 1.10.108-1
- 977878 - Clean up maps on local-org-removal
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 9e0f0fe..0b6691e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.108-1 java/
+1.10.109-1 java/
10 years, 3 months
Changes to 'refs/tags/spacewalk-schema-1.10.54-1'
by Tomas Lestach
Tag 'spacewalk-schema-1.10.54-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-06-28 14:59 +0000
Tagging package [spacewalk-schema] version [1.10.54-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.10.53-1:
Tomas Lestach (3):
messages get displayed within layout_c.jsp
mark unfinished taskomatic runs as INTERRUPTED
Automatic commit of package [spacewalk-schema] release [1.10.54-1].
---
java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java | 11 ++++++++++
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml | 4 +++
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java | 1
java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java | 11 ++++++++++
java/scripts/java-templates/jspbody.jsp | 5 ----
rel-eng/packages/spacewalk-schema | 2 -
schema/spacewalk/common/tables/rhnTaskoRun.sql | 2 -
schema/spacewalk/spacewalk-schema.spec | 5 +++-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/019-rhnTaskoRun-status.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/019-rhnTaskoRun-status.sql.postgresql | 3 ++
10 files changed, 37 insertions(+), 8 deletions(-)
---
10 years, 3 months
3 commits - java/code java/scripts rel-eng/packages schema/spacewalk
by Tomas Lestach
java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java | 11 ++++++++++
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml | 4 +++
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java | 1
java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java | 11 ++++++++++
java/scripts/java-templates/jspbody.jsp | 5 ----
rel-eng/packages/spacewalk-schema | 2 -
schema/spacewalk/common/tables/rhnTaskoRun.sql | 2 -
schema/spacewalk/spacewalk-schema.spec | 5 +++-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/019-rhnTaskoRun-status.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/019-rhnTaskoRun-status.sql.postgresql | 3 ++
10 files changed, 37 insertions(+), 8 deletions(-)
New commits:
commit f495673bab12eea71a0a8eaff28545bc21ffd80d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jun 28 16:59:32 2013 +0200
Automatic commit of package [spacewalk-schema] release [1.10.54-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 5eb5e5d..6b8a034 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.10.53-1 schema/spacewalk/
+1.10.54-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 12aa17f..2ccde4b 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: 1.10.53
+Version: 1.10.54
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Jun 28 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.54-1
+- mark unfinished taskomatic runs as INTERRUPTED
+
* Fri Jun 28 2013 Dimitar Yordanov <dyordano(a)redhat.com> 1.10.53-1
- fix sql syntax.
commit 68332d728d1300ee5f41ad58f34977cd21457e6c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 3 16:05:01 2013 +0200
mark unfinished taskomatic runs as INTERRUPTED
we need to set endTime for these runs, so they will be deleted by the ClearLogHistory task, otherwise they would be kept forever
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java
index a4a823c..e4a123c 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java
@@ -507,4 +507,15 @@ public class TaskoFactory extends HibernateFactory {
}
return orgId.equals(run.getOrgId());
}
+
+ /**
+ * Lists taskomatic runs those endTime IS NULL (most probably were interrupted by
+ * taskomatic shutdown)
+ * @return list of unfinished runs
+ */
+ public static List<TaskoRun> listUnfinishedRuns() {
+ Map params = new HashMap();
+ return singleton.listObjectsByNamedQuery(
+ "TaskoRun.listUnfinished", params);
+ }
}
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml
index 771e42e..855565d 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml
@@ -53,4 +53,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<![CDATA[FROM com.redhat.rhn.taskomatic.TaskoRun WHERE scheduleId = :schedule_id AND endTime > :limit_time]]>
</query>
+ <query name="TaskoRun.listUnfinished">
+ <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoRun WHERE endTime IS NULL]]>
+ </query>
+
</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java
index 8ba2e5b..c8becd6 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java
@@ -37,6 +37,7 @@ public class TaskoRun {
public static final String STATUS_FINISHED = "FINISHED";
public static final String STATUS_FAILED = "FAILED";
public static final String STATUS_SKIPPED = "SKIPPED";
+ public static final String STATUS_INTERRUPTED = "INTERRUPTED";
private static final String STD_LOG_PREFIX = "/var/log/rhn/tasko/";
private Long id;
diff --git a/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java b/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java
index 7b603a7..c4dd86b 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java
@@ -249,6 +249,17 @@ public class SchedulerKernel {
}
}
}
+ // close unfinished runs
+ int interrupted = 0;
+ for (TaskoRun run : TaskoFactory.listUnfinishedRuns()) {
+ run.setStatus(TaskoRun.STATUS_INTERRUPTED);
+ run.setEndTime(now);
+ TaskoFactory.save(run);
+ interrupted++;
+ }
+ if (interrupted > 0) {
+ log.warn("Number of interrupted runs: " + interrupted);
+ }
TaskoFactory.closeSession();
}
catch (Exception e) {
diff --git a/schema/spacewalk/common/tables/rhnTaskoRun.sql b/schema/spacewalk/common/tables/rhnTaskoRun.sql
index f722af9..f98f97a 100644
--- a/schema/spacewalk/common/tables/rhnTaskoRun.sql
+++ b/schema/spacewalk/common/tables/rhnTaskoRun.sql
@@ -30,7 +30,7 @@ CREATE TABLE rhnTaskoRun
end_time timestamp with local time zone,
std_output_path VARCHAR2(100),
std_error_path VARCHAR2(100),
- status VARCHAR2(10),
+ status VARCHAR2(12),
created timestamp with local time zone
DEFAULT (current_timestamp) NOT NULL,
modified timestamp with local time zone
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/019-rhnTaskoRun-status.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/019-rhnTaskoRun-status.sql.oracle
new file mode 100644
index 0000000..8486b2d
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/019-rhnTaskoRun-status.sql.oracle
@@ -0,0 +1 @@
+ALTER TABLE rhnTaskoRun MODIFY status VARCHAR2(12);
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/019-rhnTaskoRun-status.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/019-rhnTaskoRun-status.sql.postgresql
new file mode 100644
index 0000000..2e7219e
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/019-rhnTaskoRun-status.sql.postgresql
@@ -0,0 +1,3 @@
+-- oracle equivalent source sha1 96c6d0582999e9a3dc2baeca56c7935a03e40900
+
+ALTER TABLE rhnTaskoRun ALTER status TYPE VARCHAR(12);
commit 9f693eab385773dbbc496a4e31fd5a62c325a6c9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 31 15:57:15 2013 +0200
messages get displayed within layout_c.jsp
diff --git a/java/scripts/java-templates/jspbody.jsp b/java/scripts/java-templates/jspbody.jsp
index 8efd1fd..8a6a7bd 100644
--- a/java/scripts/java-templates/jspbody.jsp
+++ b/java/scripts/java-templates/jspbody.jsp
@@ -6,11 +6,6 @@
<html>
<body>
-<html:errors />
-<html:messages id="message" message="true">
- <rhn:messages><c:out escapeXml="false" value="${message}" /></rhn:messages>
-</html:messages>
-
<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif">
<bean:message key="###JSPNAME###.toolbar"/>
</rhn:toolbar>
10 years, 3 months
Changes to 'refs/tags/spacewalk-schema-1.10.53-1'
by Dimitar Yordanov
Tag 'spacewalk-schema-1.10.53-1' created by Dimitar Yordanov <dyordano(a)redhat.com> at 2013-06-28 10:25 +0000
Tagging package [spacewalk-schema] version [1.10.53-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.10.108-1:
Dimitar Yordanov (2):
fix sql syntax.
Automatic commit of package [spacewalk-schema] release [1.10.53-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/common/tables/rhnISSSlave.sql | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/022-rhnISSSlave.sql | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
---
10 years, 3 months
rel-eng/packages schema/spacewalk
by Dimitar Yordanov
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit bcabd1f49e4d1142387b2c21935e698a970dd3b9
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Fri Jun 28 12:25:26 2013 +0200
Automatic commit of package [spacewalk-schema] release [1.10.53-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index dffd705..5eb5e5d 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.10.52-1 schema/spacewalk/
+1.10.53-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 5d51ed0..12aa17f 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: 1.10.52
+Version: 1.10.53
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Jun 28 2013 Dimitar Yordanov <dyordano(a)redhat.com> 1.10.53-1
+- fix sql syntax.
+
* Thu Jun 27 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.52-1
- fix sql syntax
10 years, 3 months
schema/spacewalk
by Dimitar Yordanov
schema/spacewalk/common/tables/rhnISSSlave.sql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/022-rhnISSSlave.sql | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e07535fcc9a932b2b49f24a09b1f350a1269b890
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Fri Jun 28 12:20:16 2013 +0200
fix sql syntax.
diff --git a/schema/spacewalk/common/tables/rhnISSSlave.sql b/schema/spacewalk/common/tables/rhnISSSlave.sql
index 1e60d26..6795e7c 100644
--- a/schema/spacewalk/common/tables/rhnISSSlave.sql
+++ b/schema/spacewalk/common/tables/rhnISSSlave.sql
@@ -4,7 +4,7 @@ create table rhnISSSlave (
slave varchar2(512) not null constraint rhn_isss_name_uq unique,
enabled char(1) default 'Y' not null
constraint rhn_isss_enabled_yn check (enabled in ( 'Y', 'N' )),
- allow_all_orgs char(1) not null default 'Y',
+ allow_all_orgs char(1) default 'Y' not null
constraint rhn_isss_allorgs_yn check (allow_all_orgs in ( 'Y', 'N' )),
created timestamp with local time zone default (current_timestamp) not null,
modified timestamp with local time zone default (current_timestamp) not null
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/022-rhnISSSlave.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/022-rhnISSSlave.sql
index 3cbaa7c..98caae6 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/022-rhnISSSlave.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/022-rhnISSSlave.sql
@@ -3,7 +3,7 @@ create table rhnISSSlave (
slave varchar2(512) not null constraint rhn_isss_name_uq unique,
enabled char(1) default 'Y' not null
constraint rhn_isss_enabled_yn check (enabled in ( 'Y', 'N' )),
- allow_all_orgs char(1) not null default 'Y',
+ allow_all_orgs char(1) default 'Y' not null
constraint rhn_isss_allorgs_yn check (allow_all_orgs in ( 'Y', 'N' )),
created timestamp with local time zone default (current_timestamp) not null,
modified timestamp with local time zone default (current_timestamp) not null
10 years, 3 months
Changes to 'refs/tags/spacewalk-java-1.10.108-1'
by Grant Gainey
Tag 'spacewalk-java-1.10.108-1' created by Grant Gainey <ggainey(a)redhat.com> at 2013-06-27 20:25 +0000
Tagging package [spacewalk-java] version [1.10.108-1] in directory [java/].
Changes since spacewalk-backend-1.10.52-1:
Grant Gainey (2):
977878 Clean up maps on local-org-removal
Automatic commit of package [spacewalk-java] release [1.10.108-1].
---
java/code/src/com/redhat/rhn/domain/iss/IssFactory.java | 16 +++++++++++
java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.hbm.xml | 6 ++++
java/code/src/com/redhat/rhn/domain/org/OrgFactory.java | 3 ++
java/spacewalk-java.spec | 5 ++-
rel-eng/packages/spacewalk-java | 2 -
5 files changed, 30 insertions(+), 2 deletions(-)
---
10 years, 3 months