Skip to content

CLOUDSTACK-8852 Database shows that management server is UP when it i… #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Dec 5, 2015
Merged

CLOUDSTACK-8852 Database shows that management server is UP when it i… #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-management.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ fi

NAME="$(basename $0)"
stop() {
SHUTDOWN_WAIT="30"
SHUTDOWN_WAIT="40"
count="0"
if [ -f /var/run/cloud-management.pid ]; then
pid=`cat /var/run/cloud-management.pid`
Expand Down
1 change: 1 addition & 0 deletions ...cle/src/main/java/org/apache/cloudstack/spring/lifecycle/CloudStackExtendedLifeCycle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ public void stopBeans() {
with(new WithComponentLifeCycle() {
@Override
public void with(ComponentLifecycle lifecycle) {
log.info("stopping bean " + lifecycle.getName());
lifecycle.stop();
}
});
Expand Down
11 changes: 8 additions & 3 deletions ...le/src/main/java/org/apache/cloudstack/spring/module/factory/CloudStackSpringContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -71,10 +72,14 @@ public void init() throws IOException {
}

public void registerShutdownHook() {
ApplicationContext base = moduleDefinitionSet.getApplicationContext(baseName);
Map<String, ApplicationContext> contextMap= moduleDefinitionSet.getContextMap();

if (base instanceof ConfigurableApplicationContext) {
((ConfigurableApplicationContext)base).registerShutdownHook();
for (String appName : contextMap.keySet()) {
ApplicationContext contex = contextMap.get(appName);
if (contex instanceof ConfigurableApplicationContext) {
log.trace("registering shutdown hook for bean "+ appName);
((ConfigurableApplicationContext)contex).registerShutdownHook();
}
}
}

Expand Down
4 changes: 4 additions & 0 deletions ...g/module/src/main/java/org/apache/cloudstack/spring/module/model/ModuleDefinitionSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,16 @@
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.Resource;

import java.util.Map;

public interface ModuleDefinitionSet {

ModuleDefinition getModuleDefinition(String name);

ApplicationContext getApplicationContext(String name);

Map<String, ApplicationContext> getContextMap();

Resource[] getConfigResources(String name);

}
5 changes: 5 additions & 0 deletions .../main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,11 @@ public ApplicationContext getApplicationContext(String name) {
return contexts.get(name);
}

@Override
public Map<String, ApplicationContext> getContextMap() {
return contexts;
}

@Override
public Resource[] getConfigResources(String name) {
Set<Resource> resources = new LinkedHashSet<Resource>();
Expand Down
1 change: 1 addition & 0 deletions ...rc/main/java/org/apache/cloudstack/spring/module/web/CloudStackContextLoaderListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ protected ApplicationContext loadParentContext(ServletContext servletContext) {
public void contextInitialized(ServletContextEvent event) {
try {
cloudStackContext = new CloudStackSpringContext();
cloudStackContext.registerShutdownHook();
event.getServletContext().setAttribute(CloudStackSpringContext.CLOUDSTACK_CONTEXT_SERVLET_KEY, cloudStackContext);
} catch (IOException e) {
log.error("Failed to start CloudStack", e);
Expand Down
4 changes: 3 additions & 1 deletion ...r-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,9 @@ public boolean start() {

@Override
public boolean stop() {
_dbSyncTimer.cancel();
if (_dbSyncTimer != null) {
_dbSyncTimer.cancel();
}
return true;
}

Expand Down