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>
Show replies by thread