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/04/09 00:21:50 UTC
[24/43] git commit: Added additional error checking for passing
through the file transfer data.
Added additional error checking for passing through the file transfer data.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4639ab2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4639ab2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4639ab2f
Branch: refs/pull/96/merge
Commit: 4639ab2fa3e1ac5e89ec6fba837297cc20a5ea76
Parents: 2438563
Author: grey <gr...@apigee.com>
Authored: Thu Apr 3 10:59:56 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Apr 3 10:59:56 2014 -0700
----------------------------------------------------------------------
.../usergrid/management/export/ExportJob.java | 6 +++++
.../management/export/ExportServiceImpl.java | 24 +++++++++-----------
.../management/cassandra/ExportServiceIT.java | 4 ++--
3 files changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4639ab2f/stack/services/src/main/java/org/apache/usergrid/management/export/ExportJob.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/export/ExportJob.java b/stack/services/src/main/java/org/apache/usergrid/management/export/ExportJob.java
index 02ab275..46c7284 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/export/ExportJob.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/export/ExportJob.java
@@ -54,12 +54,18 @@ public class ExportJob extends OnlyOnceJob {
return;
}
+ if(jobData.getProperty( "s3Export" ) == null) {
+ logger.error( "S3 interface not correctly set");
+ return;
+ }
+
jobExecution.heartbeat();
try {
exportService.doExport( jobExecution );
}
catch ( Exception e ) {
logger.error( "Export Service failed to complete job" );
+ logger.error(e.getMessage());
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4639ab2f/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
index 18bd130..0ddd39c 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
@@ -79,11 +79,6 @@ public class ExportServiceImpl implements ExportService {
private JsonFactory jsonFactory = new JsonFactory();
- //private S3Export s3Export;
-
- private String defaultAppExportname = "exporters";
-
-
@Override
public UUID schedule( final Map<String, Object> config ) throws Exception {
ApplicationInfo defaultExportApp = null;
@@ -96,7 +91,6 @@ public class ExportServiceImpl implements ExportService {
EntityManager em = null;
try {
- //em = emf.getEntityManager( ( UUID ) config.get( "applicationId" ) );
em = emf.getEntityManager( MANAGEMENT_APPLICATION_ID );
Set<String> collections = em.getApplicationCollections();
if(!collections.contains( "exports" )){
@@ -197,10 +191,10 @@ public class ExportServiceImpl implements ExportService {
@Override
public void doExport( final JobExecution jobExecution ) throws Exception {
Map<String, Object> config = ( Map<String, Object> ) jobExecution.getJobData().getProperty( "exportInfo" );
- S3Export s3Export = ( S3Export )jobExecution.getJobData().getProperty( "s3Export" );
+ S3Export s3Export = null;
-// UUID scopedAppId = ( UUID ) config.get( "applicationId" );
+// UUID scopedAppId = ( UUID ) config.get( "applicationId" );
if ( config == null ) {
logger.error( "Export Information passed through is null" );
return;
@@ -215,6 +209,15 @@ public class ExportServiceImpl implements ExportService {
export.setState( Export.State.STARTED );
em.update( export );
+ try {
+ s3Export = ( S3Export )jobExecution.getJobData().getProperty( "s3Export" );
+ }catch (Exception e){
+ logger.error( "S3Export doesn't exist" );
+ export.setState( Export.State.FAILED );
+ em.update( export );
+ return;
+ }
+
if ( config.get( "organizationId" ) == null ) {
logger.error( "No organization could be found" );
export.setState( Export.State.FAILED );
@@ -547,7 +550,6 @@ public class ExportServiceImpl implements ExportService {
protected JsonGenerator getJsonGenerator( ByteArrayOutputStream out ) throws IOException {
//TODO:shouldn't the below be UTF-16?
- //PrintWriter out = new PrintWriter( outFile, "UTF-8" );
JsonGenerator jg = jsonFactory.createJsonGenerator( out );
jg.setPrettyPrinter( new DefaultPrettyPrinter() );
@@ -645,8 +647,4 @@ public class ExportServiceImpl implements ExportService {
return baos;
}
-
-// @Autowired
-// @Override
-// public void setS3Export( S3Export s3Export ) { this.s3Export = s3Export; }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4639ab2f/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
index f64412d..e7c7b2f 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
@@ -787,8 +787,8 @@ public class ExportServiceIT {
blobStore.deleteContainer( bucketName );
}
- @Ignore
- //@Test
+ //@Ignore
+ @Test
public void testIntegration100EntitiesForAllApps() throws Exception {
S3Export s3Export = new S3ExportImpl();