airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject [3/3] airavata git commit: Remove previous changes to task state and added to process states
Date Wed, 24 Jun 2015 16:25:51 GMT
Remove previous changes to task state and added to process states


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

Branch: refs/heads/master
Commit: adab9dda6961787a889e7f4e5622241a85ff683f
Parents: 79d0135
Author: Shameera Rathanyaka <shameerainfo@gmail.com>
Authored: Wed Jun 24 12:25:39 2015 -0400
Committer: Shameera Rathanyaka <shameerainfo@gmail.com>
Committed: Wed Jun 24 12:25:39 2015 -0400

----------------------------------------------------------------------
 .../airavata/model/status/ProcessState.java     | 36 +++++++++++++++-----
 .../apache/airavata/model/status/TaskState.java | 32 ++++-------------
 .../airavata-api/status_models.thrift           | 12 +++----
 3 files changed, 40 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/adab9dda/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessState.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessState.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessState.java
index 05a7d82..79e856d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessState.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessState.java
@@ -31,11 +31,17 @@ import org.apache.thrift.TEnum;
 public enum ProcessState implements org.apache.thrift.TEnum {
   CREATED(0),
   VALIDATED(1),
-  EXECUTING(2),
-  COMPLETED(3),
-  FAILED(4),
-  CANCELLING(5),
-  CANCELED(6);
+  PRE_PROCESSING(2),
+  CONFIGURING_WORKSPACE(3),
+  INPUT_DATA_STAGING(4),
+  EXECUTING(5),
+  MONITORING(6),
+  OUTPUT_DATA_STAGING(7),
+  POST_PROCESSING(8),
+  COMPLETED(9),
+  FAILED(10),
+  CANCELLING(11),
+  CANCELED(12);
 
   private final int value;
 
@@ -61,14 +67,26 @@ public enum ProcessState implements org.apache.thrift.TEnum {
       case 1:
         return VALIDATED;
       case 2:
-        return EXECUTING;
+        return PRE_PROCESSING;
       case 3:
-        return COMPLETED;
+        return CONFIGURING_WORKSPACE;
       case 4:
-        return FAILED;
+        return INPUT_DATA_STAGING;
       case 5:
-        return CANCELLING;
+        return EXECUTING;
       case 6:
+        return MONITORING;
+      case 7:
+        return OUTPUT_DATA_STAGING;
+      case 8:
+        return POST_PROCESSING;
+      case 9:
+        return COMPLETED;
+      case 10:
+        return FAILED;
+      case 11:
+        return CANCELLING;
+      case 12:
         return CANCELED;
       default:
         return null;

http://git-wip-us.apache.org/repos/asf/airavata/blob/adab9dda/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 15734c7..8a63c47 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,16 +30,10 @@ import org.apache.thrift.TEnum;
 
 public enum TaskState implements org.apache.thrift.TEnum {
   CREATED(0),
-  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);
+  EXECUTING(1),
+  COMPLETED(2),
+  FAILED(3),
+  CANCELED(4);
 
   private final int value;
 
@@ -63,24 +57,12 @@ public enum TaskState implements org.apache.thrift.TEnum {
       case 0:
         return CREATED;
       case 1:
-        return PRE_PROCESSING;
-      case 2:
-        return CONFIGURING_WORKSPACE;
-      case 3:
-        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:
+      case 2:
         return COMPLETED;
-      case 9:
+      case 3:
         return FAILED;
-      case 10:
+      case 4:
         return CANCELED;
       default:
         return null;

http://git-wip-us.apache.org/repos/asf/airavata/blob/adab9dda/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 e7718da..47c9b6b 100644
--- a/thrift-interface-descriptions/airavata-api/status_models.thrift
+++ b/thrift-interface-descriptions/airavata-api/status_models.thrift
@@ -37,13 +37,7 @@ enum ExperimentState {
 
 enum TaskState {
     CREATED,
-    PRE_PROCESSING,
-    CONFIGURING_WORKSPACE,
-    INPUT_DATA_STAGING,
     EXECUTING,
-    MONITORING,
-    OUTPUT_DATA_STAGING,
-    POST_PROCESSING,
     COMPLETED,
     FAILED,
     CANCELED
@@ -52,7 +46,13 @@ enum TaskState {
 enum ProcessState {
     CREATED,
     VALIDATED,
+    PRE_PROCESSING,
+    CONFIGURING_WORKSPACE,
+    INPUT_DATA_STAGING,
     EXECUTING,
+    MONITORING,
+    OUTPUT_DATA_STAGING,
+    POST_PROCESSING,
     COMPLETED,
     FAILED,
     CANCELLING,


Mime
View raw message