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:55 UTC
[29/43] git commit: Added fix for ephemeral file having the same
names.
Added fix for ephemeral file having the same names.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9aeb66b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9aeb66b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9aeb66b0
Branch: refs/pull/96/merge
Commit: 9aeb66b0540e38e78a8db966bf3e8df9fe602f78
Parents: 8a05f61
Author: grey <gr...@apigee.com>
Authored: Mon Apr 7 10:46:27 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Apr 7 10:46:27 2014 -0700
----------------------------------------------------------------------
.../apache/usergrid/management/export/ExportServiceImpl.java | 8 ++++----
.../org/apache/usergrid/management/export/S3ExportImpl.java | 1 +
.../usergrid/management/cassandra/MockS3ExportImpl.java | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9aeb66b0/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 bbbe414..61a416d 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
@@ -325,7 +325,6 @@ public class ExportServiceImpl implements ExportService {
private void exportApplicationsFromOrg( UUID organizationUUID, final Map<String, Object> config,
final JobExecution jobExecution, S3Export s3Export ) throws Exception {
- //TODO: move extranous code out of these methods and make each one more distinct.
//retrieves export entity
Export export = getExportEntity( jobExecution );
String appFileName = null;
@@ -352,8 +351,7 @@ public class ExportServiceImpl implements ExportService {
S3Export s3Export ) {
try {
s3Export.copyToS3( ephemeral, config, appFileName );
- if(ephemeral.exists())
- ephemeral.delete();
+
}
catch ( Exception e ) {
export.setErrorMessage( e.getMessage() );
@@ -567,7 +565,7 @@ public class ExportServiceImpl implements ExportService {
EntityManager em = emf.getEntityManager( applicationUUID );
Map<String, Object> metadata = em.getApplicationCollectionMetadata();
long starting_time = System.currentTimeMillis();
- File ephemeral = new File( "tempExport" + starting_time );
+ File ephemeral = new File( "tempExport" + UUID.randomUUID() );
JsonGenerator jg = getJsonGenerator( ephemeral );
@@ -611,10 +609,12 @@ public class ExportServiceImpl implements ExportService {
jg.writeObject( entity );
saveCollectionMembers( jg, em, ( String ) config.get( "collectionName" ), entity );
jg.writeEndObject();
+ jg.flush();
}
}
}
jg.writeEndArray();
+ jg.flush();
jg.close();
return ephemeral;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9aeb66b0/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
index 4399ad7..24130db 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
@@ -99,6 +99,7 @@ public class S3ExportImpl implements S3Export {
logger.info( "Uploaded file etag=" + futureETag.get() );
+ ephemeral.delete();
}
catch ( Exception e ) {
logger.error( "Error uploading to blob store", e );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9aeb66b0/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java
index 56e80b0..e765aea 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java
@@ -42,6 +42,7 @@ public class MockS3ExportImpl implements S3Export {
File verfiedData = new File( this.filename );
try {
FileUtils.copyFile(ephemeral,verfiedData);
+ ephemeral.delete();
}
catch ( IOException e ) {
e.printStackTrace();