You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2014/11/10 10:15:02 UTC
[1/2] git commit: updated refs/heads/master to ca66062
Repository: cloudstack
Updated Branches:
refs/heads/master 991d783e0 -> ca66062cd
CLOUDSTACK-7851:MS does not start after the VM it is running on is rebooted
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/131c2f20
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/131c2f20
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/131c2f20
Branch: refs/heads/master
Commit: 131c2f2014f69685b200b5304be88d9b1da3a2c9
Parents: 991d783
Author: Damodar <da...@citrix.com>
Authored: Thu Nov 6 12:04:30 2014 +0530
Committer: Kishan Kavala <ki...@apache.org>
Committed: Mon Nov 10 14:31:43 2014 +0530
----------------------------------------------------------------------
packaging/centos63/cloud-management.rc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/131c2f20/packaging/centos63/cloud-management.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-management.rc b/packaging/centos63/cloud-management.rc
index eaabd30..6d28748 100755
--- a/packaging/centos63/cloud-management.rc
+++ b/packaging/centos63/cloud-management.rc
@@ -87,7 +87,8 @@ handle_pid_file() {
}
start() {
- source $(dirname $0)/tomcat.sh
+ readpath=$(readlink -f $0)
+ source `dirname $readpath`/tomcat.sh
}
# See how we were called.
[2/2] git commit: updated refs/heads/master to ca66062
Posted by ki...@apache.org.
CLOUDSTACK-7843: sync Job Failures always reported as success on Event Bus
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ca66062c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ca66062c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ca66062c
Branch: refs/heads/master
Commit: ca66062cd54305afaaa64d707a88fc11764e292d
Parents: 131c2f2
Author: Damodar <da...@citrix.com>
Authored: Wed Nov 5 17:19:46 2014 +0530
Committer: Kishan Kavala <ki...@apache.org>
Committed: Mon Nov 10 14:33:28 2014 +0530
----------------------------------------------------------------------
.../cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca66062c/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
index 91516d5..d5f7f9d 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
@@ -253,7 +253,6 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
if (s_logger.isDebugEnabled()) {
s_logger.debug("Publish async job-" + jobId + " complete on message bus");
}
- publishOnEventBus(job, "complete"); // publish before the instance type and ID are wiped out
if (s_logger.isDebugEnabled()) {
s_logger.debug("Wake up jobs related to job-" + jobId);
@@ -291,6 +290,8 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
}
});
+ publishOnEventBus(job, "complete"); // publish before the instance type and ID are wiped out
+
//
// disable wakeup scheduling now, since all API jobs are currently using block-waiting for sub-jobs
//