You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/05 18:50:10 UTC
[4/4] git commit: updated refs/heads/master to 74e33dc
Merge pull request #840 from bvbharatk/CLOUDSTACK-8852
CLOUDSTACK-8852 Database shows that management server is UP when it iDatabase shows that management server is UP when it is actually stopped.
This was happening as the stop method in clusterMnanagerImpl was not getting callled. Added shutdown hooks to all spring sub contexts, this enables spring to call the stop mehtods of the beans when management server is shutting down.
Conflicts:
framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/CloudStackContextLoaderListener.java
* pr/840:
CLOUDSTACK-8852 Database shows that management server is UP when it is actually stopped from the CCP GUI
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/74e33dc5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/74e33dc5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/74e33dc5
Branch: refs/heads/master
Commit: 74e33dc5ae95e2546a1742c5029d13eb86704fe9
Parents: 1056f3c 4849368
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Dec 5 18:47:52 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Dec 5 18:47:53 2015 +0100
----------------------------------------------------------------------
.../centos/SYSCONFDIR/rc.d/init.d/cloud-management.in | 2 +-
.../spring/lifecycle/CloudStackExtendedLifeCycle.java | 1 +
.../spring/module/factory/CloudStackSpringContext.java | 11 ++++++++---
.../spring/module/model/ModuleDefinitionSet.java | 4 ++++
.../module/model/impl/DefaultModuleDefinitionSet.java | 5 +++++
.../module/web/CloudStackContextLoaderListener.java | 1 +
.../network/contrail/management/ContrailManagerImpl.java | 4 +++-
7 files changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74e33dc5/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
----------------------------------------------------------------------