You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/08/22 16:16:12 UTC
[76/95] [abbrv] git commit: trying to fix file status bug
trying to fix file status bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/34160501
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/34160501
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/34160501
Branch: refs/heads/import-feature
Commit: 34160501c67fcea8e66bea9685b143c6fcd723c8
Parents: 6b089c2
Author: Pooja Jain <pj...@apigee.com>
Authored: Mon Aug 4 13:37:00 2014 -0700
Committer: Pooja Jain <pj...@apigee.com>
Committed: Mon Aug 4 13:37:00 2014 -0700
----------------------------------------------------------------------
.../management/importUG/FileImportJob.java | 18 +++-----
.../usergrid/management/importUG/ImportJob.java | 16 +++----
.../management/importUG/ImportServiceImpl.java | 46 +++++++++-----------
3 files changed, 34 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/34160501/stack/services/src/main/java/org/apache/usergrid/management/importUG/FileImportJob.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importUG/FileImportJob.java b/stack/services/src/main/java/org/apache/usergrid/management/importUG/FileImportJob.java
index 9a6bf56..b03b0ae 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importUG/FileImportJob.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importUG/FileImportJob.java
@@ -66,16 +66,14 @@ public class FileImportJob extends OnlyOnceJob {
}
jobExecution.heartbeat();
- try {
+ //try {
importService.FileParser( jobExecution );
- }
- catch ( Exception e ) {
- logger.error( " Import Service failed to complete file import job" );
- logger.error(e.getMessage());
- throw e;
- }
-
- logger.info( "executed FileImportJob process completed" );
+ //}
+// catch ( Exception e ) {
+// logger.error( " Import Service failed to complete file import job" );
+// logger.error(e.getMessage());
+// throw e;
+// }
}
@Override
@@ -105,7 +103,5 @@ public class FileImportJob extends OnlyOnceJob {
Import importUG = rootEm.get(importId, Import.class);
importUG.setState(Import.State.FAILED);
rootEm.update(importUG);
-
- //To change body of implemented methods use File | Settings | File Templates.
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/34160501/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java b/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java
index 3b1a0f2..6a9a999 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportJob.java
@@ -60,16 +60,14 @@ public class ImportJob extends OnlyOnceJob {
}
jobExecution.heartbeat();
- try {
+ //try {
importService.doImport( jobExecution );
- }
- catch ( Exception e ) {
- logger.error( "Import Service failed to complete job" );
- logger.error(e.getMessage());
- throw e;
- }
-
- logger.info( "executed ImportJob process completed" );
+ //}
+// catch ( Exception e ) {
+// logger.error("Import Service failed to complete job");
+// logger.error(e.getMessage());
+// throw e;
+// }
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/34160501/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java
index 78c47c6..edaaf5a 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java
@@ -163,8 +163,7 @@ public class ImportServiceImpl implements ImportService {
Import importUG = em.get(importRef,Import.class);
try {
- ConnectionRef test = em.createConnection(importUG,"includes",fileImport);
- System.out.println();
+ em.createConnection(importUG,"includes",fileImport);
}
catch ( Exception e ) {
logger.error(e.getMessage());
@@ -335,7 +334,7 @@ public class ImportServiceImpl implements ImportService {
return;
}
- try {
+// try {
if (config.get("organizationId") == null) {
logger.error("No organization could be found");
@@ -378,18 +377,15 @@ public class ImportServiceImpl implements ImportService {
fileMetadata.put("files", value);
importUG.addProperties(fileMetadata);
em.update(importUG);
-
- Results results = em.getConnectedEntities(importUG.getUuid(),"includes",null, Results.Level.ALL_PROPERTIES);
- System.out.println();
}
return;
- }
- catch (Exception e) {
- // the case where job will be retried i.e. resumed from the failed point
- importUG.setErrorMessage(e.getMessage());
- em.update(importUG);
- throw e;
- }
+// }
+// catch (Exception e) {
+// // the case where job will be retried i.e. resumed from the failed point
+// importUG.setErrorMessage(e.getMessage());
+// em.update(importUG);
+// throw e;
+// }
}
/**
@@ -398,7 +394,7 @@ public class ImportServiceImpl implements ImportService {
private void importCollectionFromOrgApp( UUID applicationUUID, final Map<String, Object> config,
final JobExecution jobExecution, S3Import s3Import ) throws Exception {
- //retrieves export entity
+ //retrieves import entity
Import importUG = getImportEntity(jobExecution);
ApplicationInfo application = managementService.getApplicationInfo(applicationUUID);
@@ -520,8 +516,6 @@ public class ImportServiceImpl implements ImportService {
File file = new File(jobExecution.getJobData().getProperty("File").toString());
- logger.error(file.getName());
-
EntityManager rootEm = emf.getEntityManager(MANAGEMENT_APPLICATION_ID);
rootEm.update(fileImport);
@@ -538,8 +532,6 @@ public class ImportServiceImpl implements ImportService {
ApplicationInfo application = managementService.getApplicationInfo(applicationName);
-
-
JsonParser jp = getJsonParserForFile(file);
String lastUpdatedUUID = fileImport.getLastUpdatedUUID();
@@ -567,6 +559,8 @@ public class ImportServiceImpl implements ImportService {
while (jp.nextToken() != JsonToken.END_ARRAY) {
importEntityStuff(jp, em, rootEm, fileImport);
}
+ //one file completed
+ //TODO: update last updated UUID
jp.close();
}
catch (OrganizationNotFoundException e) {
@@ -581,13 +575,13 @@ public class ImportServiceImpl implements ImportService {
em.update(fileImport);
return;
}
- catch (Exception e) {
- // the case where job will be retried i.e. resumed from the failed point
- fileImport.setErrorMessage(e.getMessage());
- em.update(fileImport);
- //TODO : check this.
- throw e;
- }
+// catch (Exception e) {
+// // the case where job will be retried i.e. resumed from the failed point
+// fileImport.setErrorMessage(e.getMessage());
+// em.update(fileImport);
+// //TODO : check this.
+// throw e;
+// }
if(!fileImport.getState().equals("FAILED")) {
// mark file as completed
@@ -737,7 +731,7 @@ public class ImportServiceImpl implements ImportService {
rootEm.update(fileImport);
}
catch (Exception e) {
- // skip illegal entity UUID and go to next one
+ // skip illegal entity and go to next one
fileImport.setErrorMessage(e.getMessage());
rootEm.update(fileImport);
}