Fix fresh db install problem. (still pending one part of finding db

minchen07 · minchen07 · commit 5b760f903f1a · 2013-02-22T18:01:55.000-08:00
script file correctly).
diff --git a/server/src/com/cloud/upgrade/DatabaseCreator.java b/server/src/com/cloud/upgrade/DatabaseCreator.java
@@ -29,6 +29,7 @@
 
 import com.cloud.utils.PropertiesUtil;
 
+import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.component.SystemIntegrityChecker;
 import com.cloud.utils.db.ScriptRunner;
 import com.cloud.utils.db.Transaction;
@@ -192,6 +193,8 @@ public static void main(String[] args) {
             }
         }
 
+        Transaction txn = Transaction.open(Transaction.CLOUD_DB);
+        try {
         // Process db upgrade classes
         for (String upgradeClass: upgradeClasses) {
             System.out.println("========> Processing upgrade: " + upgradeClass);
@@ -202,13 +205,22 @@ public static void main(String[] args) {
                     System.err.println("The class must be of SystemIntegrityChecker: " + clazz.getName());
                     System.exit(1);
                 }
+                SystemIntegrityChecker checker = (SystemIntegrityChecker)clazz.newInstance();
+                checker.check();
             } catch (ClassNotFoundException e) {
                 System.err.println("Unable to find " + upgradeClass + ": " + e.getMessage());
                 System.exit(1);
+            } catch (InstantiationException e) {
+                System.err.println("Unable to instantiate " + upgradeClass + ": " + e.getMessage());
+                System.exit(1);
+            } catch (IllegalAccessException e) {
+                System.err.println("Unable to access " + upgradeClass + ": " + e.getMessage());
+                System.exit(1);
             }
 
-            //SystemIntegrityChecker checker = (SystemIntegrityChecker)ComponentLocator.inject(clazz);
-            //checker.check();
+         }
+        } finally {
+            txn.close();
         }
     }
 }
diff --git a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -31,7 +31,6 @@
 import java.util.TreeMap;
 
 import javax.ejb.Local;
-import javax.inject.Inject;
 
 import org.apache.log4j.Logger;
 
@@ -77,9 +76,10 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
 
     protected HashMap<String, DbUpgrade[]> _upgradeMap = new HashMap<String, DbUpgrade[]>();
 
-    @Inject VersionDao _dao;
+    VersionDao _dao;
 
     public DatabaseUpgradeChecker() {
+        _dao = new VersionDaoImpl();
         _upgradeMap.put("2.1.7", new DbUpgrade[] { new Upgrade217to218(), new Upgrade218to22(), new Upgrade221to222(),
                 new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226(),
                 new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(),
@@ -115,12 +115,12 @@ public DatabaseUpgradeChecker() {
 
         _upgradeMap.put("2.2.4", new DbUpgrade[] { new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(),
                 new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(),
-                new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), 
+                new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(),
                 new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420() });
 
         _upgradeMap.put("2.2.5", new DbUpgrade[] { new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(),
                 new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(),
-                new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), 
+                new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(),
                 new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420() });
 
         _upgradeMap.put("2.2.6", new DbUpgrade[] { new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(),
@@ -159,7 +159,7 @@ public DatabaseUpgradeChecker() {
         _upgradeMap.put("3.0.1", new DbUpgrade[] { new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420() });
 
         _upgradeMap.put("3.0.2", new DbUpgrade[] { new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420() });
-        
+
         _upgradeMap.put("4.0.0", new DbUpgrade[] { new Upgrade40to41(), new Upgrade410to420() });
 
         _upgradeMap.put("4.1.0", new DbUpgrade[] { new Upgrade410to420() });
diff --git a/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java b/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java
@@ -47,7 +47,7 @@ public class VersionDaoImpl extends GenericDaoBase<VersionVO, Long> implements V
     final GenericSearchBuilder<VersionVO, String> CurrentVersionSearch;
     final SearchBuilder<VersionVO> AllFieldsSearch;
 
-    protected VersionDaoImpl() {
+    public VersionDaoImpl() {
         super();
 
         CurrentVersionSearch = createSearchBuilder(String.class);

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`
`30`	`30`	`import com.cloud.utils.PropertiesUtil;`
`31`	`31`
	`32`	`+import com.cloud.utils.component.ComponentContext;`
`32`	`33`	`import com.cloud.utils.component.SystemIntegrityChecker;`
`33`	`34`	`import com.cloud.utils.db.ScriptRunner;`
`34`	`35`	`import com.cloud.utils.db.Transaction;`
`@@ -192,6 +193,8 @@ public static void main(String[] args) {`
`192`	`193`	`}`
`193`	`194`	`}`
`194`	`195`
	`196`	`+ Transaction txn = Transaction.open(Transaction.CLOUD_DB);`
	`197`	`+ try {`
`195`	`198`	`// Process db upgrade classes`
`196`	`199`	`for (String upgradeClass: upgradeClasses) {`
`197`	`200`	`System.out.println("========> Processing upgrade: " + upgradeClass);`
`@@ -202,13 +205,22 @@ public static void main(String[] args) {`
`202`	`205`	`System.err.println("The class must be of SystemIntegrityChecker: " + clazz.getName());`
`203`	`206`	`System.exit(1);`
`204`	`207`	`}`
	`208`	`+ SystemIntegrityChecker checker = (SystemIntegrityChecker)clazz.newInstance();`
	`209`	`+ checker.check();`
`205`	`210`	`} catch (ClassNotFoundException e) {`
`206`	`211`	`System.err.println("Unable to find " + upgradeClass + ": " + e.getMessage());`
`207`	`212`	`System.exit(1);`
	`213`	`+ } catch (InstantiationException e) {`
	`214`	`+ System.err.println("Unable to instantiate " + upgradeClass + ": " + e.getMessage());`
	`215`	`+ System.exit(1);`
	`216`	`+ } catch (IllegalAccessException e) {`
	`217`	`+ System.err.println("Unable to access " + upgradeClass + ": " + e.getMessage());`
	`218`	`+ System.exit(1);`
`208`	`219`	`}`
`209`	`220`
`210`		`- //SystemIntegrityChecker checker = (SystemIntegrityChecker)ComponentLocator.inject(clazz);`
`211`		`- //checker.check();`
	`221`	`+ }`
	`222`	`+ } finally {`
	`223`	`+ txn.close();`
`212`	`224`	`}`
`213`	`225`	`}`
`214`	`226`	`}`