airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [45/51] [abbrv] airavata git commit: validation removed when auto scheduling set
Date Tue, 03 Nov 2015 19:48:10 GMT
validation removed when auto scheduling set


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6fc864eb
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6fc864eb
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6fc864eb

Branch: refs/heads/master
Commit: 6fc864eb9a30c2ca15333d1fc90c2d364f6bf58e
Parents: b001b18
Author: Chathuri Wimalasena <chathuri@apache.org>
Authored: Fri Oct 30 15:47:49 2015 -0400
Committer: Chathuri Wimalasena <chathuri@apache.org>
Committed: Fri Oct 30 15:47:49 2015 -0400

----------------------------------------------------------------------
 .../core/validator/impl/BatchQueueValidator.java          | 10 +++-------
 .../catalog/resources/AbstractExpCatResource.java         |  2 +-
 .../core/experiment/catalog/resources/JobResource.java    |  2 +-
 .../experiment/catalog/resources/JobStatusResource.java   |  9 ---------
 4 files changed, 5 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/6fc864eb/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java
b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java
index 231118c..18420db 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java
@@ -39,16 +39,12 @@ import java.util.List;
 public class BatchQueueValidator implements JobMetadataValidator {
     private final static Logger logger = LoggerFactory.getLogger(BatchQueueValidator.class);
 
-    private ExperimentCatalog experimentCatalog;
     private AppCatalog appCatalog;
 
     public BatchQueueValidator() {
         try {
-            this.experimentCatalog = RegistryFactory.getDefaultExpCatalog();
             this.appCatalog = RegistryFactory.getAppCatalog();
-        } catch (RegistryException e) {
-            logger.error("Unable to initialize experimentCatalog", e);
-        } catch (AppCatalogException e) {
+        }  catch (AppCatalogException e) {
             logger.error("Unable to initialize Application Catalog", e);
         }
     }
@@ -77,9 +73,9 @@ public class BatchQueueValidator implements JobMetadataValidator {
             UserConfigurationDataModel userConfigurationData = experiment.getUserConfigurationData();
             ComputationalResourceSchedulingModel computationalResourceScheduling = userConfigurationData.getComputationalResourceScheduling();
             if (userConfigurationData.isAiravataAutoSchedule()) {
-                logger.error("Auto-Schedule is not yet supported. Experiment will proceed
with provided scheduling information");
+                logger.info("User enabled Auto-Schedule. Hence we don't do validation..");
                 ValidatorResult validatorResult = new ValidatorResult();
-                validatorResult.setResult(false);
+                validatorResult.setResult(true);
                 validatorResultList.add(validatorResult);
             }
             ComputeResourceDescription computeResource;

http://git-wip-us.apache.org/repos/asf/airavata/blob/6fc864eb/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/AbstractExpCatResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/AbstractExpCatResource.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/AbstractExpCatResource.java
index 5135a9f..41c6bab 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/AbstractExpCatResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/AbstractExpCatResource.java
@@ -228,7 +228,7 @@ public abstract class AbstractExpCatResource implements ExperimentCatResource
{
     public final class JobStatusConstants {
         public static final String STATUS_ID = "statusId";
         public static final String JOB_ID = "jobId";
-        public static final String PROCESS_ID = "processId";
+        public static final String TASK_ID = "taskId";
         public static final String STATE = "state";
         public static final String TIME_OF_STATE_CHANGE = "timeOfStateChange";
         public static final String REASON = "reason";

http://git-wip-us.apache.org/repos/asf/airavata/blob/6fc864eb/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java
index 8855370..882b5b9 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java
@@ -252,7 +252,7 @@ public class JobResource extends AbstractExpCatResource {
                 case JOB_STATUS:
                     generator = new QueryGenerator(JOB_STATUS);
                     generator.setParameter(JobStatusConstants.JOB_ID, jobId);
-                    generator.setParameter(JobStatusConstants.PROCESS_ID, processId);
+                    generator.setParameter(JobStatusConstants.TASK_ID, taskId);
                     q = generator.selectQuery(em);
                     results = q.getResultList();
                     if (results.size() != 0) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/6fc864eb/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobStatusResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobStatusResource.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobStatusResource.java
index 4cff41e..c8e76ec 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobStatusResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobStatusResource.java
@@ -38,7 +38,6 @@ public class JobStatusResource extends AbstractExpCatResource {
     private static final Logger logger = LoggerFactory.getLogger(JobStatusResource.class);
     private String statusId;
     private String jobId;
-    private String processId;
     private String taskId;
     private String state;
     private Timestamp timeOfStateChange;
@@ -60,14 +59,6 @@ public class JobStatusResource extends AbstractExpCatResource {
         this.jobId = jobId;
     }
 
-    public String getProcessId() {
-        return processId;
-    }
-
-    public void setProcessId(String processId) {
-        this.processId = processId;
-    }
-
     public String getState() {
         return state;
     }


Mime
View raw message