ambari git commit: AMBARI-9598 RU. Invalid tooltips on the Version Box. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 91357d07f - 63c683f32
AMBARI-9598 RU. Invalid tooltips on the Version Box. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/63c683f3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/63c683f3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/63c683f3
Branch: refs/heads/trunk
Commit: 63c683f3272e5c5ef294b43f1157cb49a8bd4e58
Parents: 91357d0
Author: Andrii Tkach atk...@hortonworks.com
Authored: Thu Feb 12 16:36:39 2015 +0200
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Fri Feb 13 13:21:08 2015 +0200
--
.../models/stack_version/repository_version.js | 21
.../admin/stack_upgrade/upgrade_version_box.hbs | 12 +--
.../stack_upgrade/upgrade_version_box_view.js | 10 ++
.../upgrade_version_box_view_test.js| 15 ++
4 files changed, 44 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/63c683f3/ambari-web/app/models/stack_version/repository_version.js
--
diff --git a/ambari-web/app/models/stack_version/repository_version.js
b/ambari-web/app/models/stack_version/repository_version.js
index c5a45a3..01806cb 100644
--- a/ambari-web/app/models/stack_version/repository_version.js
+++ b/ambari-web/app/models/stack_version/repository_version.js
@@ -86,6 +86,27 @@ App.RepositoryVersion = DS.Model.extend({
}.property('stackVersion.noInitHosts'),
/**
+ * @type {string}
+ */
+ noInitHostsTooltip: function () {
+return (this.get('noInitHosts')) ?
Em.I18n.t('admin.stackVersions.version.emptyHostsTooltip') :
Em.I18n.t('admin.stackVersions.version.hostsTooltip');
+ }.property('noInitHosts'),
+
+ /**
+ * @type {string}
+ */
+ noCurrentHostsTooltip: function () {
+return (this.get('noCurrentHosts')) ?
Em.I18n.t('admin.stackVersions.version.emptyHostsTooltip') :
Em.I18n.t('admin.stackVersions.version.hostsTooltip');
+ }.property('noCurrentHosts'),
+
+ /**
+ * @type {string}
+ */
+ noInstalledHostsTooltip: function () {
+return (this.get('noInstalledHosts')) ?
Em.I18n.t('admin.stackVersions.version.emptyHostsTooltip') :
Em.I18n.t('admin.stackVersions.version.hostsTooltip');
+ }.property('noInstalledHosts'),
+
+ /**
* @type {boolean}
*/
isVisible: true
http://git-wip-us.apache.org/repos/asf/ambari/blob/63c683f3/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
--
diff --git
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
index 23dc285..138568f 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
@@ -55,20 +55,20 @@
div class=hosts-bar{{t common.hosts}}/div
div class=row-fluid host-link
div class=span4 align-center
- diva href=# {{bindAttr
class=view.content.noInitHosts:empty-hosts-tooltip:hosts-tooltip :not-active}}
-{{action showHosts view.versionStateMap.not_installed
view.content.displayName view.content.notInstalledHosts target=view}}
+ diva href=# class=hosts-tooltip not-active {{bindAttr
data-original-title=view.content.noInitHostsTooltip }}
+{{action showHosts view.versionStateMap.not_installed target=view}}
{{view.content.notInstalledHosts.length}}/a/div
div{{t admin.stackVersions.version.notInstalled}}/div
/div
div class=span4 align-center
- diva href=# {{bindAttr
class=view.content.noInstalledHosts:empty-hosts-tooltip:hosts-tooltip
:not-active}}
-{{action showHosts view.versionStateMap.installed
view.content.displayName view.content.installedHosts target=view}}
+ diva href=# class=hosts-tooltip not-active {{bindAttr
data-original-title=view.content.noInstalledHostsTooltip }}
+{{action showHosts view.versionStateMap.installed target=view}}
{{view.content.installedHosts.length}}/a/div
div{{t common.installed}}/div
/div
div class=span4 align-center
- diva href=# {{bindAttr
class=view.content.noCurrentHosts:empty-hosts-tooltip:hosts-tooltip
:not-active}}
-{{action showHosts view.versionStateMap.current
view.content.displayName view.content.currentHosts target=view}}
+ diva href=# class=hosts-tooltip not-active {{bindAttr
data-original-title=view.content.noCurrentHostsTooltip }}
+{{action showHosts view.versionStateMap.current target=view}}
{{view.content.currentHosts.length}}/a/div
div{{t common.current}}/div
/div
ambari git commit: AMBARI-9623 Admin page loaded after login/log out on secured cluster. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 6f4045eb3 - 2c4c81df3
AMBARI-9623 Admin page loaded after login/log out on secured cluster. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2c4c81df
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2c4c81df
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2c4c81df
Branch: refs/heads/trunk
Commit: 2c4c81df31a10889549554ccf8c7772918be5935
Parents: 6f4045e
Author: Andrii Tkach atk...@hortonworks.com
Authored: Fri Feb 13 15:11:13 2015 +0200
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Fri Feb 13 15:11:13 2015 +0200
--
.../main/admin/kerberos/wizard_controller.js | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c4c81df/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
index 9c85c67..6933536 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
@@ -46,9 +46,15 @@ App.KerberosWizardController = App.WizardController.extend({
failedTask: null
}),
- setCurrentStep: function (currentStep, completed) {
+ /**
+ * set current step
+ * @param {string} currentStep
+ * @param {boolean} completed
+ * @param {boolean} skipStateSave
+ */
+ setCurrentStep: function (currentStep, completed, skipStateSave) {
this._super(currentStep, completed);
-if (App.get('testMode')) {
+if (App.get('testMode') || skipStateSave) {
return;
}
App.clusterStatus.setClusterStatus({
@@ -290,8 +296,8 @@ App.KerberosWizardController = App.WizardController.extend({
* Clear all temporary data
*/
finish: function () {
-// The in-memory variable for currentstep should be reset to 1st step.
-this.setCurrentStep('1');
+// The in-memory variable for current step should be reset to 1st step.
+this.setCurrentStep('1', false, true);
// kerberos wizard namespace in the localStorage should be emptied
this.resetDbNamespace();
App.get('router.updateController').updateAll();
[2/2] ambari git commit: AMBARI-9619 Kerberos: integrate FE option to not generate kerb client krb5.conf. (ababiichuk)
AMBARI-9619 Kerberos: integrate FE option to not generate kerb client
krb5.conf. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/14cc17d5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/14cc17d5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/14cc17d5
Branch: refs/heads/trunk
Commit: 14cc17d5f0f7fe8642552a842d02c2f9ac343460
Parents: 9bb05ec
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Fri Feb 13 13:47:38 2015 +0200
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Fri Feb 13 15:57:43 2015 +0200
--
.../main/admin/kerberos/step2_controller.js | 4 ++-
ambari-web/app/data/HDP2/site_properties.js | 16 ++--
ambari-web/app/views/common/controls_view.js| 27 +++-
3 files changed, 37 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cc17d5/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
--
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
index b8f598b..5ec3be4 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
@@ -206,8 +206,10 @@ App.KerberosWizardStep2Controller =
App.WizardStep7Controller.extend({
var service = App.StackService.find().findProperty('serviceName',
'KERBEROS');
var serviceConfigTags = [];
var tag = 'version' + (new Date).getTime();
+var configs = this.get('stepConfigs')[0].get('configs')
+var skipKrbConfProperties = configs Em.get(configs.findProperty('name',
'manage_krb5_conf'), 'value') === false;
Object.keys(service.get('configTypes')).forEach(function (type) {
- if (!serviceConfigTags.someProperty('type', type)) {
+ if (!serviceConfigTags.someProperty('type', type) !(type ===
krb5-conf skipKrbConfProperties)) {
var obj = this.createKerberosSiteObj(type, tag);
obj.service_config_version_note =
Em.I18n.t('admin.kerberos.wizard.configuration.note');
serviceConfigTags.pushObject(obj);
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cc17d5/ambari-web/app/data/HDP2/site_properties.js
--
diff --git a/ambari-web/app/data/HDP2/site_properties.js
b/ambari-web/app/data/HDP2/site_properties.js
index 60bcbe0..f2da00f 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -1940,6 +1940,7 @@ var hdp2properties = [
displayName: Encryption Types,
serviceName: KERBEROS,
filename: kerberos-env.xml,
+displayType: multiLine,
category: Advanced kerberos-env
},
{
@@ -1995,6 +1996,17 @@ var hdp2properties = [
},
{
id: puppet var,
+name: manage_krb5_conf,
+displayName: Manage Kerberos client krb5.conf,
+displayType: checkbox,
+dependentConfigPattern: CATEGORY,
+serviceName: KERBEROS,
+filename: krb5-conf.xml,
+category: Advanced krb5-conf,
+index: 0
+ },
+ {
+id: puppet var,
name: conf_dir,
displayName: krb5-conf directory path,
value: ,
@@ -2007,7 +2019,7 @@ var hdp2properties = [
serviceName: KERBEROS,
filename: krb5-conf.xml,
category: Advanced krb5-conf,
-index: 0
+index: 1
},
{
id: puppet var,
@@ -2023,7 +2035,7 @@ var hdp2properties = [
serviceName: KERBEROS,
filename: krb5-conf.xml,
category: Advanced krb5-conf,
-index: 1
+index: 2
},
/* flume-agent
*/
{
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cc17d5/ambari-web/app/views/common/controls_view.js
--
diff --git a/ambari-web/app/views/common/controls_view.js
b/ambari-web/app/views/common/controls_view.js
index 083a226..bd5e7e6 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -273,17 +273,30 @@ App.ServiceConfigCheckboxWithDependencies =
App.ServiceConfigCheckbox.extend({
didInsertElement: function() {
this._super();
-this.showHideDependentConfigs();
+this.toggleDependentConfigs();
},
- showHideDependentConfigs: function() {
+ toggleDependentConfigs: function() {
if (this.get('serviceConfig.dependentConfigPattern')) {
- this.get('parentView.serviceConfigs').forEach(function(c) {
-if
(c.get('name').match(this.get('serviceConfig.dependentConfigPattern'))
c.get('name') != this.get('serviceConfig.name'))
-
ambari git commit: AMBARI-9624. Unit Test failure on testGetResources (Yurii Shylov via ncole)
Repository: ambari
Updated Branches:
refs/heads/trunk 6e815174a - ba557d103
AMBARI-9624. Unit Test failure on testGetResources (Yurii Shylov via ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ba557d10
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ba557d10
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ba557d10
Branch: refs/heads/trunk
Commit: ba557d1039199c26b26482d3ee647f12efc92ace
Parents: 6e81517
Author: Nate Cole nc...@hortonworks.com
Authored: Fri Feb 13 09:15:39 2015 -0500
Committer: Nate Cole nc...@hortonworks.com
Committed: Fri Feb 13 09:15:52 2015 -0500
--
.../server/controller/internal/UpgradeItemResourceProvider.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba557d10/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java
index 323b56f..351bbec 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -142,7 +143,7 @@ public class UpgradeItemResourceProvider extends
ReadOnlyResourceProvider {
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
-SetResource results = new HashSetResource();
+SetResource results = new LinkedHashSetResource();
SetString requestPropertyIds = getRequestPropertyIds(request, predicate);
for (MapString, Object propertyMap : getPropertyMaps(predicate)) {
ambari git commit: AMBARI-9621. Proceed Anyway should be changed to Proceed. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 2c4c81df3 - 9bb05eced
AMBARI-9621. Proceed Anyway should be changed to Proceed. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9bb05ece
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9bb05ece
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9bb05ece
Branch: refs/heads/trunk
Commit: 9bb05ecedfacdf68d97a401925ff276938f0423b
Parents: 2c4c81d
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Fri Feb 13 14:42:37 2015 +0200
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Fri Feb 13 15:51:20 2015 +0200
--
ambari-web/app/controllers/wizard/step4_controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9bb05ece/ambari-web/app/controllers/wizard/step4_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step4_controller.js
b/ambari-web/app/controllers/wizard/step4_controller.js
index 54b755f..3b889f9 100644
--- a/ambari-web/app/controllers/wizard/step4_controller.js
+++ b/ambari-web/app/controllers/wizard/step4_controller.js
@@ -427,7 +427,7 @@ App.WizardStep4Controller = Em.ArrayController.extend({
return App.ModalPopup.show({
header: Em.I18n.t('common.warning'),
body: Em.I18n.t('installer.step4.sparkWarning.popup.body'),
- primary: Em.I18n.t('common.proceedAnyway'),
+ primary: Em.I18n.t('common.proceed'),
onPrimary: function () {
self.onPrimaryPopupCallback();
this.hide();
ambari git commit: AMBARI-9615 - Agents Do Not Update Cached Alert JSON On New Configurations (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk ba557d103 - 12ed8b553
AMBARI-9615 - Agents Do Not Update Cached Alert JSON On New Configurations
(jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/12ed8b55
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/12ed8b55
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/12ed8b55
Branch: refs/heads/trunk
Commit: 12ed8b5538faf0fd4093ddd68ceee26f39d486ec
Parents: ba557d1
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Fri Feb 13 01:32:09 2015 -0500
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Fri Feb 13 10:37:40 2015 -0500
--
.../ambari_agent/AlertSchedulerHandler.py | 97 +---
.../src/main/python/ambari_agent/Controller.py | 24 ++---
.../python/ambari_agent/alerts/base_alert.py| 12 +--
.../python/ambari_agent/alerts/metric_alert.py | 7 +-
.../python/ambari_agent/alerts/port_alert.py| 25 +++--
.../python/ambari_agent/alerts/script_alert.py | 13 ++-
.../python/ambari_agent/alerts/web_alert.py | 6 +-
.../src/test/python/ambari_agent/TestAlerts.py | 40
.../AMBARI_METRICS/0.1.0/alerts.json| 2 +-
9 files changed, 151 insertions(+), 75 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/12ed8b55/ambari-agent/src/main/python/ambari_agent/AlertSchedulerHandler.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/AlertSchedulerHandler.py
b/ambari-agent/src/main/python/ambari_agent/AlertSchedulerHandler.py
index 87295d2..ba25936 100644
--- a/ambari-agent/src/main/python/ambari_agent/AlertSchedulerHandler.py
+++ b/ambari-agent/src/main/python/ambari_agent/AlertSchedulerHandler.py
@@ -63,8 +63,7 @@ class AlertSchedulerHandler():
try:
os.makedirs(cachedir)
except:
-logger.critical(Could not create the cache directory
{0}.format(cachedir))
-pass
+logger.critical([AlertScheduler] Could not create the cache directory
{0}.format(cachedir))
self._collector = AlertCollector()
self.__scheduler = Scheduler(AlertSchedulerHandler.APS_CONFIG)
@@ -82,33 +81,53 @@ class AlertSchedulerHandler():
if reschedule_jobs:
self.reschedule()
- def __update_definition_configs(self):
- updates the persisted configs and restarts the scheduler
-definitions = []
+ def __update_definition_configs(self, newConfigurations,
reschedule_jobs=False):
+
+Updates the definitions and configurations stored on disk. Optionally
+can reschedule jobs. Job rescheduling is only necessary when data that
+an existing job uses has changed. In many cases, configuration values
+have changed, yet no jobs need rescheduling.
+
+:param reschedule_jobs:
+:return:
+
+
+if reschedule_jobs:
+ logger.info([AlertScheduler] Updating {0} with the latest configuration
values and rescheduling alert jobs.format(self.FILENAME))
+else:
+ logger.info([AlertScheduler] Updating {0} with the latest configuration
values.format(self.FILENAME))
-all_commands = None
# Load definitions from json
try:
with open(os.path.join(self.cachedir, self.FILENAME), 'r') as fp:
all_commands = json.load(fp)
except IOError, ValueError:
- if (logger.isEnabledFor(logging.DEBUG)):
-logger.exception(Failed to load definitions.
{0}.format(traceback.format_exc()))
+ if logger.isEnabledFor(logging.DEBUG):
+logger.exception([AlertScheduler] Failed to load definitions.
{0}.format(traceback.format_exc()))
return
# Update definitions with current config
for command_json in all_commands:
- clusterName = '' if not 'clusterName' in command_json else
command_json['clusterName']
- hostName = '' if not 'hostName' in command_json else
command_json['hostName']
+ if 'clusterName' in command_json:
+clusterName = command_json['clusterName']
+ else:
+clusterName = ''
-
self.__update_config_values(command_json['configurations'],self.__config_maps[clusterName])
+ self.__update_config_values(command_json['configurations'],
+self.__config_maps[clusterName])
+
+ # update the configurations before writing the file back out
+ command_json['configurations'] = newConfigurations
# Save definitions to file
with open(os.path.join(self.cachedir, self.FILENAME), 'w') as f:
json.dump(all_commands, f, indent=2)
-self.reschedule_all()
+# only reschdule jobs if instructed to
+if reschedule_jobs:
+ self.reschedule_all()
+
def __make_function(self, alert_def):
return lambda: alert_def.collect()
@@ -130,7 +149,7 @@ class
ambari git commit: AMBARI-9609 - Views: Impersonator doesn't expose any way to POST a body or headers. (tbeerbower)
Repository: ambari
Updated Branches:
refs/heads/trunk 12ed8b553 - 4bdc4ad74
AMBARI-9609 - Views: Impersonator doesn't expose any way to POST a body or
headers. (tbeerbower)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4bdc4ad7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4bdc4ad7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4bdc4ad7
Branch: refs/heads/trunk
Commit: 4bdc4ad744aa5c1107021688a33308a4f06961b5
Parents: 12ed8b5
Author: tbeerbower tbeerbo...@hortonworks.com
Authored: Fri Feb 13 10:44:21 2015 -0500
Committer: tbeerbower tbeerbo...@hortonworks.com
Committed: Fri Feb 13 10:44:36 2015 -0500
--
.../server/view/HttpImpersonatorImpl.java | 17 ++
.../ambari/server/view/ViewContextImpl.java | 4 +-
.../apache/ambari/server/view/ViewRegistry.java | 22 +++
.../server/view/ViewURLStreamProvider.java | 60
.../server/view/HttpImpersonatorImplTest.java | 30 +-
.../ambari/server/view/ViewContextImplTest.java | 6 +-
.../server/view/ViewURLStreamProviderTest.java | 60 +---
.../apache/ambari/view/HttpImpersonator.java| 4 ++
.../apache/ambari/view/ImpersonatorSetting.java | 4 ++
.../apache/ambari/view/URLStreamProvider.java | 39 -
10 files changed, 183 insertions(+), 63 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4bdc4ad7/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
index 9d63d80..fe4e180 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
@@ -24,7 +24,6 @@ import org.apache.ambari.server.proxy.ProxyService;
import org.apache.ambari.view.ImpersonatorSetting;
import org.apache.ambari.view.ViewContext;
import org.apache.ambari.view.HttpImpersonator;
-import org.apache.ambari.server.controller.internal.AppCookieManager;
import java.io.BufferedReader;
import java.io.IOException;
@@ -45,7 +44,6 @@ import java.util.ArrayList;
*/
public class HttpImpersonatorImpl implements HttpImpersonator {
private ViewContext context;
- private AppCookieManager appCookieManager;
private FactoryHelper helper;
/**
@@ -57,15 +55,13 @@ public class HttpImpersonatorImpl implements
HttpImpersonator {
}
}
- public HttpImpersonatorImpl(ViewContext c, AppCookieManager
appCookieManager) {
+ public HttpImpersonatorImpl(ViewContext c) {
this.context = c;
-this.appCookieManager = appCookieManager;
this.helper = new FactoryHelper();
}
- public HttpImpersonatorImpl(ViewContext c, AppCookieManager
appCookieManager, FactoryHelper h) {
+ public HttpImpersonatorImpl(ViewContext c, FactoryHelper h) {
this.context = c;
-this.appCookieManager = appCookieManager;
this.helper = h;
}
@@ -115,18 +111,17 @@ public class HttpImpersonatorImpl implements
HttpImpersonator {
/**
* Returns the result of the HTTP request by setting the doAs
impersonation for the query param and username
* in @param impersonatorSetting.
- * @param urlToRead URL to request
+ * @param url URL to request
* @param requestType HTTP Request type: GET, PUT, POST, DELETE, etc.
* @param impersonatorSetting Setting class with default values for username
and doAs param name.
* To use different values, call the setters of
the object.
* @return Return a response as a String
*/
@Override
- public String requestURL(String urlToRead, String requestType, final
ImpersonatorSetting impersonatorSetting) {
+ public String requestURL(String url, String requestType, final
ImpersonatorSetting impersonatorSetting) {
String result = ;
BufferedReader rd;
-String line = null;
-String url = urlToRead;
+String line;
if
(url.toLowerCase().contains(impersonatorSetting.getDoAsParamName().toLowerCase()))
{
throw new IllegalArgumentException(URL cannot contain \ +
impersonatorSetting.getDoAsParamName() + \ parameter);
@@ -145,7 +140,7 @@ public class HttpImpersonatorImpl implements
HttpImpersonator {
HttpURLConnection connection = urlStreamProvider.processURL(url,
requestType, null, headers);
int responseCode = connection.getResponseCode();
- InputStream resultInputStream = null;
+ InputStream resultInputStream;
if (responseCode = ProxyService.HTTP_ERROR_RANGE_START) {
resultInputStream =
ambari git commit: AMBARI-9586 - Alerts: WEB type alerts fail in Kerberos secured cluster (Yurii Shylov via jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 27f763450 - 6bbed2779
AMBARI-9586 - Alerts: WEB type alerts fail in Kerberos secured cluster (Yurii
Shylov via jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6bbed277
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6bbed277
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6bbed277
Branch: refs/heads/trunk
Commit: 6bbed2779d05ef11294239f746abc40961fd83f7
Parents: 27f7634
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Fri Feb 13 12:08:19 2015 -0500
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Fri Feb 13 12:08:19 2015 -0500
--
.../python/ambari_agent/alerts/base_alert.py| 13 -
.../python/ambari_agent/alerts/web_alert.py | 55
.../src/test/python/ambari_agent/TestAlerts.py | 16 +++---
.../ambari/server/state/alert/AlertUri.java | 30 +++
.../FALCON/0.5.0.2.1/alerts.json| 6 ++-
.../common-services/HDFS/2.1.0.2.0/alerts.json | 12 +++--
.../common-services/OOZIE/4.0.0.2.0/alerts.json | 6 ++-
.../common-services/STORM/0.9.1.2.1/alerts.json | 6 ++-
.../common-services/YARN/2.1.0.2.0/alerts.json | 24 ++---
9 files changed, 129 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6bbed277/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py
b/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py
index 0b49b9b..2f2c997 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py
@@ -212,6 +212,8 @@ class BaseAlert(object):
https_property_key = None
https_property_value_key = None
default_port = None
+kerberos_keytab = None
+kerberos_principal = None
if 'http' in uri_structure:
http_key = self._find_lookup_property(uri_structure['http'])
@@ -228,12 +230,19 @@ class BaseAlert(object):
if 'default_port' in uri_structure:
default_port = uri_structure['default_port']
+if 'kerberos_keytab' in uri_structure:
+ kerberos_keytab =
self._find_lookup_property(uri_structure['kerberos_keytab'])
+
+if 'kerberos_principal' in uri_structure:
+ kerberos_principal =
self._find_lookup_property(uri_structure['kerberos_principal'])
+
AlertUriLookupKeys = namedtuple('AlertUriLookupKeys',
-'http https https_property https_property_value default_port')
+'http https https_property https_property_value default_port
kerberos_keytab kerberos_principal')
alert_uri_lookup_keys = AlertUriLookupKeys(http=http_key, https=https_key,
https_property=https_property_key,
-https_property_value=https_property_value_key,
default_port=default_port)
+https_property_value=https_property_value_key,
default_port=default_port,
+kerberos_keytab=kerberos_keytab, kerberos_principal=kerberos_principal)
return alert_uri_lookup_keys
http://git-wip-us.apache.org/repos/asf/ambari/blob/6bbed277/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
b/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
index fa578ce..8ee6606 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
@@ -20,7 +20,9 @@ limitations under the License.
import logging
import time
-import urllib2
+import subprocess
+import os
+
from alerts.base_alert import BaseAlert
from collections import namedtuple
from resource_management.libraries.functions.get_port_from_url import
get_port_from_url
@@ -29,6 +31,8 @@ from ambari_commons.inet_utils import resolve_address
logger = logging.getLogger()
+CURL_CONNECTION_TIMEOUT = '20'
+
class WebAlert(BaseAlert):
def __init__(self, alert_meta, alert_source_meta):
@@ -55,9 +59,10 @@ class WebAlert(BaseAlert):
web_response = self._make_web_request(url)
status_code = web_response.status_code
time_seconds = web_response.time_millis / 1000
+error_message = web_response.error_msg
if status_code == 0:
- return (self.RESULT_CRITICAL, [status_code, url, time_seconds])
+ return (self.RESULT_CRITICAL, [status_code, url, time_seconds,
error_message])
if status_code 400:
return (self.RESULT_OK, [status_code, url, time_seconds])
@@ -106,21 +111,49 @@ class WebAlert(BaseAlert):
Makes an http(s) request to a web
ambari git commit: AMBARI-9628 - Ranger rolling upgrade issue (Velmurugan Periasamy via jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk a4550d12d - 27f763450
AMBARI-9628 - Ranger rolling upgrade issue (Velmurugan Periasamy via
jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/27f76345
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/27f76345
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/27f76345
Branch: refs/heads/trunk
Commit: 27f763450f8f3c972940cbd599723c300ad9763f
Parents: a4550d1
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Fri Feb 13 12:03:02 2015 -0500
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Fri Feb 13 12:03:02 2015 -0500
--
.../common-services/RANGER/0.4.0/package/scripts/upgrade.py| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/27f76345/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/upgrade.py
--
diff --git
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/upgrade.py
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/upgrade.py
index 62abe8c..53ced96 100644
---
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/upgrade.py
+++
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/upgrade.py
@@ -26,4 +26,4 @@ def prestart(env, hdp_component):
import params
if params.version and
compare_versions(format_hdp_stack_version(params.version), '2.2.0.0') = 0:
-Execute(hdp-select set {0} {1}.format(hdp_component, version))
\ No newline at end of file
+Execute(hdp-select set {0} {1}.format(hdp_component, params.version))
\ No newline at end of file
ambari git commit: AMBARI-9632. MySQL server start failed on Ubuntu12 (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 4bdc4ad74 - a4550d12d
AMBARI-9632. MySQL server start failed on Ubuntu12 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a4550d12
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a4550d12
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a4550d12
Branch: refs/heads/trunk
Commit: a4550d12d6376a88da962985cf6fdf1257ad7ebf
Parents: 4bdc4ad
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Fri Feb 13 18:58:05 2015 +0200
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Fri Feb 13 18:58:05 2015 +0200
--
.../HIVE/0.12.0.2.0/package/scripts/mysql_server.py | 1 +
.../HIVE/0.12.0.2.0/package/scripts/mysql_service.py | 2 +-
.../HIVE/0.12.0.2.0/package/scripts/params.py| 1 +
.../HIVE/0.12.0.2.0/package/scripts/status_params.py | 1 +
.../src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py | 8
5 files changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a4550d12/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py
index 40ddb86..dcfb567 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py
@@ -55,6 +55,7 @@ class MysqlServer(Script):
def status(self, env):
import status_params
+env.set_params(status_params)
mysql_service(daemon_name=status_params.daemon_name, action='status')
http://git-wip-us.apache.org/repos/asf/ambari/blob/a4550d12/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py
index 136fe03..c48c1ef 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py
@@ -22,7 +22,7 @@ from resource_management import *
def mysql_service(daemon_name=None, action='start'):
- status_cmd = format(pgrep -l '^{daemon_name}$')
+ status_cmd = format(pgrep -l '^{process_name}$')
cmd = ('service', daemon_name, action)
if action == 'status':
http://git-wip-us.apache.org/repos/asf/ambari/blob/a4550d12/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py
index b10706a..c6bb3f2 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py
@@ -254,6 +254,7 @@ else:
log4j_exec_props = None
daemon_name = status_params.daemon_name
+process_name = status_params.process_name
hive_env_sh_template = config['configurations']['hive-env']['content']
hive_hdfs_user_dir = format(/user/{hive_user})
http://git-wip-us.apache.org/repos/asf/ambari/blob/a4550d12/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
index 66de02a..14300d5 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
@@ -30,6 +30,7 @@ hive_metastore_pid = 'hive.pid'
hcat_pid_dir = config['configurations']['hive-env']['hcat_pid_dir']
#hcat_pid_dir
webhcat_pid_file = format('{hcat_pid_dir}/webhcat.pid')
+process_name = 'mysqld'
if System.get_instance().os_family == suse or
System.get_instance().os_family == ubuntu:
ambari git commit: AMBARI-9627. RU - NodeManager failed to restart in Kerberized clusters (alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk 6bbed2779 - 19ff44731
AMBARI-9627. RU - NodeManager failed to restart in Kerberized clusters
(alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/19ff4473
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/19ff4473
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/19ff4473
Branch: refs/heads/trunk
Commit: 19ff44731b983f3251211411cb4678e987e445f2
Parents: 6bbed27
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Fri Feb 13 07:30:34 2015 -0800
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Fri Feb 13 09:41:11 2015 -0800
--
.../common-services/YARN/2.1.0.2.0/package/scripts/params.py| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/19ff4473/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params.py
index 53beb96..3f0b151 100644
---
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params.py
@@ -172,7 +172,10 @@ if security_enabled:
yarn_timelineservice_kinit_cmd = format({kinit_path_local} -kt
{_yarn_timelineservice_keytab} {_yarn_timelineservice_principal_name};)
if 'yarn.nodemanager.principal' in config['configurations']['yarn-site']:
-_nodemanager_principal_name =
config['configurations']['yarn-site']['yarn.nodemanager.principal']
+_nodemanager_principal_name =
default('/configurations/yarn-site/yarn.nodemanager.principal', None)
+if _nodemanager_principal_name:
+ _nodemanager_principal_name =
_nodemanager_principal_name.replace('_HOST', hostname.lower())
+
_nodemanager_keytab =
config['configurations']['yarn-site']['yarn.nodemanager.keytab']
nodemanager_kinit_cmd = format({kinit_path_local} -kt
{_nodemanager_keytab} {_nodemanager_principal_name};)
[2/3] ambari git commit: AMBARI-9630. Kerbeors wizard: ATS hostComponent should be deleted for HDP-2.0/2.1 stack (alexantonenko)
AMBARI-9630. Kerbeors wizard: ATS hostComponent should be deleted for
HDP-2.0/2.1 stack (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/94b3509f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/94b3509f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/94b3509f
Branch: refs/heads/trunk
Commit: 94b3509f4db0254ea738470b36e058b28f237fe5
Parents: 73416b6
Author: Alex Antonenko hiv...@gmail.com
Authored: Fri Feb 13 18:15:51 2015 +0200
Committer: Alex Antonenko hiv...@gmail.com
Committed: Fri Feb 13 20:03:02 2015 +0200
--
ambari-web/app/assets/test/tests.js | 1 +
.../main/admin/kerberos/step5_controller.js | 43 +++-
ambari-web/app/messages.js | 1 +
.../admin/kerberos/step5_controller_test.js | 43
4 files changed, 87 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/94b3509f/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index cd0dc1d..bd16cde 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -52,6 +52,7 @@ var files = ['test/init_model_test',
'test/controllers/main/admin/kerberos_test',
'test/controllers/main/admin/kerberos/kerberos_wizard_controler_test',
'test/controllers/main/admin/kerberos/step4_controller_test',
+ 'test/controllers/main/admin/kerberos/step5_controller_test',
'test/controllers/main/admin/stack_and_upgrade_controller_test',
'test/controllers/main/admin/serviceAccounts_controller_test',
'test/controllers/main/admin/highAvailability_controller_test',
http://git-wip-us.apache.org/repos/asf/ambari/blob/94b3509f/ambari-web/app/controllers/main/admin/kerberos/step5_controller.js
--
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step5_controller.js
b/ambari-web/app/controllers/main/admin/kerberos/step5_controller.js
index 49d2d5e..5cc06bd 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step5_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step5_controller.js
@@ -34,5 +34,46 @@ App.KerberosWizardStep5Controller =
App.KerberosProgressPageController.extend({
success: 'startPolling',
error: 'onTaskError'
});
+ },
+
+ loadStep: function() {
+this.checkComponentsRemoval();
+this._super();
+ },
+
+ /**
+ * remove Application Timeline Server component if needed.
+ */
+ checkComponentsRemoval: function() {
+if (App.Service.find().someProperty('serviceName', 'YARN')
!App.get('doesATSSupportKerberos')
!this.get('commands').contains('deleteATS')) {
+ this.get('commands').pushObject('deleteATS');
+}
+ },
+
+ /**
+ * Remove Application Timeline Server from the host.
+ * @returns {$.Deferred}
+ */
+ deleteATS: function() {
+return App.ajax.send({
+ name: 'common.delete.host_component',
+ sender: this,
+ data: {
+componentName: 'APP_TIMELINE_SERVER',
+hostName: App.HostComponent.find().findProperty('componentName',
'APP_TIMELINE_SERVER').get('hostName')
+ },
+ success: 'onDeleteATSSuccess',
+ error: 'onDeleteATSError'
+});
+ },
+
+ onDeleteATSSuccess: function() {
+this.onTaskCompleted();
+ },
+
+ onDeleteATSError: function(error) {
+if
(error.responseText.indexOf('org.apache.ambari.server.controller.spi.NoSuchResourceException')
!== -1) {
+ this.onDeleteATSSuccess();
+}
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/94b3509f/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index f794271..b5c0ee1 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -970,6 +970,7 @@ Em.I18n.translations = {
'admin.kerberos.wizard.progressPage.notice.inProgress': 'Please wait while
cluster is being kerberized',
'admin.kerberos.wizard.step4.info.body': 'Configure principal name and
keytab location for service users and hadoop service components.',
'admin.kerberos.wizard.step5.task0.title' : 'Stop Services',
+ 'admin.kerberos.wizard.step5.task1.title' : 'Delete ATS',
'admin.kerberos.wizard.step5.notice.inProgress': 'Please wait while services
are being stopped.',
'admin.kerberos.wizard.step5.notice.completed': 'Services have been
successfully stopped.',
'admin.kerberos.wizard.step6.notice.inProgress': 'Please wait while cluster
is being kerberized.',
[3/3] ambari git commit: AMBARI-9634. Custom command for Kerberos client should not display in UI (alexantonenko)
AMBARI-9634. Custom command for Kerberos client should not display in UI
(alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c337b6ea
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c337b6ea
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c337b6ea
Branch: refs/heads/trunk
Commit: c337b6ea5c740fcf3c0d88ac4bcf9d744273ee26
Parents: 94b3509
Author: Alex Antonenko hiv...@gmail.com
Authored: Fri Feb 13 19:18:34 2015 +0200
Committer: Alex Antonenko hiv...@gmail.com
Committed: Fri Feb 13 20:03:03 2015 +0200
--
ambari-web/app/views/main/host/summary.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c337b6ea/ambari-web/app/views/main/host/summary.js
--
diff --git a/ambari-web/app/views/main/host/summary.js
b/ambari-web/app/views/main/host/summary.js
index 72e7a91..92108b8 100644
--- a/ambari-web/app/views/main/host/summary.js
+++ b/ambari-web/app/views/main/host/summary.js
@@ -306,7 +306,7 @@ App.MainHostSummaryView = Em.View.extend({
* Get clients with custom commands
*/
clientsWithCustomCommands: function() {
-var clients = this.get('clients');
+var clients = this.get('clients').rejectProperty('componentName',
'KERBEROS_CLIENT');
var options = [];
var clientWithCommands;
clients.forEach(function(client) {
ambari git commit: AMBARI-9171. Keytab generation should use kerberos-env/encryption_types when creating key entries (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk c337b6ea5 - 53dbf69f9
AMBARI-9171. Keytab generation should use kerberos-env/encryption_types when
creating key entries (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/53dbf69f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/53dbf69f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/53dbf69f
Branch: refs/heads/trunk
Commit: 53dbf69f9d60891cf76179b10ff2019515022709
Parents: c337b6e
Author: Robert Levas rle...@hortonworks.com
Authored: Fri Feb 13 14:40:14 2015 -0500
Committer: Robert Levas rle...@hortonworks.com
Committed: Fri Feb 13 14:40:14 2015 -0500
--
.../kerberos/ADKerberosOperationHandler.java| 14 +-
.../kerberos/KerberosOperationHandler.java | 177 ++-
.../kerberos/MITKerberosOperationHandler.java | 6 +
.../1.10.3-10/configuration/kerberos-env.xml| 10 +-
.../1.10.3-10/configuration/krb5-conf.xml | 25 ++-
.../1.10.3-10/package/scripts/params.py | 12 +-
.../1.10.3-10/package/templates/krb5_conf.j2| 6 +
.../KERBEROS/configuration/krb5-conf.xml| 24 ++-
.../KERBEROS/package/templates/krb5_conf.j2 | 6 +
.../ADKerberosOperationHandlerTest.java | 2 +-
.../kerberos/KerberosOperationHandlerTest.java | 45 -
.../MITKerberosOperationHandlerTest.java| 33 ++--
.../journalnode-upgrade-hdfs-secure.json| 10 +-
.../stacks/2.2/configs/journalnode-upgrade.json | 10 +-
14 files changed, 328 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/53dbf69f/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java
index 4c1fdb5..2dbd50e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java
@@ -52,10 +52,6 @@ public class ADKerberosOperationHandler extends
KerberosOperationHandler {
private static final String LDAP_CONTEXT_FACTORY_CLASS =
com.sun.jndi.ldap.LdapCtxFactory;
- public final static String KERBEROS_ENV_LDAP_URL = ldap_url;
- public final static String KERBEROS_ENV_PRINCIPAL_CONTAINER_DN =
container_dn;
- public final static String KERBEROS_ENV_CREATE_ATTRIBUTES_TEMPLATE =
create_attributes_template;
-
/**
* A String containing the URL for the LDAP interface for the relevant
Active Directory
*/
@@ -146,6 +142,7 @@ public class ADKerberosOperationHandler extends
KerberosOperationHandler {
setAdministratorCredentials(administratorCredentials);
setDefaultRealm(realm);
+
setKeyEncryptionTypes(translateEncryptionTypes(kerberosConfiguration.get(KERBEROS_ENV_ENCRYPTION_TYPES),
\\s+));
this.ldapContext = createLdapContext();
this.searchControls = createSearchControls();
@@ -203,7 +200,7 @@ public class ADKerberosOperationHandler extends
KerberosOperationHandler {
throw new KerberosOperationException(principal is null);
}
-DeconstructedPrincipal deconstructPrincipal =
deconstructPrincipal(principal);
+DeconstructedPrincipal deconstructPrincipal =
createDeconstructPrincipal(principal);
try {
return (findPrincipalDN(deconstructPrincipal.getNormalizedPrincipal())
!= null);
@@ -237,8 +234,7 @@ public class ADKerberosOperationHandler extends
KerberosOperationHandler {
throw new KerberosOperationException(principal password is null);
}
-// TODO: (rlevas) pass components and realm in separately (AMBARI-9122)
-DeconstructedPrincipal deconstructedPrincipal =
deconstructPrincipal(principal);
+DeconstructedPrincipal deconstructedPrincipal =
createDeconstructPrincipal(principal);
String realm = deconstructedPrincipal.getRealm();
if (realm == null) {
@@ -327,7 +323,7 @@ public class ADKerberosOperationHandler extends
KerberosOperationHandler {
throw new KerberosOperationException(principal password is null);
}
-DeconstructedPrincipal deconstructPrincipal =
deconstructPrincipal(principal);
+DeconstructedPrincipal deconstructPrincipal =
createDeconstructPrincipal(principal);
try {
String dn =
findPrincipalDN(deconstructPrincipal.getNormalizedPrincipal());
@@ -368,7 +364,7 @@ public class ADKerberosOperationHandler extends
KerberosOperationHandler {
throw new KerberosOperationException(principal
ambari git commit: AMBARI-9607. Storm : DRPC Server does not start on secure cluster. (Eugene C via mahadev)
Repository: ambari
Updated Branches:
refs/heads/trunk 5a2b89464 - 7f752bed2
AMBARI-9607. Storm : DRPC Server does not start on secure cluster. (Eugene C
via mahadev)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7f752bed
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7f752bed
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7f752bed
Branch: refs/heads/trunk
Commit: 7f752bed246b38c252b82c1105b66ca7551bfd68
Parents: 5a2b894
Author: Mahadev Konar maha...@apache.org
Authored: Fri Feb 13 13:04:05 2015 -0800
Committer: Mahadev Konar maha...@apache.org
Committed: Fri Feb 13 13:04:12 2015 -0800
--
.../common-services/STORM/0.9.1.2.1/package/scripts/params.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7f752bed/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py
index 5164550..887132d 100644
---
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py
@@ -89,7 +89,7 @@ if security_enabled:
_nimbus_principal_name =
config['configurations']['storm-env']['nimbus_principal_name']
-nimbus_jaas_principal =
_nimbus_principal_name.replace('_HOST',nimbus_host.lower())
+nimbus_jaas_principal = _nimbus_principal_name.replace('_HOST',
_hostname_lowercase)
nimbus_bare_jaas_principal =
_nimbus_principal_name.replace('/_HOST','').replace('@'+kerberos_domain,'')
nimbus_keytab_path = config['configurations']['storm-env']['nimbus_keytab']
ambari git commit: AMBARI-9625. Autoclosing of expanding elements on Hosts page (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 53dbf69f9 - 5a2b89464
AMBARI-9625. Autoclosing of expanding elements on Hosts page (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5a2b8946
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5a2b8946
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5a2b8946
Branch: refs/heads/trunk
Commit: 5a2b894644334e06e3567f6936858db1873ecc5d
Parents: 53dbf69
Author: Alex Antonenko hiv...@gmail.com
Authored: Fri Feb 13 22:54:59 2015 +0200
Committer: Alex Antonenko hiv...@gmail.com
Committed: Fri Feb 13 22:54:59 2015 +0200
--
ambari-web/app/assets/test/tests.js | 1 +
ambari-web/app/controllers/main/host.js | 4 +
ambari-web/app/styles/application.less | 3 +-
ambari-web/app/templates/main/host.hbs | 4 +-
ambari-web/app/views/main/host.js | 43 -
ambari-web/test/views/main/host_test.js | 264 +++
6 files changed, 306 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5a2b8946/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index bd16cde..f9b3f18 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -166,6 +166,7 @@ var files = ['test/init_model_test',
'test/views/common/progress_bar_view_test',
'test/views/main/dashboard_test',
'test/views/main/menu_test',
+ 'test/views/main/host_test',
'test/views/main/alert_definitions_view_test',
'test/views/main/alerts/manage_alert_groups_view_test',
'test/views/main/alerts/manage_alert_notifications_view_test',
http://git-wip-us.apache.org/repos/asf/ambari/blob/5a2b8946/ambari-web/app/controllers/main/host.js
--
diff --git a/ambari-web/app/controllers/main/host.js
b/ambari-web/app/controllers/main/host.js
index 9511be8..2ea463b 100644
--- a/ambari-web/app/controllers/main/host.js
+++ b/ambari-web/app/controllers/main/host.js
@@ -43,6 +43,10 @@ App.MainHostController =
Em.ArrayController.extend(App.TableServerMixin, {
startIndex: 1,
+ expandedComponentsSections: [],
+
+ expandedVersionsSections: [],
+
/**
* Components which will be shown in component filter
* @returns {Array}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5a2b8946/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index ae5c756..11b310b 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -3222,7 +3222,6 @@ table.graphs {
}
}
.collapsed-list {
-display: none;
padding-left: 10px;
}
.host-table-versions {
@@ -5525,4 +5524,4 @@ input[type=checkbox].align-checkbox {
.bottom-border {
border-bottom: 1px solid #dd;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5a2b8946/ambari-web/app/templates/main/host.hbs
--
diff --git a/ambari-web/app/templates/main/host.hbs
b/ambari-web/app/templates/main/host.hbs
index c76ab34..3474686 100644
--- a/ambari-web/app/templates/main/host.hbs
+++ b/ambari-web/app/templates/main/host.hbs
@@ -139,14 +139,14 @@
{{/unless}}
{{view.currentVersion}}
/a
-div class=stack-versions collapsed-list
+div {{bindAttr class=view.isVersionsCollapsed:noDisplay:display
:stack-versions :collapsed-list}}
{{{view.versionlabels}}}
/div
/td
td class=host-table-components
a href=# class=expander {{action toggleComponents
target=view}} span {{bindAttr
class=view.isComponentsCollapsed:icon-caret-right:icon-caret-down}}/span
{{view.content.hostComponents.length}} {{pluralize
view.content.hostComponents.length singular=t:common.component
plural=t:common.components}}/a
-div class=host-components collapsed-list
+div {{bindAttr
class=view.isComponentsCollapsed:noDisplay:display :host-components
:collapsed-list}}
{{{view.labels}}}
/div
/td
http://git-wip-us.apache.org/repos/asf/ambari/blob/5a2b8946/ambari-web/app/views/main/host.js
--
diff --git a/ambari-web/app/views/main/host.js
b/ambari-web/app/views/main/host.js
index f116e6c..79e3572 100644
--- a/ambari-web/app/views/main/host.js
+++ b/ambari-web/app/views/main/host.js
@@
[2/2] ambari git commit: AMBARI-9626. Enabling ranger plugin config should modify dependent configs (srimanth)
AMBARI-9626. Enabling ranger plugin config should modify dependent configs
(srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ec4bed3a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ec4bed3a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ec4bed3a
Branch: refs/heads/trunk
Commit: ec4bed3a9e4de72fd04f1dfc81f5788f005ce293
Parents: 7f752be
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Fri Feb 13 07:09:05 2015 -0800
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Fri Feb 13 13:36:56 2015 -0800
--
.../app/controllers/wizard/step7_controller.js | 2 +-
ambari-web/app/data/HDP2.2/site_properties.js | 15 +-
ambari-web/app/messages.js | 2 +
.../configs/propertyDependence_footer.hbs | 4 +-
.../configs/modification_handlers/hbase.js | 126 ++
.../utils/configs/modification_handlers/hdfs.js | 58 +++
.../utils/configs/modification_handlers/hive.js | 127 ++
.../utils/configs/modification_handlers/knox.js | 73
.../utils/configs/modification_handlers/misc.js | 93 +++
.../modification_handler.js | 63 +++
.../configs/modification_handlers/storm.js | 75 +
.../configs/service_configs_by_category_view.js | 167 +++
ambari-web/app/views/common/controls_view.js| 13 +-
13 files changed, 700 insertions(+), 118 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec4bed3a/ambari-web/app/controllers/wizard/step7_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js
b/ambari-web/app/controllers/wizard/step7_controller.js
index 5f44e80..b0d8463 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -70,7 +70,7 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, {
return App.router.get('mainAdminKerberosController.securityEnabled');
}.property('App.router.mainAdminKerberosController.securityEnabled'),
/**
- * If miscConfigChange Modal is shown
+ * If configChangeObserver Modal is shown
* @type {bool}
*/
miscModalVisible: false,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec4bed3a/ambari-web/app/data/HDP2.2/site_properties.js
--
diff --git a/ambari-web/app/data/HDP2.2/site_properties.js
b/ambari-web/app/data/HDP2.2/site_properties.js
index d84d531..8ce4c0d 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -133,7 +133,8 @@ hdp22properties.push(
isOverridable: false,
filename: ranger-hdfs-plugin-properties.xml,
category: Advanced ranger-hdfs-plugin-properties,
-serviceName: HDFS
+serviceName: HDFS,
+index: 1
},
{
id: site property,
@@ -189,7 +190,8 @@ hdp22properties.push(
isOverridable: false,
filename: ranger-hive-plugin-properties.xml,
category: Advanced ranger-hive-plugin-properties,
-serviceName: HIVE
+serviceName: HIVE,
+index: 1
},
{
id: site property,
@@ -255,7 +257,8 @@ hdp22properties.push(
isOverridable: false,
filename: ranger-hbase-plugin-properties.xml,
category: Advanced ranger-hbase-plugin-properties,
-serviceName: HBASE
+serviceName: HBASE,
+index: 1
},
{
id: site property,
@@ -321,7 +324,8 @@ hdp22properties.push(
isOverridable: false,
filename: ranger-storm-plugin-properties.xml,
category: Advanced ranger-storm-plugin-properties,
-serviceName: STORM
+serviceName: STORM,
+index: 1
},
{
id: site property,
@@ -377,7 +381,8 @@ hdp22properties.push(
isOverridable: false,
filename: ranger-knox-plugin-properties.xml,
category: Advanced ranger-knox-plugin-properties,
-serviceName: KNOX
+serviceName: KNOX,
+index: 1
},
{
id: site property,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec4bed3a/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index b5c0ee1..74ab371 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -379,6 +379,8 @@ Em.I18n.translations = {
'services.storm.topology.metrics.total': 'Total topologies',
'services.storm.tasks.metrics.title': 'Number of tasks',
'services.storm.tasks.metrics.total': 'Total tasks',
+ 'services.storm.configs.range-plugin-enable.dialog.title': 'Enable Ranger
for STORM',
+ 'services.storm.configs.range-plugin-enable.dialog.message': 'Enabling
ambari git commit: AMBARI-9636. Modifications to configs for Tez and skipping deploy for Tez view (Hitesh Shah via srimanth)
Repository: ambari Updated Branches: refs/heads/trunk c0d435e51 - 41a25def2 AMBARI-9636. Modifications to configs for Tez and skipping deploy for Tez view (Hitesh Shah via srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/41a25def Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/41a25def Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/41a25def Branch: refs/heads/trunk Commit: 41a25def25056e3f59894fcf509687c8b117a673 Parents: c0d435e Author: Srimanth Gunturi sgunt...@hortonworks.com Authored: Fri Feb 13 17:21:36 2015 -0800 Committer: Srimanth Gunturi sgunt...@hortonworks.com Committed: Fri Feb 13 17:21:36 2015 -0800 -- .../HDP/2.2/services/TEZ/configuration/tez-site.xml | 11 ++- contrib/views/tez/pom.xml| 7 +++ 2 files changed, 17 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/41a25def/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml index 5d8286e..b85df9d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml @@ -310,8 +310,17 @@ property nametez.runtime.convert.user-payload.to.history-text/name -valuetrue/value +valuefalse/value descriptionWhether to publish configuration information to History logger/description /property + property +nametez.am.tez-ui.history-url.template/name + value__HISTORY_URL_BASE__?viewPath=%2F%23%2Ftez-app%2F__APPLICATION_ID__/value +descriptionTemplate to generate the History URL for a particular Tez Application. + Template replaces __APPLICATION_ID__ with the actual applicationId and + __HISTORY_URL_BASE__ with the value from the tez.tez-ui.history-url.base config property +/description + /property + /configuration http://git-wip-us.apache.org/repos/asf/ambari/blob/41a25def/contrib/views/tez/pom.xml -- diff --git a/contrib/views/tez/pom.xml b/contrib/views/tez/pom.xml index 9ad8aa7..6023401 100644 --- a/contrib/views/tez/pom.xml +++ b/contrib/views/tez/pom.xml @@ -48,6 +48,13 @@ plugins plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-deploy-plugin/artifactId +configuration + skiptrue/skip +/configuration + /plugin + plugin groupIdorg.codehaus.mojo/groupId artifactIdbuild-helper-maven-plugin/artifactId version1.8/version
[1/2] ambari git commit: AMBARI-9638. Slider View: Classloading issues due to incorrect version of guice (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 7f752bed2 - c0d435e51
AMBARI-9638. Slider View: Classloading issues due to incorrect version of guice
(srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c0d435e5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c0d435e5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c0d435e5
Branch: refs/heads/trunk
Commit: c0d435e51083b12913caa6e9e2cab73838f8d0dc
Parents: ec4bed3
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Fri Feb 13 13:36:49 2015 -0800
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Fri Feb 13 13:36:56 2015 -0800
--
contrib/views/slider/pom.xml | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c0d435e5/contrib/views/slider/pom.xml
--
diff --git a/contrib/views/slider/pom.xml b/contrib/views/slider/pom.xml
index 71025d4..feb7011 100644
--- a/contrib/views/slider/pom.xml
+++ b/contrib/views/slider/pom.xml
@@ -88,6 +88,11 @@
version${commons-compress.version}/version
/dependency
dependency
+ groupIdcom.google.inject/groupId
+ artifactIdguice/artifactId
+ version${guice.version}/version
+/dependency
+dependency
groupIdcom.googlecode.json-simple/groupId
artifactIdjson-simple/artifactId
/dependency
ambari git commit: AMBARI-9572. Enhancements to Spark - Ambari integration (Gautam Borad via srimanth)
Repository: ambari Updated Branches: refs/heads/trunk 41a25def2 - da7acb02d AMBARI-9572. Enhancements to Spark - Ambari integration (Gautam Borad via srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/da7acb02 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/da7acb02 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/da7acb02 Branch: refs/heads/trunk Commit: da7acb02d979fd2b4c910edbc13c77896937bd69 Parents: 41a25de Author: Srimanth Gunturi sgunt...@hortonworks.com Authored: Fri Feb 13 17:52:33 2015 -0800 Committer: Srimanth Gunturi sgunt...@hortonworks.com Committed: Fri Feb 13 17:52:33 2015 -0800 -- .../configuration/spark-javaopts-properties.xml | 27 .../SPARK/1.2.0.2.2/metainfo.xml| 63 - .../package/scripts/job_history_server.py | 10 +-- .../SPARK/1.2.0.2.2/package/scripts/params.py | 5 ++ .../1.2.0.2.2/package/scripts/service_check.py | 73 +--- .../1.2.0.2.2/package/scripts/setup_spark.py| 29 +++- .../1.2.0.2.2/package/scripts/spark_client.py | 2 +- .../stacks/HDP/2.2/role_command_order.json | 1 + 8 files changed, 173 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/da7acb02/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-javaopts-properties.xml -- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-javaopts-properties.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-javaopts-properties.xml new file mode 100644 index 000..c2db325 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-javaopts-properties.xml @@ -0,0 +1,27 @@ +?xml version=1.0 encoding=UTF-8? +!-- +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +-- +configuration supports_final=true + property +namecontent/name +descriptionSpark-javaopts-properties/description +value /value + /property +/configuration http://git-wip-us.apache.org/repos/asf/ambari/blob/da7acb02/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/metainfo.xml -- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/metainfo.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/metainfo.xml index 68833e0..b3ede88 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/metainfo.xml @@ -30,6 +30,29 @@ displayNameSpark History Server/displayName categoryMASTER/category cardinality1/cardinality + dependencies +dependency + nameHDFS/HDFS_CLIENT/name + scopehost/scope + auto-deploy +enabledtrue/enabled + /auto-deploy +/dependency +dependency + nameMAPREDUCE2/MAPREDUCE2_CLIENT/name + scopehost/scope + auto-deploy + enabledtrue/enabled + /auto-deploy +/dependency +dependency + nameYARN/YARN_CLIENT/name + scopehost/scope + auto-deploy +enabledtrue/enabled + /auto-deploy + /dependency + /dependencies commandScript scriptscripts/job_history_server.py/script scriptTypePYTHON/scriptType @@ -41,6 +64,29 @@ displayNameSpark Client/displayName categoryCLIENT/category cardinality1+/cardinality + dependencies +dependency + nameHDFS/HDFS_CLIENT/name + scopehost/scope + auto-deploy +enabledtrue/enabled +
ambari git commit: AMBARI-9641. Kerberos: Add Service - Review page broken after kerberization. (yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk da7acb02d - 182b34732
AMBARI-9641. Kerberos: Add Service - Review page broken after kerberization.
(yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/182b3473
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/182b3473
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/182b3473
Branch: refs/heads/trunk
Commit: 182b34732350e4a515950bc3667d3824bbd7f15a
Parents: da7acb0
Author: Yusaku Sako yus...@hortonworks.com
Authored: Fri Feb 13 18:02:57 2015 -0800
Committer: Yusaku Sako yus...@hortonworks.com
Committed: Fri Feb 13 18:02:57 2015 -0800
--
ambari-web/app/controllers/wizard/step7_controller.js | 7 ---
ambari-web/app/controllers/wizard/step8_controller.js | 10 --
2 files changed, 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/182b3473/ambari-web/app/controllers/wizard/step7_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js
b/ambari-web/app/controllers/wizard/step7_controller.js
index b0d8463..d910059 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -664,18 +664,11 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, {
this.get('selectedServiceNames').forEach(function (serviceName) {
if (!serviceConfigs.findProperty('serviceName', serviceName)) return;
var selectedService = serviceConfigs.findProperty('serviceName',
serviceName).set('selected', true);
-// add secure configs when security is enabled
-if (this.get('securityEnabled')) {
- this.addSecureConfigs(selectedService, serviceName);
-}
}, this);
this.get('installedServiceNames').forEach(function (serviceName) {
var serviceConfigObj = serviceConfigs.findProperty('serviceName',
serviceName);
var isInstallableService =
App.StackService.find(serviceName).get('isInstallable');
if (!isInstallableService) serviceConfigObj.set('showConfig', false);
-if (this.get('securityEnabled')) {
- this.setSecureConfigs(serviceConfigObj, serviceName);
-}
}, this);
// if HA is enabled - Remove SNameNode, hbase.rootdir should use Name
Service ID
if (App.get('isHaEnabled')) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/182b3473/ambari-web/app/controllers/wizard/step8_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js
b/ambari-web/app/controllers/wizard/step8_controller.js
index c3efff1..66429c2 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -215,16 +215,6 @@ App.WizardStep8Controller =
Em.Controller.extend(App.AddSecurityConfigs, App.wiz
if (this.get('content.serviceConfigProperties')) {
this.formatProperties();
this.loadConfigs();
- if (this.get('content.controllerName') != 'installerController'
this.get('securityEnabled')) {
-this.prepareSecureConfigs();
-this.get('content.services').filterProperty('isSelected', true)
- .mapProperty('serviceName').forEach(function (serviceName) {
-var config = this.get('secureConfigs').findProperty('serviceName',
serviceName);
-if (config) {
- this.setPrincipalValue(serviceName, config.name);
-}
- }, this);
- }
}
this.loadClusterInfo();
this.loadServices();
