You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/02/06 03:43:28 UTC
[32/50] [abbrv] git commit: refs/heads/storage_refactor - Summary: We
need the integrity checkers to run
Summary: We need the integrity checkers to run
The EncryptionSecretKeyChecker is required to load db.properties with
encrypted passwords.
Make usre the integrity checkers are run before anything else during
start-up
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9d134f0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9d134f0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9d134f0f
Branch: refs/heads/storage_refactor
Commit: 9d134f0f19ed995af04fb4fe469eb81e15634026
Parents: f89dd90
Author: Hugo Trippaers <tr...@gmail.com>
Authored: Tue Feb 5 23:48:51 2013 +0100
Committer: Hugo Trippaers <tr...@gmail.com>
Committed: Tue Feb 5 23:50:01 2013 +0100
----------------------------------------------------------------------
client/tomcatconf/componentContext.xml.in | 1 +
.../cloud/utils/component/ComponentContext.java | 8 ++++++++
2 files changed, 9 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9d134f0f/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index 11017fe..de013de 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -35,6 +35,7 @@
Compose a CloudStack deployment with selected components here
-->
<bean id="databaseUpgradeChecker" class="com.cloud.upgrade.DatabaseUpgradeChecker" />
+ <bean id="encryptionSecretKeyChecker" class="com.cloud.utils.crypt.EncryptionSecretKeyChecker" />
<bean id="managementServerImpl" class ="com.cloud.server.ManagementServerImpl" />
<bean id="configurationServerImpl" class="com.cloud.server.ConfigurationServerImpl" />
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9d134f0f/utils/src/com/cloud/utils/component/ComponentContext.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/component/ComponentContext.java b/utils/src/com/cloud/utils/component/ComponentContext.java
index 1b15f00..716abb3 100644
--- a/utils/src/com/cloud/utils/component/ComponentContext.java
+++ b/utils/src/com/cloud/utils/component/ComponentContext.java
@@ -19,6 +19,7 @@ package com.cloud.utils.component;
import java.util.HashMap;
import java.util.Map;
+import java.util.Map.Entry;
import javax.management.InstanceAlreadyExistsException;
import javax.management.MBeanRegistrationException;
@@ -64,6 +65,13 @@ public class ComponentContext implements ApplicationContextAware {
}
public static void initComponentsLifeCycle() {
+ // Run the SystemIntegrityCheckers first
+ Map<String, SystemIntegrityChecker> integrityCheckers = getApplicationContext().getBeansOfType(SystemIntegrityChecker.class);
+ for (Entry<String,SystemIntegrityChecker> entry : integrityCheckers.entrySet() ){
+ s_logger.info ("Running SystemIntegrityChecker " + entry.getKey());
+ entry.getValue().check();
+ }
+
Map<String, ComponentLifecycle> lifecyleComponents = getApplicationContext().getBeansOfType(ComponentLifecycle.class);
Map[] classifiedComponents = new Map[ComponentLifecycle.MAX_RUN_LEVELS];