You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/01/06 15:19:30 UTC
[1/2] airavata-php-gateway git commit: AIRAVATA-1887 Ordering tasks
by taskDag
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop a5f317f02 -> 84c359279
AIRAVATA-1887 Ordering tasks by taskDag
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/a7249ed3
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/a7249ed3
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/a7249ed3
Branch: refs/heads/develop
Commit: a7249ed3d6911cfd28efefd8e7c3a52291d7c37f
Parents: a5f317f
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Jan 5 13:16:42 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Jan 6 10:18:44 2017 -0500
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a7249ed3/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 90193ae..cdbb6c8 100755
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -234,7 +234,19 @@ class ExperimentUtilities
{
try {
- return Airavata::getDetailedExperimentTree(Session::get('authz-token'), $expId);
+ $detailed_experiment = Airavata::getDetailedExperimentTree(Session::get('authz-token'), $expId);
+ Log::debug("detailed exp", array($detailed_experiment));
+ foreach ($detailed_experiment->processes as $index => $process) {
+ usort($process->tasks, ExperimentUtilities::sortTasksByTaskDagOrder($process->taskDag));
+ Log::debug("process", array($process, $process->taskDag));
+ Log::debug("task list", array($process, $process->tasks));
+ foreach ($process->tasks as $task) {
+ Log::debug("task", array("taskId" => $task->taskId,
+ "creationTime" => $task->creationTime, "lastUpdateTime" => $task->lastUpdateTime, "status" => $task->taskStatuses));
+ // TODO: sort taskStatuses by time and output them
+ }
+ }
+ return $detailed_experiment;
} catch (InvalidRequestException $ire) {
CommonUtilities::print_error_message('<p>There was a problem getting the experiment.
Please try again later or submit a bug report using the link in the Help menu.</p>' .
@@ -263,6 +275,18 @@ class ExperimentUtilities
}
+ private static function sortTasksByTaskDagOrder($taskDag)
+ {
+ $taskDagArray = preg_split("/,/", $taskDag);
+ Log::debug("taskDagArray", array($taskDagArray));
+ return function($task1, $task2) use ($taskDagArray) {
+ $taskOrder1 = array_search($task1->taskId, $taskDagArray);
+ $taskOrder2 = array_search($task2->taskId, $taskDagArray);
+ Log::debug("tasks and order", array($task1->taskId, $taskOrder1, $task2->taskId, $taskOrder2));
+ return $taskOrder1 - $taskOrder2;
+ };
+ }
+
/**
* Create and configure a new Experiment
* @return Experiment
[2/2] airavata-php-gateway git commit: AIRAVATA-1887 Add task status
time and reason
Posted by ma...@apache.org.
AIRAVATA-1887 Add task status time and reason
Also better job description formatting.
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/84c35927
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/84c35927
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/84c35927
Branch: refs/heads/develop
Commit: 84c3592794284c770746cbe1e4a1040d42ffb218
Parents: a7249ed
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Jan 6 10:17:37 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Jan 6 10:18:56 2017 -0500
----------------------------------------------------------------------
app/views/partials/experiment-info.blade.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/84c35927/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php
index aa2eaa6..2a37c62 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -361,6 +361,8 @@
<dt>Task Id : </dt> <dd>{{ $task->taskId }}</dd>
<dt>Task Type : </dt> <dd>{{ $expVal["taskTypes"][$task->taskType] }}</dd>
<dt>Task Status : </dt> <dd>{{ $expVal["taskStates"][$task->taskStatuses[0]->state] }}</dd>
+ <dt>Task Status Time : </dt> <dd class="time" unix-time="{{{ $task->taskStatuses[0]->timeOfStateChange}}}"></dd>
+ <dt>Task Status Reason : </dt> <dd>{{{ $task->taskStatuses[0]->reason }}}</dd>
@if( is_object( $task->taskErrors))
<dt>Task Error Id : </dt><dd>{{ $task->taskErrors[0]->errorId }}</dd>
<dt>Task Error Msg : </dt><dd>{{ $task->taskErrors[0]->userFriendlyMessage }} <a tabindex="0" class="popover-taskinfo btn btn-sm btn-default" role="button" data-toggle="popover" data-html="true" title="Detailed Task Information" data-content="{{ str_replace( ',', '<br/><br/>', $task->taskError->actualErrorMessage ) }}">More Info</a></dd>
@@ -372,7 +374,7 @@
<dl class="well dl-horizontal">
<dt>Job Id. :</dt> <dd>{{ $job->jobId }}</dd>
<dt>Job Name : </dt><dd>{{ $job->jobName }}</dd>
- <dt>Job Description :</dt><dd>{{ $job->jobDescription }}</dd>
+ <dt>Job Description :</dt><dd><pre>{{{ $job->jobDescription }}}</pre></dd>
</dl>
@endforeach
</dl>