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/03 23:25:43 UTC
[4/7] git commit: tore out setting export code in schedule command,
and instead made it be a part of the creation of the export process.
tore out setting export code in schedule command, and instead made it be a part of the creation of the export process.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f65c8004
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f65c8004
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f65c8004
Branch: refs/pull/92/head
Commit: f65c800468f88fa41fa736b49c491b6a7b8752a5
Parents: 4639ab2
Author: grey <gr...@apigee.com>
Authored: Thu Apr 3 12:01:20 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Apr 3 12:01:20 2014 -0700
----------------------------------------------------------------------
.../apache/usergrid/management/export/ExportJob.java | 5 -----
.../usergrid/management/export/ExportServiceImpl.java | 13 ++++++++-----
.../src/main/resources/usergrid-services-context.xml | 2 --
3 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f65c8004/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 46c7284..5d6de63 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,11 +54,6 @@ 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 );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f65c8004/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 0ddd39c..a61659e 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
@@ -82,7 +82,6 @@ public class ExportServiceImpl implements ExportService {
@Override
public UUID schedule( final Map<String, Object> config ) throws Exception {
ApplicationInfo defaultExportApp = null;
- S3Export exportTransfer = new S3ExportImpl();
if ( config == null ) {
logger.error( "export information cannot be null" );
@@ -121,7 +120,6 @@ public class ExportServiceImpl implements ExportService {
JobData jobData = new JobData();
jobData.setProperty( "exportInfo", config );
jobData.setProperty( EXPORT_ID, export.getUuid() );
- jobData.setProperty( "s3Export", exportTransfer);
long soonestPossible = System.currentTimeMillis() + 250; //sch grace period
@@ -191,6 +189,7 @@ 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" );
+ Object s3PlaceHolder = jobExecution.getJobData().getProperty( "s3Export" ) ;
S3Export s3Export = null;
@@ -208,16 +207,20 @@ public class ExportServiceImpl implements ExportService {
//update the entity state to show that the job has officially started.
export.setState( Export.State.STARTED );
em.update( export );
-
try {
- s3Export = ( S3Export )jobExecution.getJobData().getProperty( "s3Export" );
+ if(s3PlaceHolder != null) {
+ s3Export = ( S3Export ) s3PlaceHolder;
+ }
+ else
+ s3Export = new S3ExportImpl();
}catch (Exception e){
logger.error( "S3Export doesn't exist" );
+ export.setErrorMessage( e.getMessage() );
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 );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f65c8004/stack/services/src/main/resources/usergrid-services-context.xml
----------------------------------------------------------------------
diff --git a/stack/services/src/main/resources/usergrid-services-context.xml b/stack/services/src/main/resources/usergrid-services-context.xml
index e7e2281..39748e1 100644
--- a/stack/services/src/main/resources/usergrid-services-context.xml
+++ b/stack/services/src/main/resources/usergrid-services-context.xml
@@ -89,6 +89,4 @@
<bean id="exportJob" class="org.apache.usergrid.management.export.ExportJob" />
- <bean id="s3Export" class="org.apache.usergrid.management.export.S3ExportImpl" />
-
</beans>