You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2014/11/07 17:35:25 UTC
ambari git commit: AMBARI-8002. WebHCat Server Migration option via
Ambari (Szilard Nemethy via srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk a25de1871 -> 96bcff5e3
AMBARI-8002. WebHCat Server Migration option via Ambari (Szilard Nemethy via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/96bcff5e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/96bcff5e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/96bcff5e
Branch: refs/heads/trunk
Commit: 96bcff5e3740e3b4865ff2e92dead0b0a7f3ed2e
Parents: a25de18
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Fri Nov 7 08:35:07 2014 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Fri Nov 7 08:35:13 2014 -0800
----------------------------------------------------------------------
.../main/service/reassign/step4_controller.js | 6 +++++-
ambari-web/app/controllers/wizard/step5_controller.js | 5 +++++
ambari-web/app/models/stack_service_component.js | 2 +-
.../main/service/reassign/step4_controller_test.js | 11 +++++++++--
4 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/96bcff5e/ambari-web/app/controllers/main/service/reassign/step4_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/reassign/step4_controller.js b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index bbd61d3..e27a235 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -38,7 +38,8 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
'JOBTRACKER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM'],
'RESOURCEMANAGER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM'],
'APP_TIMELINE_SERVER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM'],
- 'OOZIE_SERVER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM', 'HIVE']
+ 'OOZIE_SERVER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM', 'HIVE'],
+ 'WEBHCAT_SERVER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM']
},
/**
@@ -412,6 +413,9 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
case 'OOZIE_SERVER':
urlParams.push('(type=oozie-site&tag=' + data.Clusters.desired_configs['oozie-site'].tag + ')');
break;
+ case 'WEBHCAT_SERVER':
+ urlParams.push('(type=webhcat-site&tag=' + data.Clusters.desired_configs['webhcat-site'].tag + ')');
+ break;
}
return urlParams;
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/96bcff5e/ambari-web/app/controllers/wizard/step5_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step5_controller.js b/ambari-web/app/controllers/wizard/step5_controller.js
index 186d8f8..efc810d 100644
--- a/ambari-web/app/controllers/wizard/step5_controller.js
+++ b/ambari-web/app/controllers/wizard/step5_controller.js
@@ -727,6 +727,11 @@ App.WizardStep5Controller = Em.Controller.extend(App.BlueprintMixin, {
* @method updateCoHosts
*/
updateCoHosts: function () {
+ // reassign wizard has no co-host constraints
+ if (this.get('isReassignWizard')) {
+ return false;
+ }
+
var components = App.StackServiceComponent.find().filterProperty('isOtherComponentCoHosted');
var selectedServicesMasters = this.get('selectedServicesMasters');
components.forEach(function (component) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/96bcff5e/ambari-web/app/models/stack_service_component.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service_component.js b/ambari-web/app/models/stack_service_component.js
index 46c006e..5d62683 100644
--- a/ambari-web/app/models/stack_service_component.js
+++ b/ambari-web/app/models/stack_service_component.js
@@ -77,7 +77,7 @@ App.StackServiceComponent = DS.Model.extend({
/** @property {Boolean} isReassignable - component supports reassign action **/
isReassignable: function() {
- return ['NAMENODE', 'SECONDARY_NAMENODE', 'JOBTRACKER', 'RESOURCEMANAGER', 'APP_TIMELINE_SERVER', 'OOZIE_SERVER'].contains(this.get('componentName'));
+ return ['NAMENODE', 'SECONDARY_NAMENODE', 'JOBTRACKER', 'RESOURCEMANAGER', 'APP_TIMELINE_SERVER', 'OOZIE_SERVER', 'WEBHCAT_SERVER'].contains(this.get('componentName'));
}.property('componentName'),
/** @property {Boolean} isRollinRestartAllowed - component supports rolling restart action **/
http://git-wip-us.apache.org/repos/asf/ambari/blob/96bcff5e/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
index baee572..d8f523c 100644
--- a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
+++ b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
@@ -481,6 +481,12 @@ describe('App.ReassignMasterWizardStep4Controller', function () {
result: [
"(type=oozie-site&tag=6)"
]
+ },
+ {
+ componentName: 'WEBHCAT_SERVER',
+ result: [
+ "(type=webhcat-site&tag=7)"
+ ]
}
];
@@ -492,7 +498,8 @@ describe('App.ReassignMasterWizardStep4Controller', function () {
'hbase-site': {tag: 3},
'mapred-site': {tag: 4},
'yarn-site': {tag: 5},
- 'oozie-site': {tag: 6}
+ 'oozie-site': {tag: 6},
+ 'webhcat-site': {tag: 7}
}
}
};
@@ -1184,4 +1191,4 @@ describe('App.ReassignMasterWizardStep4Controller', function () {
});
});
-});
\ No newline at end of file
+});