From 4f97d4652d21536887bb1b26edcc24af3f35bd9b Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Mon, 4 Apr 2011 18:30:16 +0530
Subject: [PATCH] Skip event migration when usage db doesn't exist

---
 .../com/cloud/upgrade/dao/Upgrade218to22.java | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/server/src/com/cloud/upgrade/dao/Upgrade218to22.java b/server/src/com/cloud/upgrade/dao/Upgrade218to22.java
index cd8f1da99f2..c9d1df42221 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade218to22.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade218to22.java
@@ -1107,16 +1107,23 @@ public class Upgrade218to22 implements DbUpgrade {
     
     private void migrateEvents(Connection conn){
         try {
-        //get last processed event Id
-        Long lastProcessedEvent = getMostRecentEvent(conn); 
-        //Events not yet processed
-        String sql = "SELECT type, description, user_id, account_id, created, level, parameters FROM cloud.event vmevt WHERE vmevt.id > ? and vmevt.state = 'Completed' ";
-        if (lastProcessedEvent == null) {
-            s_logger.trace("no events are processed earlier, copying all events");
-            sql = "SELECT type, description, user_id, account_id, created, level, parameters FROM cloud.event vmevt WHERE vmevt.state = 'Completed' ";
-        }
+            PreparedStatement pstmt1 = conn.prepareStatement("SHOW DATABASES LIKE 'cloud_usage'");
+            ResultSet rs1 = pstmt1.executeQuery();
+            if (!rs1.next()) {
+                s_logger.debug("cloud_usage db doesn't exist. Skipping events migration");
+                return;
+            }
 
-        PreparedStatement pstmt = null;
+            //get last processed event Id
+            Long lastProcessedEvent = getMostRecentEvent(conn); 
+            //Events not yet processed
+            String sql = "SELECT type, description, user_id, account_id, created, level, parameters FROM cloud.event vmevt WHERE vmevt.id > ? and vmevt.state = 'Completed' ";
+            if (lastProcessedEvent == null) {
+                s_logger.trace("no events are processed earlier, copying all events");
+                sql = "SELECT type, description, user_id, account_id, created, level, parameters FROM cloud.event vmevt WHERE vmevt.state = 'Completed' ";
+            }
+
+            PreparedStatement pstmt = null;
 
             pstmt = conn.prepareStatement(sql);
             int i = 1;
@@ -1124,7 +1131,7 @@ public class Upgrade218to22 implements DbUpgrade {
                 pstmt.setLong(i++, lastProcessedEvent);
             }
             ResultSet rs = pstmt.executeQuery();
-            s_logger.trace("Begin Migrating events");
+            s_logger.debug("Begin Migrating events");
             while (rs.next()) {
                 EventVO event = new EventVO();
                 event.setType(rs.getString(1));
@@ -1136,9 +1143,8 @@ public class Upgrade218to22 implements DbUpgrade {
                 event.setParameters(rs.getString(7));
                 convertEvent(event, conn);
             }
-            s_logger.trace("Migrating events completed");
+            s_logger.debug("Migrating events completed");
         } catch (Exception e) {
-            System.out.println("Error: "+e.getMessage());
             throw new CloudRuntimeException("Failed to migrate usage events: ", e);
         }
     }