From f343133db38ec75afc28a0afa21522bfb41c822b Mon Sep 17 00:00:00 2001
From: Hari Shreedharan <hshreedharan@apache.org>
Date: Wed, 28 Aug 2013 14:52:39 -0700
Subject: [PATCH] SQOOP-1184. Sqoop2: Improve error messages during metadata
 upgrade

(Jarek Jarcec Cecho via Hari Shreedharan)
---
 .../apache/sqoop/repository/Repository.java   | 74 ++++++-------------
 1 file changed, 24 insertions(+), 50 deletions(-)

diff --git a/core/src/main/java/org/apache/sqoop/repository/Repository.java b/core/src/main/java/org/apache/sqoop/repository/Repository.java
index a7ccf10d..8bf0d406 100644
--- a/core/src/main/java/org/apache/sqoop/repository/Repository.java
+++ b/core/src/main/java/org/apache/sqoop/repository/Repository.java
@@ -31,6 +31,7 @@
 import org.apache.sqoop.model.MFramework;
 import org.apache.sqoop.model.MJob;
 import org.apache.sqoop.model.MJobForms;
+import org.apache.sqoop.model.MPersistableEntity;
 import org.apache.sqoop.model.MSubmission;
 import org.apache.sqoop.utils.ClassUtils;
 import org.apache.sqoop.validation.Validation;
@@ -39,6 +40,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -401,9 +403,7 @@ public final void upgradeConnector(MConnector oldConnector, MConnector newConnec
 
       Validator validator = connector.getValidator();
 
-      // lists to buffer invalid connections and jobs
-      List<MConnection> invalidConnections = new ArrayList<MConnection>();
-      List<MJob> invalidJobs = new ArrayList<MJob>();
+      boolean upgradeSuccessful = true;
 
       MetadataUpgrader upgrader = connector.getMetadataUpgrader();
       List<MConnection> connections = findConnectionsForConnector(
@@ -434,7 +434,8 @@ public final void upgradeConnector(MConnector oldConnector, MConnector newConnec
         if (validation.getStatus().canProceed()) {
           updateConnection(newConnection, tx);
         } else {
-          invalidConnections.add(newConnection);
+          logInvalidModelObject("connection", newConnection, validation);
+          upgradeSuccessful = false;
         }
       }
       for (MJob job : jobs) {
@@ -456,32 +457,15 @@ public final void upgradeConnector(MConnector oldConnector, MConnector newConnec
         if (validation.getStatus().canProceed()) {
           updateJob(newJob, tx);
         } else {
-          invalidJobs.add(newJob);
+          logInvalidModelObject("job", newJob, validation);
+          upgradeSuccessful = false;
         }
       }
 
-      if (invalidConnections.size() == 0 && invalidJobs.size() == 0) {
+      if (upgradeSuccessful) {
         tx.commit();
       } else {
-        String msg = "Metadata upgrade for connector failed because of invalid Connections or Jobs.\n";
-
-        if (invalidConnections.size() > 0) {
-          msg += "Connections: ";
-          for (MConnection connection : invalidConnections) {
-            msg += connection.getPersistenceId() + ", ";
-          }
-          msg += "\n";
-        }
-
-        if (invalidJobs.size() > 0) {
-          msg += "Jobs: ";
-          for (MJob job : invalidJobs) {
-            msg += job.getPersistenceId() + ", ";
-          }
-          msg += "\n";
-        }
-
-        throw new SqoopException(RepositoryError.JDBCREPO_0027, msg);
+        throw new SqoopException(RepositoryError.JDBCREPO_0027);
       }
     } catch (SqoopException ex) {
       if(tx != null) {
@@ -512,9 +496,7 @@ public final void upgradeFramework(MFramework framework) {
 
       Validator validator = FrameworkManager.getInstance().getValidator();
 
-      // lists to buffer invalid connections and jobs
-      List<MConnection> invalidConnections = new ArrayList<MConnection>();
-      List<MJob> invalidJobs = new ArrayList<MJob>();
+      boolean upgradeSuccessful = true;
 
       // -- BEGIN TXN --
       tx = getTransaction();
@@ -541,7 +523,8 @@ public final void upgradeFramework(MFramework framework) {
         if (validation.getStatus().canProceed()) {
           updateConnection(newConnection, tx);
         } else {
-          invalidConnections.add(newConnection);
+          logInvalidModelObject("connection", newConnection, validation);
+          upgradeSuccessful = false;
         }
       }
       for (MJob job : jobs) {
@@ -563,32 +546,15 @@ public final void upgradeFramework(MFramework framework) {
         if (validation.getStatus().canProceed()) {
           updateJob(newJob, tx);
         } else {
-          invalidJobs.add(newJob);
+          logInvalidModelObject("job", newJob, validation);
+          upgradeSuccessful = false;
         }
       }
 
-      if (invalidConnections.size() == 0 && invalidJobs.size() == 0) {
+      if (upgradeSuccessful) {
         tx.commit();
       } else {
-        String msg = "Metadata upgrade for job failed because of invalid Connections or Jobs.\n";
-
-        if (invalidConnections.size() > 0) {
-          msg += "Connections: ";
-          for (MConnection connection : invalidConnections) {
-            msg += connection.getPersistenceId() + ", ";
-          }
-          msg += "\n";
-        }
-
-        if (invalidJobs.size() > 0) {
-          msg += "Jobs: ";
-          for (MJob job : invalidJobs) {
-            msg += job.getPersistenceId() + ", ";
-          }
-          msg += "\n";
-        }
-
-        throw new SqoopException(RepositoryError.JDBCREPO_0027, msg);
+        throw new SqoopException(RepositoryError.JDBCREPO_0027);
       }
     } catch (SqoopException ex) {
       if(tx != null) {
@@ -607,4 +573,12 @@ public final void upgradeFramework(MFramework framework) {
       LOG.info("Framework metadata upgrade finished");
     }
   }
+
+  private void logInvalidModelObject(String objectType, MPersistableEntity entity, Validation validation) {
+    LOG.error("Upgrader created invalid " + objectType + " with id" + entity.getPersistenceId());
+
+    for(Map.Entry<Validation.FormInput, Validation.Message> entry : validation.getMessages().entrySet()) {
+      LOG.error("\t" + entry.getKey() + ": " + entry.getValue());
+    }
+  }
 }