airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject [1/3] airavata git commit: Added new task states to identify task life cycle, this will help to decide recovery status
Date Wed, 24 Jun 2015 16:25:49 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 4b899ba84 -> adab9dda6


http://git-wip-us.apache.org/repos/asf/airavata/blob/79d01354/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
index 712bc61..73cdac6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
  *   User friendly reason on how the state is inferred.
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
 public class ExperimentStatus implements org.apache.thrift.TBase<ExperimentStatus, ExperimentStatus._Fields>,
java.io.Serializable, Cloneable, Comparable<ExperimentStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/79d01354/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
index a333e52..9691fc4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
 public class JobStatus implements org.apache.thrift.TBase<JobStatus, JobStatus._Fields>,
java.io.Serializable, Cloneable, Comparable<JobStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/79d01354/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
index aee590d..1eca4f1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
 public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, ProcessStatus._Fields>,
java.io.Serializable, Cloneable, Comparable<ProcessStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/79d01354/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskState.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskState.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskState.java
index 8a63c47..15734c7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskState.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskState.java
@@ -30,10 +30,16 @@ import org.apache.thrift.TEnum;
 
 public enum TaskState implements org.apache.thrift.TEnum {
   CREATED(0),
-  EXECUTING(1),
-  COMPLETED(2),
-  FAILED(3),
-  CANCELED(4);
+  PRE_PROCESSING(1),
+  CONFIGURING_WORKSPACE(2),
+  INPUT_DATA_STAGING(3),
+  EXECUTING(4),
+  MONITORING(5),
+  OUTPUT_DATA_STAGING(6),
+  POST_PROCESSING(7),
+  COMPLETED(8),
+  FAILED(9),
+  CANCELED(10);
 
   private final int value;
 
@@ -57,12 +63,24 @@ public enum TaskState implements org.apache.thrift.TEnum {
       case 0:
         return CREATED;
       case 1:
-        return EXECUTING;
+        return PRE_PROCESSING;
       case 2:
-        return COMPLETED;
+        return CONFIGURING_WORKSPACE;
       case 3:
-        return FAILED;
+        return INPUT_DATA_STAGING;
       case 4:
+        return EXECUTING;
+      case 5:
+        return MONITORING;
+      case 6:
+        return OUTPUT_DATA_STAGING;
+      case 7:
+        return POST_PROCESSING;
+      case 8:
+        return COMPLETED;
+      case 9:
+        return FAILED;
+      case 10:
         return CANCELED;
       default:
         return null;

http://git-wip-us.apache.org/repos/asf/airavata/blob/79d01354/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
index 8c933c2..1418ed9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
 public class TaskStatus implements org.apache.thrift.TBase<TaskStatus, TaskStatus._Fields>,
java.io.Serializable, Cloneable, Comparable<TaskStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/79d01354/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
index 8004e76..61797a2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
  *   A friendly description of the task, usally used to communicate information to users.
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
 public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStagingTaskModel,
DataStagingTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataStagingTaskModel>
{
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStagingTaskModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/79d01354/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
index 563da06..a080b43 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
  * taskInternalStore:
  *   A generic byte object for the Task developer to store internal serialized data into
registry catalogs.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
 public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._Fields>,
java.io.Serializable, Cloneable, Comparable<TaskModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/79d01354/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
index fd6c631..376b423 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
 public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields>,
java.io.Serializable, Cloneable, Comparable<Gateway> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Gateway");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/79d01354/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
index 39a08be..3d08a67 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
 public class Group implements org.apache.thrift.TBase<Group, Group._Fields>, java.io.Serializable,
Cloneable, Comparable<Group> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Group");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/79d01354/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
index fa52def..9b036ce 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
 public class Project implements org.apache.thrift.TBase<Project, Project._Fields>,
java.io.Serializable, Cloneable, Comparable<Project> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Project");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/79d01354/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
index 4fdd074..561e5fd 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
 public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable,
Cloneable, Comparable<User> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/79d01354/thrift-interface-descriptions/airavata-api/status_models.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/status_models.thrift b/thrift-interface-descriptions/airavata-api/status_models.thrift
index d361f95..e7718da 100644
--- a/thrift-interface-descriptions/airavata-api/status_models.thrift
+++ b/thrift-interface-descriptions/airavata-api/status_models.thrift
@@ -37,7 +37,13 @@ enum ExperimentState {
 
 enum TaskState {
     CREATED,
+    PRE_PROCESSING,
+    CONFIGURING_WORKSPACE,
+    INPUT_DATA_STAGING,
     EXECUTING,
+    MONITORING,
+    OUTPUT_DATA_STAGING,
+    POST_PROCESSING,
     COMPLETED,
     FAILED,
     CANCELED


Mime
View raw message