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 2017/05/22 15:49:01 UTC
airavata-php-gateway git commit: setting queue specific defaults via
PGA
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 7c66c1b8c -> 7882519fc
setting queue specific defaults via PGA
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/7882519f
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/7882519f
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/7882519f
Branch: refs/heads/develop
Commit: 7882519fce627eb553bca73bcab0713f357b5fdd
Parents: 7c66c1b
Author: scnakandala <su...@gmail.com>
Authored: Mon May 22 11:48:56 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon May 22 11:48:56 2017 -0400
----------------------------------------------------------------------
app/controllers/ComputeResourceController.php | 8 +++++-
app/views/partials/queue-block.blade.php | 30 ++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7882519f/app/controllers/ComputeResourceController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ComputeResourceController.php b/app/controllers/ComputeResourceController.php
index e296888..f574c8b 100755
--- a/app/controllers/ComputeResourceController.php
+++ b/app/controllers/ComputeResourceController.php
@@ -112,7 +112,13 @@ class ComputeResourceController extends BaseController
"maxNodes" => Input::get("qmaxnodes"),
"maxProcessors" => Input::get("qmaxprocessors"),
"maxJobsInQueue" => Input::get("qmaxjobsinqueue"),
- "maxMemory" => Input::get("qmaxmemoryinqueue")
+ "maxMemory" => Input::get("qmaxmemoryinqueue"),
+ "cpuPerNode" => Input::get("cpuPerNode"),
+ "defaultNodeCount" => Input::get("defaultNodeCount"),
+ "defaultCPUCount" => Input::get("defaultCPUCount"),
+ "defaultWalltime" => Input::get("defaultWalltime"),
+ "queueSpecificMacros" => Input::get("queueSpecificMacros"),
+ "isDefaultQueue" => Input::get("isDefaultQueue")
);
$computeDescription = CRUtilities::get_compute_resource(Input::get("crId"));
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7882519f/app/views/partials/queue-block.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/queue-block.blade.php b/app/views/partials/queue-block.blade.php
index ac0008a..4bd96a6 100644
--- a/app/views/partials/queue-block.blade.php
+++ b/app/views/partials/queue-block.blade.php
@@ -38,4 +38,34 @@
<input type="number" min="0" class="form-control" value="@if( isset( $queueData) ){{ $queueData->maxMemory }}@endif"
maxlength="30" name="qmaxmemoryinqueue" placeholder="Max Memory For Queue"
@if( isset( $readOnly)){{ "readOnly" }}@endif/>
+</div>
+<div class="form-group">
+ <label class="control-label">CPUs Per Node</label>
+ <input type="number" min="0" class="form-control" value="@if( isset( $queueData) ){{ $queueData->cpuPerNode }}@endif"
+ maxlength="30" name="cpuPerNode" placeholder="CPUs Per Node"
+ @if( isset( $readOnly)){{ "readOnly" }}@endif/>
+</div>
+<div class="form-group">
+ <label class="control-label">Default Node Count</label>
+ <input type="number" min="0" class="form-control" value="@if( isset( $queueData) ){{ $queueData->defaultNodeCount }}@endif"
+ maxlength="30" name="defaultNodeCount" placeholder="Default Node Count"
+ @if( isset( $readOnly)){{ "readOnly" }}@endif/>
+</div>
+<div class="form-group">
+ <label class="control-label">Default CPU Count</label>
+ <input type="number" min="0" class="form-control" value="@if( isset( $queueData) ){{ $queueData->defaultCPUCount }}@endif"
+ maxlength="30" name="defaultCPUCount" placeholder="defaultCPUCount"
+ @if( isset( $readOnly)){{ "readOnly" }}@endif/>
+</div>
+<div class="form-group">
+ <label class="control-label">Default Wall Time</label>
+ <input type="number" min="0" class="form-control" value="@if( isset( $queueData) ){{ $queueData->defaultWalltime }}@endif"
+ maxlength="30" name="defaultWalltime" placeholder="Default Wall Time"
+ @if( isset( $readOnly)){{ "readOnly" }}@endif/>
+</div>
+<div class="form-group">
+ <label class="control-label">Queue Specific Macros</label>
+ <input type="text" min="0" class="form-control" value="@if( isset( $queueData) ){{ $queueData->queueSpecificMacros }}@endif"
+ maxlength="100" name="queueSpecificMacros" placeholder="Queue Specific Macros"
+ @if( isset( $readOnly)){{ "readOnly" }}@endif/>
</div>
\ No newline at end of file