github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-19 02:10:54 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-1184. Sqoop2: Improve error messages during metadata upgrade

Browse Source 
(Jarek Jarcec Cecho via Hari Shreedharan)
This commit is contained in:
Hari Shreedharan 2013-08-28 14:52:39 -07:00
parent 93270b804d
commit f343133db3
1 changed files with 24 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
core/src/main/java/org/apache/sqoop/repository/Repository.java
View File

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