You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by gn...@apache.org on 2017/01/30 12:09:48 UTC
ambari git commit: AMBARI-19766. Not able to set the sla for an
action node (Padma Priya N via gauravn7)
Repository: ambari
Updated Branches:
refs/heads/trunk ff34b053d -> da7202d41
AMBARI-19766. Not able to set the sla for an action node (Padma Priya N via gauravn7)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/da7202d4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/da7202d4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/da7202d4
Branch: refs/heads/trunk
Commit: da7202d41cbf9042ac844ad408a08c348ec06e7f
Parents: ff34b05
Author: Gaurav Nagar <gr...@gmail.com>
Authored: Mon Jan 30 17:39:33 2017 +0530
Committer: Gaurav Nagar <gr...@gmail.com>
Committed: Mon Jan 30 17:39:33 2017 +0530
----------------------------------------------------------------------
.../main/resources/ui/app/components/workflow-action-editor.js | 2 +-
.../main/resources/ui/app/templates/components/sla-info.hbs | 6 +++---
.../resources/ui/app/templates/components/sqoop-action.hbs | 2 +-
.../resources/ui/app/templates/components/workflow-actions.hbs | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/da7202d4/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
index f2d3ba8..43eeb5b 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
@@ -132,7 +132,7 @@ export default Ember.Component.extend( Ember.Evented,{
}
if(!CommonUtils.isSupportedAction(this.get('actionType')) && !this.get('actionModel.slaInfo')){
this.set('customSlaInfo', SlaInfo.create({}));
- }else{
+ }else if(!CommonUtils.isSupportedAction(this.get('actionType')) && this.get('actionModel.slaInfo')){
this.set('customSlaInfo', this.get('actionModel.slaInfo'));
this.set('customSlaEnabled', this.get('actionModel.slaEnabled'));
delete this.get('actionModel').slaInfo;
http://git-wip-us.apache.org/repos/asf/ambari/blob/da7202d4/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
index 447bac2..2ebc259 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
@@ -35,7 +35,7 @@
<div class="form-group">
<label class="control-label col-xs-2">Should Start</label>
<div class="col-xs-3">
- {{input class="form-control" type="text" value=slaInfo.shouldStart.time placeholder="Should Start"}}
+ {{input class="form-control" type="text" value=slaInfo.shouldStart.time placeholder="Time period(eg. 5)" title="Time period in minutes/hours/days"}}
{{field-error model=this field='slaInfo.shouldStart.time' showErrorMessage=showErrorMessage}}
</div>
<div class="col-xs-2">
@@ -50,7 +50,7 @@
<div class="form-group">
<label class="control-label col-xs-2">Should End<span class="requiredField"> *</span></label>
<div class="col-xs-3">
- {{input class="form-control" type="text" value=slaInfo.shouldEnd.time placeholder="Should End"}}
+ {{input class="form-control" type="text" value=slaInfo.shouldEnd.time placeholder="Time period(eg. 5)" title="Time period in minutes/hours/days"}}
{{field-error model=this field='slaInfo.shouldEnd.time' showErrorMessage=showErrorMessage}}
</div>
<div class="col-xs-2">
@@ -65,7 +65,7 @@
<div class="form-group">
<label class="control-label col-xs-2">Max Duration</label>
<div class="col-xs-3">
- {{input class="form-control" type="text" value=slaInfo.maxDuration.time placeholder="Max Duration"}}
+ {{input class="form-control" type="text" value=slaInfo.maxDuration.time placeholder="Time period(eg. 5)" title="Time period in minutes/hours/days"}}
</div>
<div class="col-xs-2">
<select class="form-control" name="time-unit" title="Time Unit" onchange={{action (mut slaInfo.maxDuration.unit) value="target.value"}}>
http://git-wip-us.apache.org/repos/asf/ambari/blob/da7202d4/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
index 3f0ec61..fb59149 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
@@ -32,7 +32,7 @@
<div class="form-group padding10">
<label for="inputEmail" class="control-label col-xs-2">Command</label>
<div class="col-xs-7">
- {{input type="text" class="form-control" name="command" value=actionModel.command placeholder="Sqoop Command"}}
+ {{input type="text" class="form-control" name="command" value=actionModel.command placeholder="Command" title="eg. import --connect jdbc:hsqldb:file:db.hsqldb --table TT --target-dir /user/${wf:user()}/output-data/sqoop -m 1"}}
</div>
</div>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/da7202d4/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs
index badf320..265da9f 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs
@@ -49,7 +49,7 @@
<li {{action 'addAction' 'java'}} class="dr_action enabled" data-name="Java" data-type="java"> <i class="fa fa-code"></i> Java </li>
<li {{action 'addAction' 'shell'}} class="dr_action enabled" data-name="Shell" data-type="shell"> <i class="fa fa-terminal"></i> Shell </li>
<li {{action 'addAction' 'distcp'}} class="dr_action enabled" data-name="distcp" data-type="distcp"> <i class="fa fa-clone"></i> distcp </li>
- <li {{action 'addAction' 'map-reduce'}} class="dr_action enabled" data-name="MR" data-type="mapreduce"> <i class="fa fa-cubes"></i> MR </li>
+ <li {{action 'addAction' 'map-reduce'}} class="dr_action enabled" data-name="MR" data-type="map-reduce"> <i class="fa fa-cubes"></i> MR </li>
<li {{action 'addAction' 'ssh'}} class="dr_action enabled" data-name="SSH" data-type="ssh"> <i class="fa fa-terminal"></i> ssh </li>
<li {{action 'addAction' 'spark'}} class="dr_action enabled" data-name="Spark" data-type="spark"> <i class="fa fa-star"></i> Spark </li>
<li class="dr_action disabled hide" data-name="Stream" data-type="stream"> <i class="fa fa-exchange"></i> Stream </li>