Skip to content

[AMBARI-23177] Yarn-MR separation and minor deployment fixes #588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mradha25 merged 4 commits into from
Mar 8, 2018
Merged

[AMBARI-23177] Yarn-MR separation and minor deployment fixes #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65c79f8
[AMBARI-23177] Yarn-MR separation and minor deployment fixes
mradha25 Mar 8, 2018
05851b9
Merge branch 'branch-feature-AMBARI-14714' into AMBARI-23177
mradha25 Mar 8, 2018
e0d85d3
Review comments
mradha25 Mar 8, 2018
6e1c9cf
Review comments
mradha25 Mar 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...mmon/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from resource_management.libraries.script import Script
from resource_management.core.logger import Logger
from resource_management.libraries.functions.default import default
from resource_management.libraries.functions.cluster_settings import get_cluster_setting_value, get_cluster_setting

def get_not_managed_resources():
"""
Expand All @@ -34,8 +35,8 @@ def get_not_managed_resources():
"""
config = Script.get_config()
not_managed_hdfs_path_list = json.loads(config['hostLevelParams']['not_managed_hdfs_path_list'])[:]
if 'managed_hdfs_resource_property_names' in config['configurations']['cluster-env']:
managed_hdfs_resource_property_names = config['configurations']['cluster-env']['managed_hdfs_resource_property_names']
if get_cluster_setting('managed_hdfs_resource_property_names') is not None:
managed_hdfs_resource_property_names = get_cluster_setting_value('managed_hdfs_resource_property_names')
managed_hdfs_resource_property_list = filter(None, [property.strip() for property in managed_hdfs_resource_property_names.split(',')])

for property_name in managed_hdfs_resource_property_list:
Expand Down
1 change: 0 additions & 1 deletion ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@

import org.apache.ambari.server.state.RepositoryInfo;
import org.apache.ambari.server.state.stack.RepoTag;

import com.google.common.base.Objects;

/**
Expand Down
5 changes: 3 additions & 2 deletions ambari-web/app/models/stack_service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,8 @@ App.StackService = DS.Model.extend({
}.property('coSelectedServices', 'serviceName'),

isHiddenOnSelectServicePage: function () {
var hiddenServices = ['MAPREDUCE2'];
//var hiddenServices = ['MAPREDUCE2'];
var hiddenServices = [];
return hiddenServices.contains(this.get('serviceName')) || !this.get('isInstallable') || this.get('doNotShowAndInstall');
}.property('serviceName', 'isInstallable'),

Expand Down Expand Up @@ -340,7 +341,7 @@ App.StackService.componentsOrderForService = {

//@TODO: Write unit test for no two keys in the object should have any intersecting elements in their values
App.StackService.coSelected = {

// 'YARN': ['MAPREDUCE2']
};


Expand Down