You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/06/30 22:40:31 UTC
[1/8] airavata-php-gateway git commit: invalidating cached app
interface and CR values when updating/deleting
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master ab3378326 -> 914011b1a
invalidating cached app interface and CR values when updating/deleting
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/19e3f6a9
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/19e3f6a9
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/19e3f6a9
Branch: refs/heads/master
Commit: 19e3f6a910716d86644979c5c39899200a22eb1d
Parents: ab33783
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jun 30 15:49:03 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jun 30 15:49:03 2015 +0530
----------------------------------------------------------------------
app/libraries/CRUtilities.php | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/19e3f6a9/app/libraries/CRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php
index 6e37cc6..16df103 100755
--- a/app/libraries/CRUtilities.php
+++ b/app/libraries/CRUtilities.php
@@ -106,6 +106,11 @@ class CRUtilities
public static function deleteQueue($computeResourceId, $queueName)
{
+ if (Config::get('pga_config.airavata')['enable-app-catalog-cache']) {
+ if (Cache::has('CR-' . $computeResourceId)) {
+ Cache::forget('CR-' . $computeResourceId);
+ }
+ }
Airavata::deleteBatchQueue($computeResourceId, $queueName);
}
@@ -119,6 +124,11 @@ class CRUtilities
$computeResource = CRUtilities::get_compute_resource($inputs["crId"]);
+ if (Config::get('pga_config.airavata')['enable-app-catalog-cache']) {
+ if (Cache::has('CR-' . $inputs["crId"])) {
+ Cache::forget('CR-' . $inputs["crId"]);
+ }
+ }
$jsiId = null;
if (isset($inputs["jsiId"]))
@@ -220,6 +230,13 @@ class CRUtilities
{
$computeResource = CRUtilities::get_compute_resource($inputs["crId"]);
+
+ if (Config::get('pga_config.airavata')['enable-app-catalog-cache']) {
+ if (Cache::has('CR-' . $inputs["crId"])) {
+ Cache::forget('CR-' . $inputs["crId"]);
+ }
+ }
+
if ($inputs["dataMovementProtocol"] == DataMovementProtocol::LOCAL) /* LOCAL */ {
$localDataMovement = new LOCALDataMovement();
$localdmp = Airavata::addLocalDataMovementDetails($computeResource->computeResourceId, 0, $localDataMovement);
@@ -326,6 +343,20 @@ class CRUtilities
public static function deleteActions($inputs)
{
+ if (isset($inputs["crId"])) {
+ if (Config::get('pga_config.airavata')['enable-app-catalog-cache']) {
+ if (Cache::has('CR-' . $inputs["crId"])) {
+ Cache::forget('CR-' . $inputs["crId"]);
+ }
+ }
+ } elseif (isset($inputs["del-crId"])) {
+ if (Config::get('pga_config.airavata')['enable-app-catalog-cache']) {
+ if (Cache::has('CR-' . $inputs["del-crId"])) {
+ Cache::forget('CR-' . $inputs["del-crId"]);
+ }
+ }
+ }
+
if (isset($inputs["jsiId"]))
if (Airavata::deleteJobSubmissionInterface($inputs["crId"], $inputs["jsiId"]))
return 1;
@@ -400,6 +431,12 @@ class CRUtilities
{
$computeResourcePreferences = new computeResourcePreference($inputs);
+ if (Config::get('pga_config.airavata')['enable-app-catalog-cache']) {
+ if (Cache::has('CR-' . $inputs["computeResourceId"])) {
+ Cache::forget('CR-' . $inputs["computeResourceId"]);
+ }
+ }
+
//var_dump( $inputs); exit;
return Airavata::addGatewayComputeResourcePreference($inputs["gatewayId"], $inputs["computeResourceId"], $computeResourcePreferences);
@@ -418,6 +455,7 @@ class CRUtilities
Cache::forget('CR-' . $id);
}
}
+
return Airavata::deleteGatewayComputeResourcePreference($inputs["gpId"], $inputs["rem-crId"]);
}
[2/8] airavata-php-gateway git commit: fixing AIRAVATA-1741
Posted by sc...@apache.org.
fixing AIRAVATA-1741
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/378c475e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/378c475e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/378c475e
Branch: refs/heads/master
Commit: 378c475e4c6c0c1ea33911058174bd6d306ebbbd
Parents: 19e3f6a
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jun 30 16:56:20 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jun 30 16:56:20 2015 +0530
----------------------------------------------------------------------
app/views/project/summary.blade.php | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/378c475e/app/views/project/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php
index ab4ebef..a05c59e 100755
--- a/app/views/project/summary.blade.php
+++ b/app/views/project/summary.blade.php
@@ -93,11 +93,19 @@
echo "<td>$applicationInterface->applicationName</td>";
- echo '<td>' . CRUtilities::get_compute_resource($experiment->userConfigurationData
- ->computationalResourceScheduling->resourceHostId)->hostName . '</td>';
+ echo '<td>';
+ try {
+ $cr = CRUtilities::get_compute_resource($experiment->userConfigurationData
+ ->computationalResourceScheduling->resourceHostId);
+ if (!empty($cr)) {
+ echo $cr->hostName;
+ }
+ } catch (Exception $ex) {
+ //Error while retrieving the CR
+ }
+ echo '</td>';
echo '<td class="time" unix-time="' . $expValues["experimentTimeOfStateChange"] . '"></td>';
-
echo '<td>'. $expValues["experimentStatusString"] . '</td>';
if ($expValues["jobState"]) echo '
[3/8] airavata-php-gateway git commit: updating experiment-partials
view to check nullity of appInt. and CR.
Posted by sc...@apache.org.
updating experiment-partials view to check nullity of appInt. and CR.
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/6e33674a
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6e33674a
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6e33674a
Branch: refs/heads/master
Commit: 6e33674aa62d33848587ceb57caa918cb24efb96
Parents: 378c475
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jun 30 21:59:38 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jun 30 22:03:12 2015 +0530
----------------------------------------------------------------------
app/views/partials/experiment-info.blade.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6e33674a/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 623eb53..782f580 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -33,11 +33,15 @@
</tr>
<tr>
<td><strong>Application</strong></td>
- <td><?php echo $expVal["applicationInterface"]->applicationName; ?></td>
+ <td><?php if (!empty($expVal["applicationInterface"])) {
+ echo $expVal["applicationInterface"]->applicationName;
+ } ?></td>
</tr>
<tr>
<td><strong>Compute resource</strong></td>
- <td><?php echo $expVal["computeResource"]->hostName; ?></td>
+ <td><?php if (!empty($expVal["computeResource"])) {
+ $expVal["computeResource"]->hostName;
+ } ?></td>
</tr>
<tr>
<td><strong>Experiment Status</strong></td>
[7/8] airavata-php-gateway git commit: adding missing echo statement
Posted by sc...@apache.org.
adding missing echo statement
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/47f9f0f8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/47f9f0f8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/47f9f0f8
Branch: refs/heads/master
Commit: 47f9f0f8d1f04f3b3b6b73d7ef1009e59f509cd8
Parents: 28f94f1
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed Jul 1 01:24:58 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed Jul 1 02:09:48 2015 +0530
----------------------------------------------------------------------
app/views/partials/experiment-info.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/47f9f0f8/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 5b69cfe..55cd2fb 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -40,7 +40,7 @@
<tr>
<td><strong>Compute resource</strong></td>
<td><?php if (!empty($expVal["computeResource"])) {
- $expVal["computeResource"]->hostName;
+ echo $expVal["computeResource"]->hostName;
} ?></td>
</tr>
<tr>
[5/8] airavata-php-gateway git commit: removing extra trailing comma
Posted by sc...@apache.org.
removing extra trailing comma
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/cad9f1a9
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/cad9f1a9
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/cad9f1a9
Branch: refs/heads/master
Commit: cad9f1a98119f424577a1d330038c4204d2ad5d7
Parents: ebfea7f
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed Jul 1 00:27:41 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed Jul 1 00:27:41 2015 +0530
----------------------------------------------------------------------
composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cad9f1a9/composer.json
----------------------------------------------------------------------
diff --git a/composer.json b/composer.json
index a209249..88a580b 100755
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
"license": "MIT",
"require": {
"laravel/framework": "4.2.*",
- "apache/thrift": "1.0.*@dev",
+ "apache/thrift": "1.0.*@dev"
},
"autoload": {
"classmap": [
[4/8] airavata-php-gateway git commit: fixing AIRAVATA-1741
Posted by sc...@apache.org.
fixing AIRAVATA-1741
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/ebfea7fc
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ebfea7fc
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ebfea7fc
Branch: refs/heads/master
Commit: ebfea7fc423ed0417da5e2cdc83690cb378095b8
Parents: 6e33674
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jun 30 21:51:53 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jun 30 22:03:29 2015 +0530
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ebfea7fc/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 871113a..5a924b1 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -616,7 +616,12 @@ class ExperimentUtilities
$userConfigData = $experiment->userConfigurationData;
$scheduling = $userConfigData->computationalResourceScheduling;
$expVal['scheduling'] = $scheduling;
- $expVal["computeResource"] = CRUtilities::get_compute_resource($scheduling->resourceHostId);
+ try {
+ $expVal["computeResource"] = CRUtilities::get_compute_resource($scheduling->resourceHostId);
+ } catch (Exception $ex) {
+ //Error while retrieving CR
+ $expVal["computeResource"] = "";
+ }
}
$expVal["applicationInterface"] = AppUtilities::get_application_interface($experiment->applicationId);
[8/8] airavata-php-gateway git commit: Fixing AIRAVATA-1742
Posted by sc...@apache.org.
Fixing AIRAVATA-1742
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/914011b1
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/914011b1
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/914011b1
Branch: refs/heads/master
Commit: 914011b1a0eca5f720fdd7266543ac046559dec4
Parents: 47f9f0f
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed Jul 1 02:00:09 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed Jul 1 02:09:59 2015 +0530
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/914011b1/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index e3de925..83d849d 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -18,6 +18,8 @@ class ExperimentUtilities
{
private static $experimentPath;
+ private static $sshUser = "root";
+
/**
* Launch the experiment with the given ID
* @param $expId
@@ -160,9 +162,8 @@ class ExperimentUtilities
}
$advHandling = new AdvancedOutputDataHandling();
- $sshUser = "root";
$hostName = $_SERVER['SERVER_NAME'];
- $expPathConstant = 'file://' . $sshUser . '@' . $hostName . ':' . Config::get('pga_config.airavata')['experiment-data-absolute-path'];
+ $expPathConstant = 'file://' . ExperimentUtilities::$sshUser . '@' . $hostName . ':' . Config::get('pga_config.airavata')['experiment-data-absolute-path'];
$advHandling->outputDataDir = str_replace(Config::get('pga_config.airavata')['experiment-data-absolute-path'],
$expPathConstant, ExperimentUtilities::$experimentPath);
@@ -288,8 +289,8 @@ class ExperimentUtilities
Please try again later or report a bug using the link in the Help menu.</p>');
$experimentAssemblySuccessful = false;
}
-
- $experimentInput->value = Config::get('pga_config.airavata')['experiment-data-absolute-path'];
+ $hostName = $_SERVER['SERVER_NAME'];
+ $experimentInput->value = 'file://' . ExperimentUtilities::$sshUser . '@' . $hostName . ':' . $filePath;
$experimentInput->type = $applicationInput->type;
} else {
[6/8] airavata-php-gateway git commit: fixing AIRAVATA-1742
Posted by sc...@apache.org.
fixing AIRAVATA-1742
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/28f94f1d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/28f94f1d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/28f94f1d
Branch: refs/heads/master
Commit: 28f94f1d6c8cfdab5e015cedbd78b061c9ea70d4
Parents: cad9f1a
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed Jul 1 01:18:15 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed Jul 1 02:09:38 2015 +0530
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 3 ++-
app/views/partials/experiment-info.blade.php | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/28f94f1d/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 5a924b1..e3de925 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -81,7 +81,8 @@ class ExperimentUtilities
if ($matchingAppInput->type == DataType::URI) {
$explode = explode('/', $input->value);
echo '<p><a target="_blank"
- href="' . URL::to("/") . Config::get('pga_config.airavata')['experiment-data-dir'] . $explode[sizeof($explode) - 2] . '/' . $explode[sizeof($explode) - 1] . '">' .
+ href="' . URL::to("/") . "/.." . Config::get('pga_config.airavata')['experiment-data-dir']
+ . "/" . $explode[sizeof($explode) - 2] . '/' . $explode[sizeof($explode) - 1] . '">' .
$explode[sizeof($explode) - 1] . '
<span class="glyphicon glyphicon-new-window"></span></a></p>';
} elseif ($matchingAppInput->type == DataType::STRING) {
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/28f94f1d/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 782f580..5b69cfe 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -103,7 +103,7 @@
</tr>
<tr>
<td><strong>Inputs</strong></td>
- <td><?php ProjectUtilities::get_project($experiment->projectID); ?></td>
+ <td><?php ExperimentUtilities::list_input_files($experiment); ?></td>
</tr>
<tr>
<td><strong>Outputs</strong></td>