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/10/08 20:55:48 UTC
git commit: AMBARI-7668. ATS Migration Option Via Ambari
Repository: ambari
Updated Branches:
refs/heads/trunk c764a574f -> eb8f23d2c
AMBARI-7668. ATS Migration Option Via Ambari
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eb8f23d2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eb8f23d2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eb8f23d2
Branch: refs/heads/trunk
Commit: eb8f23d2c4e90777cc6f114f9bf1d868e1cefbb3
Parents: c764a57
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Wed Oct 8 11:46:31 2014 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Wed Oct 8 11:55:26 2014 -0700
----------------------------------------------------------------------
.../main/service/reassign/step2_controller.js | 2 +-
.../main/service/reassign/step4_controller.js | 24 ++++++++++++++++++--
.../app/models/stack_service_component.js | 2 +-
.../service/reassign/step4_controller_test.js | 6 +++++
.../test/models/stack_service_component_test.js | 2 +-
5 files changed, 31 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/eb8f23d2/ambari-web/app/controllers/main/service/reassign/step2_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/reassign/step2_controller.js b/ambari-web/app/controllers/main/service/reassign/step2_controller.js
index 7e4513a..3902d8a 100644
--- a/ambari-web/app/controllers/main/service/reassign/step2_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step2_controller.js
@@ -71,7 +71,7 @@ App.ReassignMasterWizardStep2Controller = App.WizardStep5Controller.extend({
selectedHost: master.hostName,
isInstalled: true,
serviceId: App.HostComponent.find().findProperty('componentName', master.component).get('serviceName'),
- isServiceCoHost: ['HIVE_METASTORE', 'WEBHCAT_SERVER'].contains(master.component),
+ isServiceCoHost: ['HIVE_METASTORE', 'WEBHCAT_SERVER'].contains(master.component) && !this.get('this.isReassignWizard'),
color: color
});
}, this);
http://git-wip-us.apache.org/repos/asf/ambari/blob/eb8f23d2/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 c0097fa..823fdf7 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -36,7 +36,8 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
*/
unrelatedServicesMap: {
'JOBTRACKER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM'],
- 'RESOURCEMANAGER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM']
+ 'RESOURCEMANAGER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM'],
+ 'APP_TIMELINE_SERVER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM']
},
/**
@@ -99,7 +100,17 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
'fs.defaultFS': 'hdfs://<replace-value>:8020'
}
}
- }
+ },
+ {
+ componentName: 'APP_TIMELINE_SERVER',
+ configs: {
+ 'yarn-site': {
+ 'yarn.timeline-service.webapp.address': '<replace-value>:8188',
+ 'yarn.timeline-service.webapp.https.address': '<replace-value>:8190',
+ 'yarn.timeline-service.address': '<replace-value>:10200'
+ }
+ }
+ },
],
secureConfigsMap: [
@@ -383,6 +394,15 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
case 'RESOURCEMANAGER':
urlParams.push('(type=yarn-site&tag=' + data.Clusters.desired_configs['yarn-site'].tag + ')');
break;
+ case 'WEBHCAT_SERVER':
+ urlParams.push('(type=webhcat-site&tag=' + data.Clusters.desired_configs['webhcat-site'].tag + ')');
+ break;
+ case 'APP_TIMELINE_SERVER':
+ urlParams.push('(type=yarn-site&tag=' + data.Clusters.desired_configs['yarn-site'].tag + ')');
+ break;
+ case 'OOZIE_SERVER':
+ urlParams.push('(type=oozie-site&tag=' + data.Clusters.desired_configs['oozie-site'].tag + ')');
+ break;
}
return urlParams;
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/eb8f23d2/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 8c5594d..a8aa26c 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'].contains(this.get('componentName'));
+ return ['NAMENODE', 'SECONDARY_NAMENODE', 'JOBTRACKER', 'RESOURCEMANAGER', 'APP_TIMELINE_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/eb8f23d2/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 c7a34b5..c0248af 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
@@ -469,6 +469,12 @@ describe('App.ReassignMasterWizardStep4Controller', function () {
result: [
"(type=yarn-site&tag=5)"
]
+ },
+ {
+ componentName: 'APP_TIMELINE_SERVER',
+ result: [
+ "(type=yarn-site&tag=5)"
+ ]
}
];
http://git-wip-us.apache.org/repos/asf/ambari/blob/eb8f23d2/ambari-web/test/models/stack_service_component_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/models/stack_service_component_test.js b/ambari-web/test/models/stack_service_component_test.js
index 483ae7d..aadd818 100644
--- a/ambari-web/test/models/stack_service_component_test.js
+++ b/ambari-web/test/models/stack_service_component_test.js
@@ -122,7 +122,7 @@ var componentPropertiesValidationTests = [
isSlave: false,
isMaster: true,
isRestartable: true,
- isReassignable: false,
+ isReassignable: true,
isDeletable: false,
isRollinRestartAllowed: false,
isDecommissionAllowed: false,