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/03/20 01:20:43 UTC
[1/3] git commit: Removed thread waiting in favor of the get state
command.
Repository: incubator-usergrid
Updated Branches:
refs/pull/76/head a1b6124cc -> 79dc2c540
refs/pull/76/merge 81ecfec85 -> 9f6c84739 (forced update)
Removed thread waiting in favor of the get state command.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/79dc2c54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/79dc2c54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/79dc2c54
Branch: refs/pull/76/head
Commit: 79dc2c5402c3f2cc8e6f48fd5ad5c93695492dea
Parents: a1b6124
Author: grey <gr...@apigee.com>
Authored: Wed Mar 19 16:33:55 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Wed Mar 19 16:33:55 2014 -0700
----------------------------------------------------------------------
.../apache/usergrid/management/cassandra/ManagementServiceIT.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79dc2c54/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
index 310d46a..44e0277 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
@@ -1517,7 +1517,7 @@ public class ManagementServiceIT {
when( jobExecution.getJobData() ).thenReturn( jobData );
exportService.doExport( jobExecution );
- Thread.sleep(1000);
+ while (!exportService.getState( applicationId,exportUUID ).equals("FINISHED"));
AWSCredentials myCredentials = new BasicAWSCredentials(
System.getProperty( "accessKey" ), System.getProperty("secretKey"));
@@ -1592,6 +1592,7 @@ public class ManagementServiceIT {
when( jobExecution.getJobData() ).thenReturn( jobData );
exportService.doExport( jobExecution );
+ while (!exportService.getState( applicationId,exportUUID ).equals("FINISHED"));
AWSCredentials myCredentials = new BasicAWSCredentials(
System.getProperty( "accessKey" ), System.getProperty("secretKey"));
[2/3] git commit: Removed thread waiting in favor of the get state
command.
Posted by sn...@apache.org.
Removed thread waiting in favor of the get state command.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/79dc2c54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/79dc2c54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/79dc2c54
Branch: refs/pull/76/merge
Commit: 79dc2c5402c3f2cc8e6f48fd5ad5c93695492dea
Parents: a1b6124
Author: grey <gr...@apigee.com>
Authored: Wed Mar 19 16:33:55 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Wed Mar 19 16:33:55 2014 -0700
----------------------------------------------------------------------
.../apache/usergrid/management/cassandra/ManagementServiceIT.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79dc2c54/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
index 310d46a..44e0277 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
@@ -1517,7 +1517,7 @@ public class ManagementServiceIT {
when( jobExecution.getJobData() ).thenReturn( jobData );
exportService.doExport( jobExecution );
- Thread.sleep(1000);
+ while (!exportService.getState( applicationId,exportUUID ).equals("FINISHED"));
AWSCredentials myCredentials = new BasicAWSCredentials(
System.getProperty( "accessKey" ), System.getProperty("secretKey"));
@@ -1592,6 +1592,7 @@ public class ManagementServiceIT {
when( jobExecution.getJobData() ).thenReturn( jobData );
exportService.doExport( jobExecution );
+ while (!exportService.getState( applicationId,exportUUID ).equals("FINISHED"));
AWSCredentials myCredentials = new BasicAWSCredentials(
System.getProperty( "accessKey" ), System.getProperty("secretKey"));
[3/3] git commit: Merge 79dc2c5402c3f2cc8e6f48fd5ad5c93695492dea into
24425d5e61fabb08e632fcfbdfbb423b7ff6acaa
Posted by sn...@apache.org.
Merge 79dc2c5402c3f2cc8e6f48fd5ad5c93695492dea into 24425d5e61fabb08e632fcfbdfbb423b7ff6acaa
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9f6c8473
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9f6c8473
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9f6c8473
Branch: refs/pull/76/merge
Commit: 9f6c8473911959a3db81630dcd0884be05ba1520
Parents: 24425d5 79dc2c5
Author: GERey <gr...@apigee.com>
Authored: Wed Mar 19 23:33:56 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Wed Mar 19 23:33:56 2014 +0000
----------------------------------------------------------------------
.../applications/ApplicationResource.java | 1 -
stack/services/pom.xml | 16 ++
.../management/export/ExportServiceImpl.java | 59 +----
.../management/export/S3ExportImpl.java | 10 +-
.../cassandra/ManagementServiceIT.java | 244 ++++++++++++++++---
.../management/cassandra/MockS3ExportImpl.java | 1 -
6 files changed, 246 insertions(+), 85 deletions(-)
----------------------------------------------------------------------