You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by am...@apache.org on 2013/01/06 23:42:46 UTC
svn commit: r1429606 - in /airavata/trunk/modules:
integration-tests/src/test/java/org/apache/airavata/integration/
registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/
rest/mappings/src/main/java/org/apache/airava...
Author: amilaj
Date: Sun Jan 6 22:42:46 2013
New Revision: 1429606
URL: http://svn.apache.org/viewvc?rev=1429606&view=rev
Log:
Fixing few memory leaks
Modified:
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAResourceAccessor.java
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java
Modified: airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java?rev=1429606&r1=1429605&r2=1429606&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java (original)
+++ airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java Sun Jan 6 22:42:46 2013
@@ -272,7 +272,13 @@ public class BaseCaseIT {
runWorkFlow(workflow, Arrays.asList("echo_output=Airavata Test"));
}
- @Test(groups = { "echoGroup" }, dependsOnMethods = { "testEchoService" })
+ @Test(groups = { "performanceTesting" } )
+ public void testExistsHostDescriptor() throws AiravataAPIInvocationException {
+
+ airavataAPI.getApplicationManager().isHostDescriptorExists("localhost");
+ }
+
+ @Test(groups = { "echoGroup" }/*, dependsOnMethods = { "testEchoService" }*/)
public void testUpdateEchoService() throws AiravataAPIInvocationException, IOException, ComponentException, GraphException {
DescriptorBuilder descriptorBuilder = airavataAPI.getDescriptorBuilder();
@@ -392,7 +398,7 @@ public class BaseCaseIT {
File echoWorkflow = new File(fileName);
if (!echoWorkflow.exists()) {
- fileName = "modules/tomcat-distribution/src/test/resources/EchoWorkflow.xwf";
+ fileName = "modules/integration-tests/src/test/resources/EchoWorkflow.xwf";
}
BufferedReader reader = new BufferedReader(new FileReader(fileName));
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAResourceAccessor.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAResourceAccessor.java?rev=1429606&r1=1429605&r2=1429606&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAResourceAccessor.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAResourceAccessor.java Sun Jan 6 22:42:46 2013
@@ -27,19 +27,14 @@ import org.apache.airavata.registry.api.
public class JPAResourceAccessor {
private AiravataRegistry2 registry=null;
- private GatewayResource gatewayResource;
private ResourceUtils resourceUtils = new ResourceUtils();
- private WorkerResource workerResource;
public JPAResourceAccessor(AiravataRegistry2 registry) {
this.registry=registry;
- gatewayResource = new GatewayResource();
- gatewayResource.setGatewayName(this.registry.getGateway().getGatewayName());
- workerResource = new WorkerResource(registry.getUser().getUserName(), getGateway());
}
public GatewayResource getGateway(){
- gatewayResource = new GatewayResource();
+ GatewayResource gatewayResource = new GatewayResource();
gatewayResource.setGatewayName(this.registry.getGateway().getGatewayName());
return gatewayResource;
}
@@ -49,7 +44,6 @@ public class JPAResourceAccessor {
}
public WorkerResource getWorker(){
- workerResource = new WorkerResource(registry.getUser().getUserName(), getGateway());
- return workerResource;
+ return new WorkerResource(registry.getUser().getUserName(), getGateway());
}
}
Modified: airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java?rev=1429606&r1=1429605&r2=1429606&view=diff
==============================================================================
--- airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java (original)
+++ airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java Sun Jan 6 22:42:46 2013
@@ -38,20 +38,23 @@ import java.util.Map;
public class RegPoolUtils {
+ private final static Object lock = new Object();
+
+
public static AiravataRegistry2 acquireRegistry(ServletContext context) {
AiravataRegistry2 airavataRegistry=null;
String user = WorkflowContext.getRequestUser();
String gatewayId = WorkflowContext.getGatewayId();
Gateway gateway = new Gateway(gatewayId);
AiravataUser airavataUser = new AiravataUser(user);
-
- RegistryInstancesPool registryInstancesPool =
+ /*RegistryInstancesPool registryInstancesPool =
(RegistryInstancesPool) context.getAttribute(RestServicesConstants.AIRAVATA_REGISTRY_POOL);
Map<RegIdentifier,AiravataRegistry2> registryMap = registryInstancesPool.getRegistryInstancesList();
- boolean foundReg=false;
+ boolean foundReg=false;*/
try{
- while(!foundReg){
- synchronized (registryMap){
+ return AiravataRegistryFactory.getRegistry(gateway, airavataUser);
+ /*while(!foundReg){
+ synchronized (lock){
RegIdentifier identifier = new RegIdentifier(user, gateway.getGatewayName());
if (registryMap.size()==0){
registryMap.put(identifier,
@@ -67,7 +70,7 @@ public class RegPoolUtils {
registryMap.remove(identifier);
foundReg=true;
}
- }
+ }*/
}catch (RegistryAccessorInvalidException e) {
e.printStackTrace();
} catch (RegistryAccessorInstantiateException e) {
@@ -83,16 +86,16 @@ public class RegPoolUtils {
}
public static void releaseRegistry(ServletContext context, AiravataRegistry2 airavataRegistry) {
- RegistryInstancesPool registryInstancesPool =
+ /*RegistryInstancesPool registryInstancesPool =
(RegistryInstancesPool)context.getAttribute(RestServicesConstants.AIRAVATA_REGISTRY_POOL);
Map<RegIdentifier, AiravataRegistry2> registryInstancesList =
registryInstancesPool.getRegistryInstancesList();
- synchronized (registryInstancesList){
+ synchronized (lock){
RegIdentifier regIdentifier =
new RegIdentifier(airavataRegistry.getUser().getUserName(),
airavataRegistry.getGateway().getGatewayName());
registryInstancesList.put(regIdentifier, airavataRegistry);
- }
+ } */
}
}