You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vs...@apache.org on 2017/06/22 03:59:09 UTC
ambari git commit: AMBARI-21255.Remove YARN client mode option from
WFM(Venkata Sairam)
Repository: ambari
Updated Branches:
refs/heads/trunk 9c6932286 -> 7335bf7e2
AMBARI-21255.Remove YARN client mode option from WFM(Venkata Sairam)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7335bf7e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7335bf7e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7335bf7e
Branch: refs/heads/trunk
Commit: 7335bf7e2e08da032524009ce3ad2a6b1c2430aa
Parents: 9c69322
Author: Venkata Sairam <ve...@gmail.com>
Authored: Thu Jun 22 09:29:01 2017 +0530
Committer: Venkata Sairam <ve...@gmail.com>
Committed: Thu Jun 22 09:29:01 2017 +0530
----------------------------------------------------------------------
.../ui/app/components/flow-designer.js | 27 ++++++++++++++++++++
.../ui/app/domain/actionjob_hanlder.js | 3 +++
.../app/templates/components/flow-designer.hbs | 9 ++++++-
.../app/templates/components/spark-action.hbs | 7 ++++-
.../main/resources/ui/app/utils/constants.js | 2 +-
5 files changed, 45 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7335bf7e/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
index 1cfe755..2c77b5b 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
@@ -364,6 +364,8 @@ export default Ember.Component.extend(FindNodeMixin, Validations, {
});
},
importWorkflowFromString(data){
+ this.showSparkMasterFieldError(data);
+
var wfObject=this.get("workflowImporter").importWorkflow(data);
this.set("errors", wfObject.errors);
if (wfObject.workflow === null) {
@@ -385,6 +387,7 @@ export default Ember.Component.extend(FindNodeMixin, Validations, {
}
},
importWorkflowFromJSON(data){
+ this.showSparkMasterFieldError(data);
var workflowImporter=WorkflowJsonImporter.create({});
var workflow=workflowImporter.importWorkflow(data);
this.resetDesigner();
@@ -393,6 +396,27 @@ export default Ember.Component.extend(FindNodeMixin, Validations, {
this.rerender();
this.doValidation();
},
+ migrateActionObjectToCollection(data) {
+ if(Ember.isArray(data)) {
+ return data;
+ } else {
+ let ArrayData = [];
+ ArrayData.push(data);
+ return ArrayData;
+ }
+ },
+ showSparkMasterFieldError(data) {
+ let x2js = new X2JS();
+ let actionSettingsObj = x2js.xml_str2json(data);
+ let sparkActionList, sparkActionArray = [];
+ if(actionSettingsObj["workflow-app"] && actionSettingsObj["workflow-app"].action) {
+ sparkActionList = actionSettingsObj["workflow-app"].action;
+ sparkActionArray = this.migrateActionObjectToCollection(sparkActionList);
+ if(sparkActionArray.findBy('spark') && this.migrateActionObjectToCollection(sparkActionArray.findBy('spark')).find(function(item){return item.spark.master === "yarn-client"})) {
+ this.set('isSparkUnSupportedPropsAvailable', true);
+ }
+ }
+ },
getWorkflowFromHdfs(filePath){
var url = Ember.ENV.API_URL + "/readWorkflow?workflowPath="+filePath+'&jobType=WORKFLOW';
var deferred = Ember.RSVP.defer();
@@ -1234,6 +1258,9 @@ export default Ember.Component.extend(FindNodeMixin, Validations, {
self.set("data", data);
self.set("isAssetImporting", false);
});
+ },
+ closeInfo(flag) {
+ this.set(flag, false);
}
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/7335bf7e/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
index c9dc751..9bc19ba 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
@@ -243,6 +243,9 @@ var SparkActionJobHandler=ActionJobHandler.extend({
];
},
handleImport(actionNode,json){
+ if(json.master === "yarn-client") {
+ json.master = "yarn-cluster";
+ }
this._super(actionNode,json);
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/7335bf7e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
index 8c07d6d..a02db63 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
@@ -138,7 +138,14 @@
{{/if}}
<div id="content" class="panel panel-default designer-main-panel col-xs-20">
<div class="designer-panel designer-canvas">
- {{designer-errors errors=errors validationErrors=validationErrors errorMsg=errorMsg data=data}}
+ {{designer-errors errors=errors validationErrors=validationErrors errorMsg=errorMsg data=data}}
+ {{#if isSparkUnSupportedPropsAvailable}}
+ <div class="alert alert-warning">
+ <a href="#" class="close" {{action "closeInfo" "isSparkUnSupportedPropsAvailable"}}> × </a>
+ Spark does not support YARN Client mode.Hence, YARN Client mode value will changed in xml while importing.
+ </div>
+ {{/if}}
+
{{#if undoAvailable}}
<div id="alert"class="alert alert-warning workflow-error" role="alert">
{{#if (eq undoType 'nodeDeleted')}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/7335bf7e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs
index de62e77..c8f14d3 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs
@@ -63,8 +63,13 @@
<input type=text placeholder="Custom" disabled={{disableCustomMaster}} value={{customMaster}} onchange={{action (mut actionModel.master) value="target.value"}}>
</div>
</div>
- {{field-error model=this field='actionModel.master' showErrorMessage=showErrorMessage}}
</div>
+ <div class="form-group">
+ <label for="inputEmail" class="control-label col-xs-2"></label>
+ <div class="col-xs-10">
+ {{field-error model=this field='actionModel.master' showErrorMessage=showErrorMessage}}
+ </div>
+ </div>
<div class="form-group">
<label for="inputEmail" class="control-label col-xs-2">Spark Options</label>
<div class="col-xs-7">
http://git-wip-us.apache.org/repos/asf/ambari/blob/7335bf7e/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js b/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js
index 3989fc2..ffdbdc0 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js
@@ -50,7 +50,7 @@ export default Ember.Object.create({
{name : "email",supportsSchema : true, currentVersion:''}
]),
sparkMasterList :Ember.A([{value:'yarn-cluster',displayName:'Yarn Cluster'},
- {value:'yarn-client',displayName:'Yarn Client'},
+ /*{value:'yarn-client',displayName:'Yarn Client'},*/
{value:'local',displayName:'Local'}]),
timezoneList : Ember.A([
{displayName:'UTC',gmtOffset:0, value:'UTC'},