ambari git commit: AMBARI-10230 Support config-dependency changes when they cross services. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk fb763311e - 9f87c98dc
AMBARI-10230 Support config-dependency changes when they cross services.
(ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9f87c98d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9f87c98d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9f87c98d
Branch: refs/heads/trunk
Commit: 9f87c98dcf352f2bae671556e74e06798ee0a5a6
Parents: fb76331
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Fri Mar 27 12:31:25 2015 +0200
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Fri Mar 27 12:31:25 2015 +0200
--
.../controllers/main/service/info/configs.js| 338 +--
ambari-web/app/messages.js | 3 +
.../mixins/common/configs/enhanced_configs.js | 586 ---
ambari-web/app/mixins/common/serverValidator.js | 77 ---
.../modal_popups/dependent_configs_list.hbs | 8 +-
.../common/modal_popups/select_groups_popup.hbs | 32 +
ambari-web/app/views.js | 1 +
.../dependent_configs_list_popup.js | 12 +-
.../common/modal_popups/select_groups_popup.js | 77 +++
.../main/service/info/config_test.js| 43 --
.../common/configs/enhanced_configs_test.js | 19 +-
11 files changed, 764 insertions(+), 432 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9f87c98d/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index b126798..19179a0 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -38,6 +38,10 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
requestInProgress: null,
selectedServiceConfigTypes: [],
selectedServiceSupportsFinal: [],
+
+ /**
+ * config groups for current service
+ */
configGroups: [],
allConfigs: [],
uiConfigs: [],
@@ -65,19 +69,6 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
}.property('selectedVersion', 'content.serviceName', 'dataIsLoaded'),
/**
- * array that contains config properties that were changed and
- * belongs to not current service
- * @returns {*|Array}
- */
- unsavedDependentConfigs: function() {
-return App.ConfigProperty.find().filter(function(cp) {
- return cp.get('stackConfigProperty.serviceName') !==
this.get('content.serviceName')
- this.get('dependentFileNames').contains(cp.get('fileName'))
- cp.get('isNotDefaultValue');
-}, this);
- },
-
- /**
* @type {boolean}
*/
canEdit: function () {
@@ -252,8 +243,6 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
*/
isInit: true,
- restartHosts: Em.A(),
-
/**
* On load function
*/
@@ -261,10 +250,12 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
console.log(TRACE: Loading configure for service);
var self = this;
if (App.get('supports.enhancedConfigs')) {
-
App.config.loadConfigTheme(this.get('content.serviceName')).then(function() {
-self.loadDependentConfigs().done(function () {
-
App.themesMapper.generateAdvancedTabs([self.get('content.serviceName')]);
-});
+
App.config.loadConfigTheme(this.get('content.serviceName')).always(function() {
+self.setDependentServices(self.get('content.serviceName'));
+
App.themesMapper.generateAdvancedTabs([self.get('content.serviceName')]);
+if (self.get('dependentServiceNames.length') 0) {
+
App.config.loadConfigCurrentVersions(self.get('dependentServiceNames'));
+}
});
}
this.clearStep();
@@ -333,73 +324,6 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
},
/**
- * this method defines dependent file names for configs
- * and load them to model
- * @method loadDependentConfigs
- */
- loadDependentConfigs: function() {
-/**
- * filter out configs for current service with
- * codepropertyDependedBycode
- * @type {Array}
- */
-var serviceStackProperties =
App.StackConfigProperty.find().filter(function(stackProperty) {
- return stackProperty.get('serviceName') ===
this.get('content.serviceName')
stackProperty.get('propertyDependedBy.length') 0
-}, this);
-
-/**
- * defines what fileNames should UI load
- */
-serviceStackProperties.forEach(function(serviceStackProperty) {
-
ambari git commit: AMBARI-10231 Implement checkbox and other existing controls for enhanced-configs. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 9f87c98dc - 3937b6f7a
AMBARI-10231 Implement checkbox and other existing controls for
enhanced-configs. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3937b6f7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3937b6f7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3937b6f7
Branch: refs/heads/trunk
Commit: 3937b6f7ade965e08925259d8c76bc50f856ae17
Parents: 9f87c98
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Fri Mar 27 13:56:30 2015 +0200
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Fri Mar 27 13:56:30 2015 +0200
--
ambari-web/app/styles/application.less | 3 ++
ambari-web/app/styles/widgets.less | 6 +++
.../templates/common/configs/restore_config.hbs | 23 ++
.../configs/service_config_layout_tab.hbs | 3 +-
.../configs/widgets/checkbox_config_widget.hbs | 24 +++
.../configs/widgets/combo_config_widget.hbs | 10 +
.../configs/widgets/directory_config_widget.hbs | 26
.../configs/widgets/list_config_widget.hbs | 2 +-
.../configs/widgets/slider_config_widget.hbs| 13 +++---
.../configs/widgets/string_config_widget.hbs| 26
.../configs/widgets/time_interval_spinner.hbs | 2 +-
.../configs/widgets/toggle_config_widget.hbs| 10 +
ambari-web/app/views.js | 4 ++
.../views/common/configs/restore_config_view.js | 29 +
.../widgets/checkbox_config_widget_view.js | 35
.../configs/widgets/config_widget_view.js | 17
.../widgets/directory_config_widget_view.js | 44
.../widgets/string_config_widget_view.js| 38 +
ambari-web/app/views/common/controls_view.js| 8 ++--
19 files changed, 292 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3937b6f7/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 3026fec..8993e21 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -5586,6 +5586,9 @@ input[type=checkbox].align-checkbox {
border-spacing: 5px;
border-collapse: separate;
table-layout: fixed;
+ .config-subsection {
+vertical-align: top;
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3937b6f7/ambari-web/app/styles/widgets.less
--
diff --git a/ambari-web/app/styles/widgets.less
b/ambari-web/app/styles/widgets.less
index aba89d8..5927668 100644
--- a/ambari-web/app/styles/widgets.less
+++ b/ambari-web/app/styles/widgets.less
@@ -151,3 +151,9 @@
margin-left: @undo-btn-margin;
}
}
+
+.checkbox-widget {
+ .widget-config-label {
+margin-left: 10px;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3937b6f7/ambari-web/app/templates/common/configs/restore_config.hbs
--
diff --git a/ambari-web/app/templates/common/configs/restore_config.hbs
b/ambari-web/app/templates/common/configs/restore_config.hbs
new file mode 100644
index 000..0633c50
--- /dev/null
+++ b/ambari-web/app/templates/common/configs/restore_config.hbs
@@ -0,0 +1,23 @@
+{{!
+* 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.
+}}
+
+{{#if view.visible}}
+ a class=btn btn-small href=# {{action restoreValue
target=view.parentView}}
+i class=icon-undo/i
+ /a
+{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3937b6f7/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs
--
diff --git
a/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs
ambari git commit: AMBARI-10234. Widgets validation rules should affect config internal valid/invalid state (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 3937b6f7a - 589faa74a
AMBARI-10234. Widgets validation rules should affect config internal
valid/invalid state (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/589faa74
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/589faa74
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/589faa74
Branch: refs/heads/trunk
Commit: 589faa74a9eb7a521ce2e601895d11bc4ad93743
Parents: 3937b6f
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Fri Mar 27 14:30:50 2015 +0200
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Fri Mar 27 14:30:50 2015 +0200
--
.../configs/widgets/list_config_widget_view.js | 16 +---
.../configs/widgets/slider_config_widget_view.js| 3 +++
.../configs/widgets/time_interval_spinner_view.js | 7 +--
.../configs/widgets/list_config_widget_view_test.js | 16
.../widgets/slider_config_widget_view_test.js | 4
.../widgets/time_interval_spinner_view_test.js | 4 +++-
6 files changed, 44 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/589faa74/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
--
diff --git
a/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
b/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
index 770f746..bd79501 100644
--- a/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
@@ -98,6 +98,12 @@ App.ListConfigWidgetView = App.ConfigWidgetView.extend({
*/
allowedToSelect: 1,
+ /**
+ * Minimum number of options needed to select (based on
codeconfig.valueAttributes.selection_cardinality/code)
+ * @type {number}
+ */
+ neededToSelect: 0,
+
templateName: require('templates/common/configs/widgets/list_config_widget'),
willInsertElement: function () {
@@ -177,24 +183,28 @@ App.ListConfigWidgetView = App.ConfigWidgetView.extend({
/**
* If user already selected maximum of allowed options, disable other options
+ * If user selected less than minimum of needed options, mark config.value
as invalid
* If user deselect some option, all disabled options become enabled
* Triggers on each option select/deselect
* @method checkSelectedItemsCount
*/
checkSelectedItemsCount: function () {
var allowedToSelect = this.get('allowedToSelect'),
+ neededToSelect = this.get('neededToSelect'),
currentlySelected =
this.get('options').filterProperty('isSelected').length,
selectionDisabled = allowedToSelect = currentlySelected;
this.get('options').filterProperty('isSelected',
false).setEach('isDisabled', selectionDisabled);
+this.set('config.errorMessage', currentlySelected neededToSelect ? 'You
should select at least ' + neededToSelect + ' item(s)' : '');
},
/**
- * Get maximum number of options allowed to select basing on config
cardinality value
+ * Get maximum number of options allowed to select and needed to select
basing on config cardinality value
* @method parseCardinality
*/
parseCardinality: function () {
-var cardinality =
numberUtils.getCardinalityValue(this.get('config.stackConfigProperty.valueAttributes.selection_cardinality'),
true);
-this.set('allowedToSelect', cardinality);
+var cardinality =
this.get('config.stackConfigProperty.valueAttributes.selection_cardinality');
+this.set('allowedToSelect', numberUtils.getCardinalityValue(cardinality,
true));
+this.set('neededToSelect', numberUtils.getCardinalityValue(cardinality,
false));
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/589faa74/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
--
diff --git
a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
index 58be1e2..118f50f 100644
--- a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
@@ -111,6 +111,7 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
var parsed = parseFunction(mirrorValue);
if (parsed = min parsed = max) {
this.set('isMirrorValueValid', true);
+this.set('config.errorMessage', '');
this.set('config.value', '' + parsed);
if (slider) {
slider.setValue(parsed);
@@ -118,10 +119,12 @@ App.SliderConfigWidgetView =
ambari git commit: AMBARI-10238. Refactor unitests for upgradeHelper.py (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 9b2291bfa - 4c348dfb0
AMBARI-10238. Refactor unitests for upgradeHelper.py (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4c348dfb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4c348dfb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4c348dfb
Branch: refs/heads/trunk
Commit: 4c348dfb086be12923b2084766186e2ef5797022
Parents: 9b2291b
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Fri Mar 27 16:39:11 2015 +0200
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Fri Mar 27 16:39:11 2015 +0200
--
ambari-server/src/main/python/upgradeHelper.py | 15 +-
.../src/test/python/TestUpgradeHelper.py| 909 ++-
2 files changed, 902 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c348dfb/ambari-server/src/main/python/upgradeHelper.py
--
diff --git a/ambari-server/src/main/python/upgradeHelper.py
b/ambari-server/src/main/python/upgradeHelper.py
index 11292e9..95d663a 100644
--- a/ambari-server/src/main/python/upgradeHelper.py
+++ b/ambari-server/src/main/python/upgradeHelper.py
@@ -451,19 +451,6 @@ class ConfigConst(object):
return self._config_types_const_definition[item[:-4]]
-# Copy file and save with file.# (timestamp)
-def backup_file(filePath):
- if filePath is not None and os.path.exists(filePath):
-timestamp = datetime.datetime.now()
-format = '%Y%m%d%H%M%S'
-try:
- shutil.copyfile(filePath, filePath + . + timestamp.strftime(format))
- os.remove(filePath)
-except Exception as e:
- Options.logger.warn('Could not backup file %s: %s' % (filePath,
str(e)))
- return 0
-
-
def write_mapping(hostmapping):
if os.path.isfile(Options.MR_MAPPING_FILE):
os.remove(Options.MR_MAPPING_FILE)
@@ -764,7 +751,7 @@ def modify_config_item(config_type, catalog):
# dfs.namenode.checkpoint.edits.dir,
# dfs.namenode.checkpoint.dir,
# dfs.namenode.checkpoint.period]
- Options.logger.info(Updating '%s' catalog item... % config_type )
+ Options.logger.info(Updating '%s' catalog item... % config_type)
if is_merged_copy: # Append configs to existed ones
tag, structured_resp = get_config_resp(config_type, False)
if structured_resp is not None:
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c348dfb/ambari-server/src/test/python/TestUpgradeHelper.py
--
diff --git a/ambari-server/src/test/python/TestUpgradeHelper.py
b/ambari-server/src/test/python/TestUpgradeHelper.py
index 2f47620..09dc360 100644
--- a/ambari-server/src/test/python/TestUpgradeHelper.py
+++ b/ambari-server/src/test/python/TestUpgradeHelper.py
@@ -22,18 +22,62 @@ from mock.mock import patch
from unittest import TestCase
import sys
+import os
import unittest
import upgradeHelper
-import StringIO
-import logging
+import json
+import copy
+from StringIO import StringIO
+
+
+class UpgradeCatalogFactoryMock(upgradeHelper.UpgradeCatalogFactory):
+ def __init__(self, data):
+self._load(data)
+
+ def _load(self, data):
+fn = StringIO(data)
+with patch(__builtin__.open) as open_mock:
+ open_mock.return_value = fn
+ super(UpgradeCatalogFactoryMock, self)._load()
class TestUpgradeHelper(TestCase):
original_curl = None
out = None
+ catalog_from = 1.3
+ catalog_to = 2.2
+ catalog_cfg_type = my type
+ test_catalog = {
+ version: 1.0,
+ stacks: [
+ {
+ name: HDP,
+ old-version: %s,
+ target-version: %s,
+ options: {
+ config-types: {
+ %s: {
+ merged-copy: yes
+ }
+ }
+ },
+ properties: {
+ %s: {
+ my property: my value
+ }
+ },
+ property-mapping: {
+ my replace property: my property 2
+ }
+ }
+ ]
+ }
+
def setUp(self):
# replace original curl call to mock
+self.test_catalog = self.test_catalog % (self.catalog_from,
self.catalog_to, self.catalog_cfg_type, self.catalog_cfg_type)
+
self.original_curl = upgradeHelper.curl
upgradeHelper.curl = self.magic_curl
@@ -41,10 +85,11 @@ class TestUpgradeHelper(TestCase):
upgradeHelper.logging.getLogger = MagicMock()
upgradeHelper.logging.FileHandler = MagicMock()
-self.out = StringIO.StringIO()
+self.out = StringIO()
sys.stdout = self.out
def magic_curl(self, *args, **kwargs):
+
def ret_object():
return
@@ -63,9 +108,8 @@ class TestUpgradeHelper(TestCase):
@patch(optparse.OptionParser)
@patch(upgradeHelper.modify_configs)
- @patch(upgradeHelper.backup_file)
ambari git commit: AMBARI-10237. 'Reload Page' popup issues: multiple instances, broken reload link, displaying popup after connection is established (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 589faa74a - 9b2291bfa
AMBARI-10237. 'Reload Page' popup issues: multiple instances, broken reload
link, displaying popup after connection is established (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9b2291bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9b2291bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9b2291bf
Branch: refs/heads/trunk
Commit: 9b2291bfa33017cf3ce64214b4da2a9eb7fa7259
Parents: 589faa7
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Fri Mar 27 16:24:30 2015 +0200
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Fri Mar 27 16:24:30 2015 +0200
--
ambari-web/app/assets/test/tests.js | 1 +
.../app/controllers/wizard/step3_controller.js | 32 +-
.../app/controllers/wizard/step9_controller.js | 10 +++-
ambari-web/app/mixins.js| 1 +
ambari-web/app/mixins/common/reload_popup.js| 52 +
ambari-web/app/utils/polling.js | 16 +++--
ambari-web/app/views.js | 1 -
.../views/common/modal_popups/reload_popup.js | 30 --
.../test/mixins/common/reload_popup_test.js | 61
9 files changed, 152 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9b2291bf/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 de14b7c..c668a9f 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -138,6 +138,7 @@ var files = ['test/init_model_test',
'test/mixins/common/configs/enhanced_configs_test',
'test/mixins/common/chart/storm_linear_time_test',
'test/mixins/common/localStorage_test',
+ 'test/mixins/common/reload_popup_test',
'test/mixins/common/serverValidator_test',
'test/mixins/common/table_server_view_mixin_test',
'test/mixins/main/host/details/host_components/decommissionable_test',
http://git-wip-us.apache.org/repos/asf/ambari/blob/9b2291bf/ambari-web/app/controllers/wizard/step3_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js
b/ambari-web/app/controllers/wizard/step3_controller.js
index 61cf64f..aeff5ad 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -20,7 +20,7 @@ var App = require('app');
var lazyloading = require('utils/lazy_loading');
var numberUtils = require('utils/number_utils');
-App.WizardStep3Controller = Em.Controller.extend({
+App.WizardStep3Controller = Em.Controller.extend(App.ReloadPopupMixin, {
name: 'wizardStep3Controller',
@@ -477,6 +477,7 @@ App.WizardStep3Controller = Em.Controller.extend({
* @return {$.ajax|null}
*/
doBootstrap: function () {
+var self = this;
if (this.get('stopBootstrap')) {
return null;
}
@@ -496,12 +497,14 @@ App.WizardStep3Controller = Em.Controller.extend({
timeout: App.timeout
}).
then(
- null,
- function () {
-App.showReloadPopup();
-console.log('Bootstrap failed');
- }
-);
+function () {
+ self.closeReloadPopup();
+},
+function () {
+ self.showReloadPopup();
+ console.log('Bootstrap failed');
+}
+ );
},
/**
@@ -578,6 +581,7 @@ App.WizardStep3Controller = Em.Controller.extend({
if (this.get('stopBootstrap')) {
return null;
}
+var self = this;
return App.ajax.send({
name: 'wizard.step3.is_hosts_registered',
sender: this,
@@ -588,12 +592,14 @@ App.WizardStep3Controller = Em.Controller.extend({
timeout: App.timeout
}).
then(
- null,
- function () {
-App.showReloadPopup();
-console.log('Error: Getting registered host information from the
server');
- }
-);
+function () {
+ self.closeReloadPopup();
+},
+function () {
+ self.showReloadPopup();
+ console.log('Error: Getting registered host information from the
server');
+}
+ );
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/9b2291bf/ambari-web/app/controllers/wizard/step9_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step9_controller.js
b/ambari-web/app/controllers/wizard/step9_controller.js
index e1bb090..4422f3f 100644
--- a/ambari-web/app/controllers/wizard/step9_controller.js
+++
ambari git commit: AMBARI-10233. Remove Redhat5 family from metainfo (aonishuk)
Repository: ambari Updated Branches: refs/heads/trunk 080b18260 - e2a68b660 AMBARI-10233. Remove Redhat5 family from metainfo (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e2a68b66 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e2a68b66 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e2a68b66 Branch: refs/heads/trunk Commit: e2a68b660b1be301ad8b31773efdd44ebb85eb6f Parents: 080b182 Author: Andrew Onishuk aonis...@hortonworks.com Authored: Fri Mar 27 16:40:35 2015 +0200 Committer: Andrew Onishuk aonis...@hortonworks.com Committed: Fri Mar 27 16:40:35 2015 +0200 -- .../resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml | 2 +- .../main/resources/common-services/GANGLIA/3.5.0/metainfo.xml| 4 ++-- .../main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml | 2 +- .../main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml | 4 ++-- .../common-services/HIVE/0.12.0.2.0/package/metainfo.xml | 4 ++-- .../main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml | 2 +- .../resources/common-services/KERBEROS/1.10.3-10/metainfo.xml| 2 +- .../main/resources/common-services/KNOX/0.5.0.2.2/metainfo.xml | 2 +- .../main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml | 2 +- .../src/main/resources/common-services/RANGER/0.4.0/metainfo.xml | 2 +- .../resources/common-services/SLIDER/0.60.0.2.2/metainfo.xml | 2 +- .../main/resources/common-services/SPARK/1.2.0.2.2/metainfo.xml | 2 +- .../src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml | 4 ++-- .../main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml| 2 +- .../main/resources/stacks/HDP/2.2/services/ACCUMULO/metainfo.xml | 2 +- .../main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml | 2 +- .../main/resources/stacks/HDP/2.2/services/FLUME/metainfo.xml| 2 +- .../main/resources/stacks/HDP/2.2/services/HBASE/metainfo.xml| 2 +- .../src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml | 2 +- .../src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml | 4 ++-- .../main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml| 2 +- .../src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml | 2 +- .../main/resources/stacks/HDP/2.2/services/SQOOP/metainfo.xml| 2 +- .../main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml| 2 +- .../src/main/resources/stacks/HDP/2.2/services/TEZ/metainfo.xml | 2 +- .../src/main/resources/stacks/HDP/2.2/services/YARN/metainfo.xml | 4 ++-- .../resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml | 2 +- .../main/resources/stacks/HDP/2.3/services/ACCUMULO/metainfo.xml | 2 +- .../main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml | 2 +- .../main/resources/stacks/HDP/2.3/services/FLUME/metainfo.xml| 2 +- .../main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml| 2 +- .../src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml | 2 +- .../src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml | 4 ++-- .../main/resources/stacks/HDP/2.3/services/KAFKA/metainfo.xml| 2 +- .../src/main/resources/stacks/HDP/2.3/services/KNOX/metainfo.xml | 2 +- .../main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml| 2 +- .../src/main/resources/stacks/HDP/2.3/services/PIG/metainfo.xml | 2 +- .../main/resources/stacks/HDP/2.3/services/RANGER/metainfo.xml | 2 +- .../main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml | 2 +- .../main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml| 2 +- .../main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml| 2 +- .../main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml| 2 +- .../src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml | 2 +- .../src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml | 4 ++-- .../resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml | 2 +- 45 files changed, 53 insertions(+), 53 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/e2a68b66/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml index 39b640c..9f85f66 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml @@ -65,7 +65,7 @@ osSpecifics osSpecific - osFamilyredhat5,redhat6,suse11/osFamily + osFamilyredhat6,suse11/osFamily packages package
ambari git commit: AMBARI-10239. Tez check fails when it is not on the same host with RM.(vbrodetskyi)
Repository: ambari Updated Branches: refs/heads/trunk e2a68b660 - 43e44d97b AMBARI-10239. Tez check fails when it is not on the same host with RM.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/43e44d97 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/43e44d97 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/43e44d97 Branch: refs/heads/trunk Commit: 43e44d97b57ae8391c0fc9b0b44b959afadcd2bc Parents: e2a68b6 Author: Vitaly Brodetskyi vbrodets...@hortonworks.com Authored: Fri Mar 27 16:50:26 2015 +0200 Committer: Vitaly Brodetskyi vbrodets...@hortonworks.com Committed: Fri Mar 27 16:50:26 2015 +0200 -- .../resources/stacks/HDP/2.1/services/YARN/metainfo.xml | 9 + 1 file changed, 9 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/43e44d97/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml index 6f79033..a508673 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml @@ -40,6 +40,15 @@ nameRESOURCEMANAGER/name categoryMASTER/category cardinality1-2/cardinality + dependencies + dependency + nameTEZ/TEZ_CLIENT/name + scopehost/scope + auto-deploy +enabledtrue/enabled + /auto-deploy + /dependency + /dependencies configuration-dependencies config-typecapacity-scheduler/config-type /configuration-dependencies
ambari git commit: AMBARI-10205 Incorrect description for ambari-metrics-assembly deb package (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 43e44d97b - bc09eaa25
AMBARI-10205 Incorrect description for ambari-metrics-assembly deb package
(dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bc09eaa2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc09eaa2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc09eaa2
Branch: refs/heads/trunk
Commit: bc09eaa251faee01d8d92c66937b9540bf5ddc1f
Parents: 43e44d9
Author: Dmytro Sen d...@apache.org
Authored: Fri Mar 27 17:03:02 2015 +0200
Committer: Dmytro Sen d...@apache.org
Committed: Fri Mar 27 17:03:43 2015 +0200
--
ambari-metrics/ambari-metrics-assembly/pom.xml | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/bc09eaa2/ambari-metrics/ambari-metrics-assembly/pom.xml
--
diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml
b/ambari-metrics/ambari-metrics-assembly/pom.xml
index e7054d6..cf7a92d 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -30,6 +30,7 @@
nameAmbari Metrics Assembly/name
packagingpom/packaging
version2.0.0-SNAPSHOT/version
+ descriptionAmbari Metrics/description
properties
collector.dir${project.basedir}/../ambari-metrics-timelineservice/collector.dir
@@ -40,6 +41,10 @@
kafka-sink.dir${project.basedir}/../ambari-metrics-kafka-sink/kafka-sink.dir
python.verpython gt;= 2.6/python.ver
python.develpython-devel/python.devel
+deb.publisherApache/deb.publisher
+deb.sectionuniverse/admin/deb.section
+deb.architecturei386 amd64/deb.architecture
+deb.priorityextra/deb.priority
deb.python.verpython (gt;= 2.6)/deb.python.ver
deb.architectureamd64/deb.architecture
deb.dependency.list${deb.python.ver},python-dev,gcc/deb.dependency.list
ambari git commit: AMBARI-10248. Add support for templeton.hive.extra.files property in webhcat-site.xml. (mahadev)
Repository: ambari Updated Branches: refs/heads/trunk 36ac57824 - aae47bd59 AMBARI-10248. Add support for templeton.hive.extra.files property in webhcat-site.xml. (mahadev) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aae47bd5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aae47bd5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aae47bd5 Branch: refs/heads/trunk Commit: aae47bd59249a4d98b6ea6692e602ea29d66e916 Parents: 36ac578 Author: Mahadev Konar maha...@apache.org Authored: Fri Mar 27 10:41:10 2015 -0700 Committer: Mahadev Konar maha...@apache.org Committed: Fri Mar 27 10:41:10 2015 -0700 -- .../2.2/services/HIVE/configuration/webhcat-site.xml| 12 1 file changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/aae47bd5/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml index 0454c1c..d95be55 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml @@ -109,4 +109,16 @@ limitations under the License. descriptionThe hdfs path to the Hadoop streaming jar file./description /property + property +nametempleton.hive.extra.files/name + value/etc/tez/conf/tez-site.xml,/usr/hdp/current/tez-client,/usr/hdp/current/tez-client/lib/value +descriptionThe resources in this list will be localized to the node running LaunchMapper and added to HADOOP_CLASSPTH + before launching 'hive' command. If the path /foo/bar is a directory, the contents of the the entire dir will be localized + and ./foo/* will be added to HADOOP_CLASSPATH. Note that since classpath path processing does not recurse into subdirectories, + the paths in this property may be overlapping. In the example above, ./tez-site.xml:./tez-client/*:./lib/* will be added to + HADOOP_CLASSPATH. + This can be used to specify config files, Tez artifacts, etc. This will be sent -files option of hadoop jar command thus + each path is interpreted by Generic Option Parser. It can be local or hdfs path. +/description + /property /configuration
ambari git commit: AMBARI-10215. Support config-groups functionality for enhanced-configs (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk aae47bd59 - e2ea86f4f
AMBARI-10215. Support config-groups functionality for enhanced-configs
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e2ea86f4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e2ea86f4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e2ea86f4
Branch: refs/heads/trunk
Commit: e2ea86f4fa384a454ac9fcab4336ad29ef3556d9
Parents: aae47bd
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Fri Mar 27 19:39:52 2015 +0200
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Fri Mar 27 19:42:01 2015 +0200
--
.../templates/common/configs/service_config_category.hbs | 5 -
.../common/configs/widgets/slider_config_widget.hbs | 10 ++
2 files changed, 10 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e2ea86f4/ambari-web/app/templates/common/configs/service_config_category.hbs
--
diff --git
a/ambari-web/app/templates/common/configs/service_config_category.hbs
b/ambari-web/app/templates/common/configs/service_config_category.hbs
index 0ab60c2..e7deefa 100644
--- a/ambari-web/app/templates/common/configs/service_config_category.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_category.hbs
@@ -121,7 +121,10 @@
span class=help-inline{{warnMessage}}/span
/div
{{#if this.isOverridden}}
-{{view App.ServiceConfigView.SCPOverriddenRowsView
serviceConfigPropertyBinding=this
isDefaultGroupSelectedBinding=controller.selectedConfigGroup.isDefault}}
+{{view App.ServiceConfigView.SCPOverriddenRowsView
+ serviceConfigPropertyBinding=this
+
isDefaultGroupSelectedBinding=controller.selectedConfigGroup.isDefault
+}}
{{/if}}
{{#if this.isComparison}}
{{view App.ServiceConfigView.SCPComparisonRowsView
serviceConfigPropertyBinding=this}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e2ea86f4/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs
--
diff --git
a/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs
b/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs
index 938359b..67f296a 100644
--- a/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs
@@ -29,12 +29,14 @@
{{/if}}
/div
/div
-{{view App.RestoreConfigView visibleBinding=view.undoAllowed}}
+{{#if view.config.isOriginalSCP}}
+ {{view App.RestoreConfigView visibleBinding=view.undoAllowed}}
+{{/if}}
{{#if view.overrideAllowed}}
{{#isAccessible ADMIN}}
div class=pull-left action-button
a class=btn btn-small href=# data-toggle=tooltip
-{{action createOverrideProperty view target=view.parentView}}
+{{action createOverrideProperty view.config
target=view.parentView}}
{{translateAttr data-original-title=common.override}}
i class=icon-plus-sign/i
/a
@@ -46,11 +48,11 @@
div class=ui-slider-wrapper
{{view Ember.TextField valueBinding=view.config.value class=input-mini
slider-input}}
/div
- {{#if view.config.isOverridden}}
+ {{#if view.config.overrides.length}}
{{view App.SliderConfigWidgetOverrideView
serviceConfigPropertyBinding=view.config
isDefaultGroupSelectedBinding=controller.selectedConfigGroup.isDefault
}}
{{/if}}
div class=clearfix/div
-/div
+/div
\ No newline at end of file
ambari git commit: AMBARI-10241. API to get theme resources for several services by one request. (mpapyrkovskyy)
Repository: ambari
Updated Branches:
refs/heads/trunk 250c24399 - fd9649dd0
AMBARI-10241. API to get theme resources for several services by one request.
(mpapyrkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fd9649dd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fd9649dd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fd9649dd
Branch: refs/heads/trunk
Commit: fd9649dd0083380b659894a79e486acfe0f4e0a3
Parents: 250c243
Author: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Authored: Fri Mar 27 17:26:44 2015 +0200
Committer: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Committed: Fri Mar 27 19:03:15 2015 +0200
--
.../server/api/resources/StackServiceResourceDefinition.java | 1 +
.../api/resources/StackServiceResourceDefinitionTest.java | 7 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd9649dd/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java
index 8a40a65..45302ff 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java
@@ -51,6 +51,7 @@ public class StackServiceResourceDefinition extends
BaseResourceDefinition {
setChildren.add(new
SubResourceDefinition(Resource.Type.StackConfiguration));
setChildren.add(new
SubResourceDefinition(Resource.Type.StackServiceComponent));
setChildren.add(new SubResourceDefinition(Type.StackArtifact));
+setChildren.add(new SubResourceDefinition(Resource.Type.Theme));
return setChildren;
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd9649dd/ambari-server/src/test/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinitionTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinitionTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinitionTest.java
index 1b12738..65f54d5 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinitionTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinitionTest.java
@@ -42,11 +42,12 @@ public class StackServiceResourceDefinitionTest {
ResourceDefinition def = new StackServiceResourceDefinition();
SetSubResourceDefinition subResources = def.getSubResourceDefinitions();
-assertEquals(3, subResources.size());
+assertEquals(4, subResources.size());
boolean configReturned = false;
boolean componentReturned = false;
boolean artifactReturned = false;
+boolean themesReturned = false;
for (SubResourceDefinition subResource : subResources) {
Resource.Type type = subResource.getType();
@@ -56,10 +57,14 @@ public class StackServiceResourceDefinitionTest {
componentReturned = true;
} else if (type.equals(Resource.Type.StackArtifact)) {
artifactReturned = true;
+ } else if (type.equals(Resource.Type.Theme)) {
+themesReturned = true;
}
}
+
assertTrue(configReturned);
assertTrue(componentReturned);
assertTrue(artifactReturned);
+assertTrue(themesReturned);
}
}
[2/2] ambari git commit: AMBARI-10244. Ubuntu7 title for debian7 repourl is confusing (aonishuk)
AMBARI-10244. Ubuntu7 title for debian7 repourl is confusing (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/36ac5782
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/36ac5782
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/36ac5782
Branch: refs/heads/trunk
Commit: 36ac57824554600b63fe8e979bcf888047bdd14a
Parents: fd9649d
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Fri Mar 27 19:27:02 2015 +0200
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Fri Mar 27 19:27:02 2015 +0200
--
.../src/main/python/ambari_agent/HostCleanup.py | 31 +-
.../src/main/python/ambari_agent/HostInfo.py| 17 +++---
.../TestMonitorWebserverResource.py | 17 +-
.../TestRepositoryResource.py | 51
.../src/main/python/ambari_commons/firewall.py | 4 +-
.../src/main/python/ambari_commons/os_check.py | 37 +++-
.../ambari_commons/resources/os_family.json | 13 -
.../core/providers/__init__.py | 3 +
.../python/resource_management/core/system.py | 2 +-
.../libraries/functions/__init__.py | 1 +
.../libraries/functions/get_lzo_packages.py | 47 +++
.../libraries/functions/packages_analyzer.py| 12 ++--
.../libraries/providers/__init__.py | 3 +
.../libraries/providers/monitor_webserver.py| 3 +-
.../libraries/providers/repository.py | 14 ++---
.../server/configuration/Configuration.java | 3 +-
.../server/state/stack/JsonOsFamilyEntry.java | 49
.../server/state/stack/LatestRepoCallable.java | 3 +-
.../ambari/server/state/stack/OsFamily.java | 56 +-
.../ambari_server/dbConfiguration_linux.py | 8 +--
.../src/main/python/ambari_server/utils.py | 37 +++-
ambari-server/src/main/python/bootstrap.py | 34 ---
.../GANGLIA/3.5.0/package/scripts/functions.py | 3 +-
.../3.5.0/package/scripts/ganglia_server.py | 3 +-
.../GANGLIA/3.5.0/package/scripts/params.py | 9 +--
.../HDFS/2.1.0.2.0/package/scripts/hdfs.py | 5 +-
.../HDFS/2.1.0.2.0/package/scripts/params.py| 24 ++--
.../HIVE/0.12.0.2.0/package/scripts/params.py | 3 +-
.../0.12.0.2.0/package/scripts/status_params.py | 3 +-
.../package/scripts/kerberos_server.py | 17 +++---
.../1.10.3-10/package/scripts/params.py | 7 +--
.../OOZIE/4.0.0.2.0/package/scripts/oozie.py| 4 +-
.../OOZIE/4.0.0.2.0/package/scripts/params.py | 18 +-
.../2.0.6/hooks/after-INSTALL/scripts/params.py | 3 +-
.../2.0.6/hooks/before-ANY/scripts/params.py| 3 +-
.../scripts/repo_initialization.py | 3 +-
.../2.0.6/hooks/before-START/scripts/params.py | 3 +-
.../resources/stacks/HDP/2.3/repos/repoinfo.xml | 2 +-
.../HDP/2.3/services/ACCUMULO/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/FALCON/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/FLUME/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/HBASE/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/HDFS/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/HIVE/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/KAFKA/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/KNOX/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/PIG/metainfo.xml| 2 +-
.../stacks/HDP/2.3/services/RANGER/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/SLIDER/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/SPARK/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/SQOOP/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/STORM/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/TEZ/metainfo.xml| 2 +-
.../stacks/HDP/2.3/services/YARN/metainfo.xml | 4 +-
.../HDP/2.3/services/ZOOKEEPER/metainfo.xml | 2 +-
ambari-server/src/test/python/TestBootstrap.py | 61
ambari-server/src/test/python/TestUtils.py | 58 +--
58 files changed, 426 insertions(+), 286 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/36ac5782/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
b/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
index ca2bcf4..a725d43 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
@@ -41,12 +41,6 @@ from ambari_commons.os_family_impl import OsFamilyImpl,
OsFamilyFuncImpl
logger = logging.getLogger()
-PACKAGE_ERASE_CMD = {
- redhat: yum erase -y {0},
- suse: zypper -n -q remove {0},
- ubuntu: /usr/bin/apt-get -y -q
[1/2] ambari git commit: AMBARI-10244. Ubuntu7 title for debian7 repourl is confusing (aonishuk)
Repository: ambari Updated Branches: refs/heads/trunk fd9649dd0 - 36ac57824 http://git-wip-us.apache.org/repos/asf/ambari/blob/36ac5782/ambari-server/src/main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml index f837458..a63db43 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml @@ -39,7 +39,7 @@ /packages /osSpecific osSpecific - osFamilyubuntu7,ubuntu12/osFamily + osFamilydebian7,ubuntu12/osFamily packages package namesqoop-2-3-.*/name http://git-wip-us.apache.org/repos/asf/ambari/blob/36ac5782/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml index e2384a3..363cc79 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml @@ -32,7 +32,7 @@ /packages /osSpecific osSpecific - osFamilyubuntu7,ubuntu12/osFamily + osFamilydebian7,ubuntu12/osFamily packages package namestorm-2-3-.*/name http://git-wip-us.apache.org/repos/asf/ambari/blob/36ac5782/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml index 5e9d443..863f7dd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml @@ -32,7 +32,7 @@ /packages /osSpecific osSpecific - osFamilyubuntu7,ubuntu12/osFamily + osFamilydebian7,ubuntu12/osFamily packages package nametez-2-3-.*/name http://git-wip-us.apache.org/repos/asf/ambari/blob/36ac5782/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml index a8b35b3..d8ea8e8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml @@ -39,7 +39,7 @@ /packages /osSpecific osSpecific - osFamilyubuntu7,ubuntu12/osFamily + osFamilydebian7,ubuntu12/osFamily packages package namehadoop-2-3-.*-yarn/name @@ -65,7 +65,7 @@ /packages /osSpecific osSpecific - osFamilyubuntu7,ubuntu12/osFamily + osFamilydebian7,ubuntu12/osFamily packages package namehadoop-2-3-.*-mapreduce/name http://git-wip-us.apache.org/repos/asf/ambari/blob/36ac5782/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml index fd41fcc..276b057 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml @@ -31,7 +31,7 @@ /packages /osSpecific osSpecific - osFamilyubuntu7,ubuntu12/osFamily + osFamilydebian7,ubuntu12/osFamily packages package namezookeeper-2-3-.*/name http://git-wip-us.apache.org/repos/asf/ambari/blob/36ac5782/ambari-server/src/test/python/TestBootstrap.py -- diff --git a/ambari-server/src/test/python/TestBootstrap.py b/ambari-server/src/test/python/TestBootstrap.py index 373a4be..0dadaed 100644 --- a/ambari-server/src/test/python/TestBootstrap.py +++ b/ambari-server/src/test/python/TestBootstrap.py @@ -25,6 +25,7 @@ import logging import tempfile import pprint +from ambari_commons.os_check import OSCheck from
ambari git commit: AMBARI-10240. increase hive user ulimit, proved too low and cause problems for lot customers (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk bc09eaa25 - 8073405a4
AMBARI-10240. increase hive user ulimit, proved too low and cause problems for
lot customers (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8073405a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8073405a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8073405a
Branch: refs/heads/trunk
Commit: 8073405a4f0d29fdbdb91fe8080a5d30de6d10ba
Parents: bc09eaa
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Fri Mar 27 17:17:18 2015 +0200
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Fri Mar 27 17:17:18 2015 +0200
--
.../HIVE/0.12.0.2.0/package/templates/hive.conf.j2 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8073405a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hive.conf.j2
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hive.conf.j2
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hive.conf.j2
index 2953eed..8b7f8bd 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hive.conf.j2
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hive.conf.j2
@@ -31,5 +31,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-{{hive_user}} - nofile 32768
-{{hive_user}} - nproc 65536
+{{hive_user}} - nofile 32000
+{{hive_user}} - nproc 16000
[1/4] ambari git commit: AMBARI-10224: [WinTP2] Merge HDPWIN ZOOKEEPER package scripts to common services (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 8073405a4 - 391cc7a6f
AMBARI-10224: [WinTP2] Merge HDPWIN ZOOKEEPER package scripts to common
services (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e4686db5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e4686db5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e4686db5
Branch: refs/heads/trunk
Commit: e4686db52f7bc624634f67524c961cfee89296bc
Parents: 8073405
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Fri Mar 27 08:49:55 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Fri Mar 27 08:49:55 2015 -0700
--
.../3.4.5.2.0/package/scripts/params.py | 79 +---
.../3.4.5.2.0/package/scripts/params_linux.py | 98
.../3.4.5.2.0/package/scripts/params_windows.py | 61
.../3.4.5.2.0/package/scripts/service_check.py | 16
.../3.4.5.2.0/package/scripts/status_params.py | 22 +++--
.../3.4.5.2.0/package/scripts/zookeeper.py | 53 ---
.../package/scripts/zookeeper_client.py | 45 +
.../package/scripts/zookeeper_server.py | 53 +++
.../package/scripts/zookeeper_service.py| 11 +++
.../ZOOKEEPER/package/scripts/params.py | 59
.../ZOOKEEPER/package/scripts/service_check.py | 34 ---
.../package/scripts/service_mapping.py | 22 -
.../ZOOKEEPER/package/scripts/zookeeper.py | 63 -
.../package/scripts/zookeeper_client.py | 43 -
.../package/scripts/zookeeper_server.py | 51 --
.../package/templates/configuration.xsl.j2 | 42 -
.../ZOOKEEPER/package/templates/zoo.cfg.j2 | 69 --
.../2.0.6/ZOOKEEPER/test_zookeeper_client.py| 8 +-
.../2.0.6/ZOOKEEPER/test_zookeeper_server.py| 7 ++
.../src/test/python/stacks/utils/RMFTestCase.py | 6 ++
20 files changed, 329 insertions(+), 513 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4686db5/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params.py
index 4d48399..fbefec9 100644
---
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params.py
@@ -18,81 +18,10 @@ limitations under the License.
Ambari Agent
+from ambari_commons import OSCheck
-from resource_management.libraries.functions.version import
format_hdp_stack_version, compare_versions
-from resource_management.libraries.functions.default import default
-from resource_management import *
-import status_params
-
-# server configurations
-config = Script.get_config()
-tmp_dir = Script.get_tmp_dir()
-
-stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
-hdp_stack_version = format_hdp_stack_version(stack_version_unformatted)
-
-stack_name = default(/hostLevelParams/stack_name, None)
-
-# New Cluster Stack Version that is defined during the RESTART of a Rolling
Upgrade
-version = default(/commandParams/version, None)
-
-#hadoop params
-if hdp_stack_version != and compare_versions(hdp_stack_version, '2.2') = 0:
- role_root = zookeeper-client
- command_role = default(/role, )
-
- if command_role == ZOOKEEPER_SERVER:
-role_root = zookeeper-server
-
- zk_home = format(/usr/hdp/current/{role_root})
- zk_bin = format(/usr/hdp/current/{role_root}/bin)
- zk_cli_shell = format(/usr/hdp/current/{role_root}/bin/zkCli.sh)
+if OSCheck.is_windows_family():
+ from params_windows import *
else:
- zk_home = /usr
- zk_bin = /usr/lib/zookeeper/bin
- zk_cli_shell = /usr/lib/zookeeper/bin/zkCli.sh
-
-
-config_dir = /etc/zookeeper/conf
-zk_user = config['configurations']['zookeeper-env']['zk_user']
-hostname = config['hostname']
-user_group = config['configurations']['cluster-env']['user_group']
-zk_env_sh_template = config['configurations']['zookeeper-env']['content']
-
-zk_log_dir = config['configurations']['zookeeper-env']['zk_log_dir']
-zk_data_dir = config['configurations']['zoo.cfg']['dataDir']
-zk_pid_dir = status_params.zk_pid_dir
-zk_pid_file = status_params.zk_pid_file
-zk_server_heapsize = -Xmx1024m
+ from params_linux import *
-client_port = default('/configurations/zoo.cfg/clientPort', None)
-
-if 'zoo.cfg' in config['configurations']:
- zoo_cfg_properties_map = config['configurations']['zoo.cfg']
-else:
- zoo_cfg_properties_map = {}
[3/4] ambari git commit: AMBARI-10226: [WinTP2] Merge HDPWIN PIG package scripts to common services (jluniya)
AMBARI-10226: [WinTP2] Merge HDPWIN PIG package scripts to common services (jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/626ef03d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/626ef03d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/626ef03d Branch: refs/heads/trunk Commit: 626ef03daf847ad4e480ce5eb27fca7f6f9fcb81 Parents: 194df08 Author: Jayush Luniya jlun...@hortonworks.com Authored: Fri Mar 27 08:58:57 2015 -0700 Committer: Jayush Luniya jlun...@hortonworks.com Committed: Fri Mar 27 08:58:57 2015 -0700 -- .../PIG/0.12.0.2.0/package/scripts/params.py| 60 +-- .../0.12.0.2.0/package/scripts/params_linux.py | 78 .../package/scripts/params_windows.py | 36 + .../PIG/0.12.0.2.0/package/scripts/pig.py | 20 - .../0.12.0.2.0/package/scripts/pig_client.py| 26 +-- .../0.12.0.2.0/package/scripts/service_check.py | 16 .../2.1/services/PIG/package/scripts/params.py | 37 -- .../2.1/services/PIG/package/scripts/pig.py | 49 .../services/PIG/package/scripts/pig_client.py | 41 -- .../PIG/package/scripts/service_check.py| 34 - 10 files changed, 172 insertions(+), 225 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/626ef03d/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params.py -- diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params.py index 2be49fa..9e3148e 100644 --- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params.py @@ -18,61 +18,9 @@ limitations under the License. Ambari Agent +from ambari_commons import OSCheck -from resource_management.libraries.functions.version import format_hdp_stack_version, compare_versions -from resource_management import * - -# server configurations -config = Script.get_config() -tmp_dir = Script.get_tmp_dir() - -stack_name = default(/hostLevelParams/stack_name, None) - -stack_version_unformatted = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) - -# New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade -version = default(/commandParams/version, None) - -#hadoop params -if hdp_stack_version != and compare_versions(hdp_stack_version, '2.2') = 0: - hadoop_bin_dir = /usr/hdp/current/hadoop-client/bin - hadoop_home = '/usr/hdp/current/hadoop-client' - pig_bin_dir = '/usr/hdp/current/pig-client/bin' +if OSCheck.is_windows_family(): + from params_windows import * else: - hadoop_bin_dir = /usr/bin - hadoop_home = '/usr' - pig_bin_dir = - -hadoop_conf_dir = /etc/hadoop/conf -pig_conf_dir = /etc/pig/conf -hdfs_user = config['configurations']['hadoop-env']['hdfs_user'] -hdfs_principal_name = config['configurations']['hadoop-env']['hdfs_principal_name'] -hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab'] -smokeuser = config['configurations']['cluster-env']['smokeuser'] -smokeuser_principal = config['configurations']['cluster-env']['smokeuser_principal_name'] -user_group = config['configurations']['cluster-env']['user_group'] -security_enabled = config['configurations']['cluster-env']['security_enabled'] -smoke_user_keytab = config['configurations']['cluster-env']['smokeuser_keytab'] -kinit_path_local = functions.get_kinit_path() -pig_env_sh_template = config['configurations']['pig-env']['content'] - -# not supporting 32 bit jdk. -java64_home = config['hostLevelParams']['java_home'] - -pig_properties = config['configurations']['pig-properties']['content'] - -log4j_props = config['configurations']['pig-log4j']['content'] - -import functools -#create partial functions with common arguments for every HdfsDirectory call -#to create hdfs directory we need to call params.HdfsDirectory in code -HdfsDirectory = functools.partial( - HdfsDirectory, - conf_dir=hadoop_conf_dir, - hdfs_user=hdfs_user, - security_enabled = security_enabled, - keytab = hdfs_user_keytab, - kinit_path_local = kinit_path_local, - bin_dir = hadoop_bin_dir -) + from params_linux import * http://git-wip-us.apache.org/repos/asf/ambari/blob/626ef03d/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py -- diff --git
[4/4] ambari git commit: AMBARI-10227: [WinTP2] Merge HDPWIN FALCON package scripts to common services (jluniya)
AMBARI-10227: [WinTP2] Merge HDPWIN FALCON package scripts to common services
(jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/391cc7a6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/391cc7a6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/391cc7a6
Branch: refs/heads/trunk
Commit: 391cc7a6f6bad90888603c31c46c282a3e91a306
Parents: 626ef03
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Fri Mar 27 09:03:00 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Fri Mar 27 09:03:00 2015 -0700
--
.../FALCON/0.5.0.2.1/package/scripts/falcon.py | 30 ++
.../0.5.0.2.1/package/scripts/falcon_client.py | 30 --
.../0.5.0.2.1/package/scripts/falcon_server.py | 43
.../FALCON/0.5.0.2.1/package/scripts/params.py | 91 +---
.../0.5.0.2.1/package/scripts/params_linux.py | 107 +++
.../0.5.0.2.1/package/scripts/params_windows.py | 46
.../0.5.0.2.1/package/scripts/service_check.py | 15 ++-
.../0.5.0.2.1/package/scripts/status_params.py | 29 ++---
.../services/FALCON/package/scripts/falcon.py | 41 ---
.../FALCON/package/scripts/falcon_client.py | 37 ---
.../FALCON/package/scripts/falcon_server.py | 44
.../services/FALCON/package/scripts/params.py | 45
.../FALCON/package/scripts/service_check.py | 33 --
.../FALCON/package/scripts/service_mapping.py | 20
.../package/templates/client.properties.j2 | 42
.../stacks/2.1/FALCON/test_falcon_server.py | 1 +
16 files changed, 261 insertions(+), 393 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/391cc7a6/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
--
diff --git
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
index 7404f04..a56ba5c 100644
---
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
+++
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
@@ -19,7 +19,10 @@ limitations under the License.
from resource_management import *
import os.path
+from ambari_commons import OSConst
+from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
+@OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT)
def falcon(type, action = None):
import params
if action == 'config':
@@ -122,3 +125,30 @@ def falcon(type, action = None):
File(params.server_pid_file,
action='delete'
)
+
+@OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY)
+def falcon(type, action = None):
+ import params
+ if action == 'config':
+env = Environment.get_instance()
+# These 2 parameters are used in ../templates/client.properties.j2
+env.config.params[falcon_host] = params.falcon_host
+env.config.params[falcon_port] = params.falcon_port
+File(os.path.join(params.falcon_conf_dir, 'falcon-env.sh'),
+ content=InlineTemplate(params.falcon_env_sh_template)
+)
+File(os.path.join(params.falcon_conf_dir, 'client.properties'),
+ content=Template('client.properties.j2')
+)
+PropertiesFile(os.path.join(params.falcon_conf_dir, 'runtime.properties'),
+ properties=params.falcon_runtime_properties
+)
+PropertiesFile(os.path.join(params.falcon_conf_dir, 'startup.properties'),
+ properties=params.falcon_startup_properties
+)
+
+ if type == 'server':
+if action == 'start':
+ Service(params.falcon_win_service_name, action=start)
+if action == 'stop':
+ Service(params.falcon_win_service_name, action=stop)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/391cc7a6/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py
--
diff --git
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py
index ea9f154..cf95692 100644
---
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py
+++
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py
@@ -19,26 +19,27 @@ limitations under the License.
from resource_management import *
from falcon import falcon
-
+from ambari_commons import OSConst
+from ambari_commons.os_family_impl import
[2/4] ambari git commit: AMBARI-10225: [WinTP2] Merge HDPWIN TEZ package scripts to common services (jluniya)
AMBARI-10225: [WinTP2] Merge HDPWIN TEZ package scripts to common services
(jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/194df087
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/194df087
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/194df087
Branch: refs/heads/trunk
Commit: 194df087131fe9a254e6c0e2c47499305bc72075
Parents: e4686db
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Fri Mar 27 08:54:00 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Fri Mar 27 08:54:00 2015 -0700
--
.../TEZ/0.4.0.2.1/package/scripts/params.py | 58 ++-
.../0.4.0.2.1/package/scripts/params_linux.py | 76
.../0.4.0.2.1/package/scripts/params_windows.py | 30
.../0.4.0.2.1/package/scripts/service_check.py | 14
.../TEZ/0.4.0.2.1/package/scripts/tez.py| 21 +++---
.../TEZ/0.4.0.2.1/package/scripts/tez_client.py | 26 +--
.../2.1/services/TEZ/package/scripts/params.py | 30
.../2.1/services/TEZ/package/scripts/tez.py | 31
.../services/TEZ/package/scripts/tez_client.py | 42 ---
9 files changed, 155 insertions(+), 173 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/194df087/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params.py
index b58bcd6..a10c1d4 100644
---
a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params.py
@@ -17,59 +17,9 @@ See the License for the specific language governing
permissions and
limitations under the License.
+from ambari_commons import OSCheck
-from resource_management.libraries.functions.version import
format_hdp_stack_version, compare_versions
-from resource_management import *
-
-# server configurations
-config = Script.get_config()
-tmp_dir = Script.get_tmp_dir()
-
-stack_name = default(/hostLevelParams/stack_name, None)
-
-# This is expected to be of the form #.#.#.#
-stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
-hdp_stack_version = format_hdp_stack_version(stack_version_unformatted)
-
-# New Cluster Stack Version that is defined during the RESTART of a Rolling
Upgrade
-version = default(/commandParams/version, None)
-
-if hdp_stack_version != and compare_versions(hdp_stack_version, '2.2') = 0:
- hadoop_bin_dir = /usr/hdp/current/hadoop-client/bin
- path_to_tez_examples_jar = /usr/hdp/{hdp_version}/tez/tez-examples*.jar
+if OSCheck.is_windows_family():
+ from params_windows import *
else:
- hadoop_bin_dir = /usr/bin
- path_to_tez_examples_jar = /usr/lib/tez/tez-mapreduce-examples*.jar
-hadoop_conf_dir = /etc/hadoop/conf
-
-kinit_path_local = functions.get_kinit_path()
-security_enabled = config['configurations']['cluster-env']['security_enabled']
-smokeuser = config['configurations']['cluster-env']['smokeuser']
-smokeuser_principal =
config['configurations']['cluster-env']['smokeuser_principal_name']
-smoke_user_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
-hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
-hdfs_principal_name =
config['configurations']['hadoop-env']['hdfs_principal_name']
-hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab']
-
-config_dir_prefix = /etc/tez
-config_dir = format({config_dir_prefix}/conf)
-
-hadoop_home = '/usr'
-java64_home = config['hostLevelParams']['java_home']
-
-tez_user = config['configurations']['tez-env']['tez_user']
-user_group = config['configurations']['cluster-env']['user_group']
-tez_env_sh_template = config['configurations']['tez-env']['content']
-
-import functools
-# Create partial functions with common arguments for every HdfsDirectory call
-# to create hdfs directory we need to call params.HdfsDirectory in code
-HdfsDirectory = functools.partial(
- HdfsDirectory,
- conf_dir=hadoop_conf_dir,
- hdfs_user=hdfs_user,
- security_enabled=security_enabled,
- keytab=hdfs_user_keytab,
- kinit_path_local=kinit_path_local,
- bin_dir=hadoop_bin_dir
-)
+ from params_linux import *
http://git-wip-us.apache.org/repos/asf/ambari/blob/194df087/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params_linux.py
ambari git commit: AMBARI-10223 Draw Number widget from the relevant retrieved widget data from the API. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 391cc7a6f - bfb586d85
AMBARI-10223 Draw Number widget from the relevant retrieved widget data from
the API. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bfb586d8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bfb586d8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bfb586d8
Branch: refs/heads/trunk
Commit: bfb586d8562c7ffe54e9f313f0eac22389e075f5
Parents: 391cc7a
Author: Andrii Tkach atk...@hortonworks.com
Authored: Fri Mar 27 17:19:26 2015 +0200
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Fri Mar 27 18:11:33 2015 +0200
--
.../HBASE/Append_num_ops__Delete_num_ops.json | 7 +-
.../data/widget_layouts/HBASE/stack_layout.json | 116 -
ambari-web/app/assets/test/tests.js | 1 +
ambari-web/app/mixins.js| 1 +
ambari-web/app/mixins/common/widget_mixin.js| 179 ++
ambari-web/app/models/widget.js | 2 +
ambari-web/app/styles/widget_layout.less| 39 +++
.../templates/common/widget/template_widget.hbs | 22 ++
.../app/templates/main/service/info/summary.hbs | 6 +-
ambari-web/app/views.js | 1 +
.../views/common/widget/graph_widget_view.js| 153 +---
.../views/common/widget/template_widget_view.js | 96
.../test/mixins/common/widget_mixin_test.js | 238 +++
13 files changed, 594 insertions(+), 267 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/bfb586d8/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops__Delete_num_ops.json
--
diff --git
a/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops__Delete_num_ops.json
b/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops__Delete_num_ops.json
index 97d1bee..2db12a0 100644
---
a/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops__Delete_num_ops.json
+++
b/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops__Delete_num_ops.json
@@ -1,4 +1,3 @@
-
{
href :
http://c6401.ambari.apache.org:8080/api/v1/clusters/c1/services/HBASE/components/HBASE_REGIONSERVER?fields=metrics/hbase/regionserver/Server/Append_num_ops[1426795139,1426798739,15];,
ServiceComponentInfo : {
@@ -8,8 +7,14 @@
},
metrics : {
hbase : {
+ ipc : {
+IPC : {
+ numOpenConnections : 11.5
+}
+ },
regionserver : {
Server : {
+ percentFilesLocal : 99,
Append_num_ops : [
[
2.0,
http://git-wip-us.apache.org/repos/asf/ambari/blob/bfb586d8/ambari-web/app/assets/data/widget_layouts/HBASE/stack_layout.json
--
diff --git a/ambari-web/app/assets/data/widget_layouts/HBASE/stack_layout.json
b/ambari-web/app/assets/data/widget_layouts/HBASE/stack_layout.json
index f921ad7..4c8d3ee 100644
--- a/ambari-web/app/assets/data/widget_layouts/HBASE/stack_layout.json
+++ b/ambari-web/app/assets/data/widget_layouts/HBASE/stack_layout.json
@@ -19,21 +19,6 @@
widget_type: GRAPH,
metrics:[
{
-name: regionserver.Server.Get_num_ops,
-widget_id: metrics/hbase/regionserver/Server/Get_num_ops,
-category: ,
-service_name: HBASE,
-component_name: HBASE_REGIONSERVER,
-host_component_criteria : isActive=true
- },
- {
-name: regionserver.Server.Scan_num_ops,
-widget_id: metrics/hbase/regionserver/Server/Scan_num_ops,
-category: ,
-service_name: HBASE,
-component_name: HBASE_REGIONSERVER
- },
- {
name: regionserver.Server.Append_num_ops,
widget_id:
metrics/hbase/regionserver/Server/Append_num_ops,
category: ,
@@ -46,20 +31,6 @@
category: ,
service_name: HBASE,
component_name: HBASE_REGIONSERVER
- },
- {
-name: regionserver.Server.Increment_num_ops,
-widget_id:
metrics/hbase/regionserver/Server/Increment_num_ops,
-category: ,
-service_name: HBASE,
-component_name: HBASE_REGIONSERVER
- },
- {
-name: regionserver.Server.Mutate_num_ops,
-widget_id:
metrics/hbase/regionserver/Server/Mutate_num_ops,
-category: ,
-service_name: HBASE,
-component_name: HBASE_REGIONSERVER
}
],
[4/5] ambari git commit: AMBARI-10252. Alert Definitions table: no tooltip over State value after it's toggled(alexantonenko)
AMBARI-10252. Alert Definitions table: no tooltip over State value after it's
toggled(alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5f7de770
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5f7de770
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5f7de770
Branch: refs/heads/trunk
Commit: 5f7de77033f0ade33207312f3af12daeadeff9b2
Parents: 77ccdf2
Author: Alex Antonenko hiv...@gmail.com
Authored: Fri Mar 27 19:46:34 2015 +0200
Committer: Alex Antonenko hiv...@gmail.com
Committed: Fri Mar 27 21:51:59 2015 +0200
--
ambari-web/app/controllers/main/alert_definitions_controller.js | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5f7de770/ambari-web/app/controllers/main/alert_definitions_controller.js
--
diff --git a/ambari-web/app/controllers/main/alert_definitions_controller.js
b/ambari-web/app/controllers/main/alert_definitions_controller.js
index f1f7066..a1222e5 100644
--- a/ambari-web/app/controllers/main/alert_definitions_controller.js
+++ b/ambari-web/app/controllers/main/alert_definitions_controller.js
@@ -69,6 +69,9 @@ App.MainAlertDefinitionsController =
Em.ArrayController.extend({
toggleDefinitionState: function (alertDefinition) {
var newState = !alertDefinition.get('enabled');
alertDefinition.set('enabled', newState);
+Em.run.next(function () {
+ App.tooltip($('.enable-disable-button'));
+});
return App.ajax.send({
name: 'alerts.update_alert_definition',
sender: this,
[1/5] ambari git commit: AMBARI-10254. Provide original config controls in enhanced-configs (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk e2ea86f4f - e0a810734
AMBARI-10254. Provide original config controls in enhanced-configs
(alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e0a81073
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e0a81073
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e0a81073
Branch: refs/heads/trunk
Commit: e0a8107346dee966219b71361add0b88bb3404bc
Parents: 5f7de77
Author: Alex Antonenko hiv...@gmail.com
Authored: Fri Mar 27 20:58:08 2015 +0200
Committer: Alex Antonenko hiv...@gmail.com
Committed: Fri Mar 27 21:51:59 2015 +0200
--
ambari-web/app/mappers/configs/themes_mapper.js | 167 ++-
ambari-web/app/models/service_config.js | 2 +-
.../configs/widgets/string_config_widget.hbs| 26 ---
.../configs/widgets/textfield_config_widget.hbs | 27 +++
ambari-web/app/utils/ajax/ajax.js | 4 +-
ambari-web/app/utils/config.js | 6 +-
ambari-web/app/views.js | 2 +
.../configs/service_config_layout_tab_view.js | 2 +-
.../widgets/directory_config_widget_view.js | 5 +-
.../widgets/number_config_widget_view.js| 37
.../widgets/password_config_widget_view.js | 35
.../widgets/string_config_widget_view.js| 10 +-
.../test/mappers/configs/themes_mapper_test.js | 164 +-
13 files changed, 293 insertions(+), 194 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e0a81073/ambari-web/app/mappers/configs/themes_mapper.js
--
diff --git a/ambari-web/app/mappers/configs/themes_mapper.js
b/ambari-web/app/mappers/configs/themes_mapper.js
index 48ee991..7fde958 100644
--- a/ambari-web/app/mappers/configs/themes_mapper.js
+++ b/ambari-web/app/mappers/configs/themes_mapper.js
@@ -60,87 +60,102 @@ App.themesMapper = App.QuickDataMapper.create({
map: function (json) {
var tabs = [];
-if (Em.get(json, artifact_data.Theme.configuration.layouts)) {
- var serviceName = Em.get(json, Artifacts.service_name);
- Em.get(json,
artifact_data.Theme.configuration.layouts).forEach(function(layout) {
-
-if (layout.tabs) {
- layout.tabs.forEach(function(tab) {
-var parsedTab = this.parseIt(tab, this.get(tabConfig));
-parsedTab.id = serviceName + _ + tab.name;
-parsedTab.service_name = serviceName;
-
-if (Em.get(tab, layout.sections)) {
- var sections = [];
- Em.get(tab, layout.sections).forEach(function(section) {
-var parsedSection = this.parseIt(section,
this.get(sectionConfig));
-parsedSection.tab_id = parsedTab.id;
-
-if (section.subsections) {
- var subSections = [];
- section.subsections.forEach(function(subSection) {
-var parsedSubSection = this.parseIt(subSection,
this.get(subSectionConfig));
-parsedSubSection.section_id = parsedSection.id;
-
-subSections.push(parsedSubSection);
- }, this);
- App.store.loadMany(this.get(subSectionModel), subSections);
- parsedSection.sub_sections = subSections.mapProperty(id);
-}
-
-sections.push(parsedSection);
- }, this);
-
- App.store.loadMany(this.get(sectionModel), sections);
- parsedTab.sections = sections.mapProperty(id);
-}
-
-tabs.push(parsedTab);
- }, this);
-}
-
- }, this);
-}
-// TODO Foreign key reference below throw some unclear error
-/**
- * create tie between codestackConfigPropertycode and
codesubSectioncode
- */
-if (Em.get(json, artifact_data.Theme.placement.configs)) {
- Em.get(json,
artifact_data.Theme.placement.configs).forEach(function(configLink) {
-
-var configId = this.getConfigId(configLink);
-var subSectionId = configLink[subsection-name];
-
-var subSection = App.SubSection.find(subSectionId);
-var configProperty = App.StackConfigProperty.find(configId);
-if (configProperty subSection) {
- subSection.get('configProperties').pushObject(configProperty);
- configProperty.set('subSection', subSection);
-} else {
- console.warn('there is no such property: ' + configId + '. Or
subsection: ' + subSectionId);
-}
- }, this);
-}
+json.items.forEach(function(item) {
+ this.mapThemeLayouts(item, tabs);
+ this.mapThemeConfigs(item);
+ this.mapThemeWidgets(item);
+}, this);
-/**
- * add widget
[5/5] ambari git commit: AMBARI-10250. Views: Property validation not fully works during editing (alexantonenko)
AMBARI-10250. Views: Property validation not fully works during editing
(alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/59c24852
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/59c24852
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/59c24852
Branch: refs/heads/trunk
Commit: 59c248521169e9752596eb78e76f52a411567b7a
Parents: 6ef5786
Author: Alex Antonenko hiv...@gmail.com
Authored: Fri Mar 27 19:33:46 2015 +0200
Committer: Alex Antonenko hiv...@gmail.com
Committed: Fri Mar 27 21:51:59 2015 +0200
--
.../controllers/ambariViews/ViewsEditCtrl.js | 17 ++---
.../ui/admin-web/app/views/ambariViews/create.html | 2 +-
.../ui/admin-web/app/views/ambariViews/edit.html | 4 ++--
3 files changed, 13 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/59c24852/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
index 8e720a6..cbf3b0c 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
@@ -77,7 +77,7 @@ angular.module('ambariAdminConsole')
}
$scope.permissions = [];
-
+
reloadViewPrivileges();
$scope.editSettingsDisabled = true;
@@ -118,7 +118,7 @@ angular.module('ambariAdminConsole')
$scope.settingsForm.$setPristine();
};
-
+
$scope.editConfigurationDisabled = true;
$scope.togglePropertiesEditing = function () {
$scope.editConfigurationDisabled = !$scope.editConfigurationDisabled;
@@ -132,7 +132,7 @@ angular.module('ambariAdminConsole')
}
};
$scope.saveConfiguration = function() {
-if( $scope.propertiesForm.$valid ){
+
return View.updateInstance($routeParams.viewId, $routeParams.version,
$routeParams.instanceId, {
'ViewInstanceInfo':{
'properties': $scope.configuration
@@ -143,7 +143,11 @@ angular.module('ambariAdminConsole')
$scope.propertiesForm.$setPristine();
})
.catch(function(data) {
-var errorMessage = data.statusText;
+var errorMessage = data.data.message;
+
+//TODO: maybe the BackEnd should sanitize the string beforehand?
+errorMessage = errorMessage.substr(errorMessage.indexOf(\{));
+
if (data.status = 400) {
try {
var errorObject = JSON.parse(errorMessage);
@@ -160,8 +164,7 @@ angular.module('ambariAdminConsole')
}
Alert.error('Cannot save properties', errorMessage);
});
-}
- };
+};
$scope.cancelConfiguration = function() {
$scope.configuration = angular.copy($scope.configurationBeforeEdit);
$scope.editConfigurationDisabled = true;
@@ -198,7 +201,7 @@ angular.module('ambariAdminConsole')
if(newValue){
$scope.savePermissions();
}
- }, true);
+ }, true);
$scope.deleteInstance = function(instance) {
ConfirmationModal.show('Delete View Instance', 'Are you sure you want to
delete View Instance '+ instance.ViewInstanceInfo.label +'?').then(function() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/59c24852/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
index 4d0b87a..772abae 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
@@ -109,7 +109,7 @@
input type=checkbox class=viewproperty-input
name={{parameter.name}} ng-required=parameter.required
ng-model=parameter.value popover={{parameter.description}}
popover-title={{parameter.name}} popover-trigger=mouseenter
/div
div class=col-sm-9 ng-switch-default
-input type={{parameter.masked ? 'password' : 'text'}}
class=form-control viewproperty-input name={{parameter.name}}
ng-required=parameter.required ng-model=parameter.value autocomplete=off
popover={{parameter.description}} popover-title={{parameter.name}}
popover-trigger=mouseenter placeholder={{parameter.placeholder}}
+input type={{parameter.masked ? 'password' : 'text'}}
class=form-control viewproperty-input
[2/5] ambari git commit: AMBARI-10251. Admin View: clicking outside of change user status confirmation should revert toggle (alexantonenko)
AMBARI-10251. Admin View: clicking outside of change user status confirmation
should revert toggle (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/77ccdf25
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/77ccdf25
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/77ccdf25
Branch: refs/heads/trunk
Commit: 77ccdf256fabb64a50380987cfe8ed0866322e36
Parents: 59c2485
Author: Alex Antonenko hiv...@gmail.com
Authored: Fri Mar 27 19:43:08 2015 +0200
Committer: Alex Antonenko hiv...@gmail.com
Committed: Fri Mar 27 21:51:59 2015 +0200
--
.../admin-web/app/scripts/services/ConfirmationModal.js | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/77ccdf25/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/ConfirmationModal.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/ConfirmationModal.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/ConfirmationModal.js
index bb52601..0e96fbe 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/ConfirmationModal.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/ConfirmationModal.js
@@ -41,9 +41,17 @@ angular.module('ambariAdminConsole')
$scope.cancel = function() {
$modalInstance.dismiss();
deferred.reject();
- }
+ };
}]
});
+
+ modalInstance.result.then(function() {
+// Gets triggered on close
+ }, function() {
+// Gets triggered on dismiss
+deferred.reject();
+ });
+
return deferred.promise;
}
};
[3/5] ambari git commit: AMBARI-10247. Usability: Cannot click Next after removing hosts that failed registration (alexantonenko)
AMBARI-10247. Usability: Cannot click Next after removing hosts that failed
registration (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6ef5786d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ef5786d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ef5786d
Branch: refs/heads/trunk
Commit: 6ef5786debe431d248721ea8cae7bdb4b3bcd433
Parents: e2ea86f
Author: Alex Antonenko hiv...@gmail.com
Authored: Fri Mar 27 19:01:46 2015 +0200
Committer: Alex Antonenko hiv...@gmail.com
Committed: Fri Mar 27 21:51:59 2015 +0200
--
ambari-web/app/controllers/wizard/step3_controller.js | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ef5786d/ambari-web/app/controllers/wizard/step3_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js
b/ambari-web/app/controllers/wizard/step3_controller.js
index aeff5ad..1a6ebe5 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -312,6 +312,7 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, {
return App.showConfirmationPopup(function () {
App.router.send('removeHosts', hosts);
self.hosts.removeObjects(hosts);
+ self.stopRegistration();
if (!self.hosts.length) {
self.set('isSubmitDisabled', true);
}
ambari git commit: AMBARI-10249 - Add a Log Appender for Alert State Change Events (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk e0a810734 - 4872d4e80
AMBARI-10249 - Add a Log Appender for Alert State Change Events (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4872d4e8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4872d4e8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4872d4e8
Branch: refs/heads/trunk
Commit: 4872d4e80aff3e80bc61f82d25c3af1672a6bd32
Parents: e0a8107
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Fri Mar 27 13:29:41 2015 -0400
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Fri Mar 27 16:37:38 2015 -0400
--
ambari-server/conf/log4j.properties | 21 ---
ambari-server/conf/unix/log4j.properties| 17 +++--
ambari-server/conf/windows/log4j.properties | 9 +
ambari-server/src/main/conf/log4j.properties| 12 ++-
.../alerts/AlertStateChangedListener.java | 37
5 files changed, 65 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4872d4e8/ambari-server/conf/log4j.properties
--
diff --git a/ambari-server/conf/log4j.properties
b/ambari-server/conf/log4j.properties
deleted file mode 100644
index a1818ce..000
--- a/ambari-server/conf/log4j.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed 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.
-
-# log4j configuration used during build and unit tests
-
-log4j.rootLogger=INFO,stdout
-log4j.threshhold=ALL
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}
(%F:%M(%L)) - %m%n
-
-log4j.logger.org.apache.ambari=DEBUG
http://git-wip-us.apache.org/repos/asf/ambari/blob/4872d4e8/ambari-server/conf/unix/log4j.properties
--
diff --git a/ambari-server/conf/unix/log4j.properties
b/ambari-server/conf/unix/log4j.properties
index 294dd67..f619c6c 100644
--- a/ambari-server/conf/unix/log4j.properties
+++ b/ambari-server/conf/unix/log4j.properties
@@ -18,11 +18,16 @@
# Define some default values that can be overridden by system properties
# Root logger option
+ambari.log.dir=/var/log/ambari-server
+ambari.log.file=ambari-server.log
+ambari.config-changes.file=ambari-config-changes.log
+ambari.alerts.file=ambari-alerts.log
+
log4j.rootLogger=INFO,file
# Direct log messages to a log file
log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=/var/log/ambari-server/ambari-server.log
+log4j.appender.file.File=${ambari.log.dir}/${ambari.log.file}
log4j.appender.file.MaxFileSize=80MB
log4j.appender.file.MaxBackupIndex=60
log4j.appender.file.layout=org.apache.log4j.PatternLayout
@@ -32,10 +37,18 @@ log4j.appender.file.layout.ConversionPattern=%d{DATE} %5p
[%t] %c{1}:%L - %m%n
log4j.logger.configchange=INFO,configchange
log4j.additivity.configchange=false
log4j.appender.configchange=org.apache.log4j.FileAppender
-log4j.appender.configchange.File=/var/log/ambari-server/ambari-config-changes.log
+log4j.appender.configchange.File=${ambari.log.dir}/${ambari.config-changes.file}
log4j.appender.configchange.layout=org.apache.log4j.PatternLayout
log4j.appender.configchange.layout.ConversionPattern=%d{ISO8601} %5p - %m%n
+# Log alert state changes
+log4j.logger.alerts=INFO,alerts
+log4j.additivity.alerts=false
+log4j.appender.alerts=org.apache.log4j.FileAppender
+log4j.appender.alerts.File=${ambari.log.dir}/${ambari.alerts.file}
+log4j.appender.alerts.layout=org.apache.log4j.PatternLayout
+log4j.appender.alerts.layout.ConversionPattern=%d{ISO8601} %m%n
+
log4j.logger.org.apache.hadoop.yarn.client=WARN
log4j.logger.org.apache.slider.common.tools.SliderUtils=WARN
log4j.logger.org.apache.ambari.server.security.authorization=WARN
http://git-wip-us.apache.org/repos/asf/ambari/blob/4872d4e8/ambari-server/conf/windows/log4j.properties
--
diff --git a/ambari-server/conf/windows/log4j.properties
b/ambari-server/conf/windows/log4j.properties
index e0c602d..4b5232f 100644
---
ambari git commit: AMBARI-10256. Unable to delete HBase Master (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 4872d4e80 - 62d6c1cb2
AMBARI-10256. Unable to delete HBase Master (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/62d6c1cb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/62d6c1cb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/62d6c1cb
Branch: refs/heads/trunk
Commit: 62d6c1cb2b11f5e93e9ec1af9df64084afac1dd3
Parents: 4872d4e
Author: Alex Antonenko hiv...@gmail.com
Authored: Fri Mar 27 22:43:17 2015 +0200
Committer: Alex Antonenko hiv...@gmail.com
Committed: Fri Mar 27 22:52:42 2015 +0200
--
ambari-web/app/models/stack_service_component.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/62d6c1cb/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 1867cc1..e47787a 100644
--- a/ambari-web/app/models/stack_service_component.js
+++ b/ambari-web/app/models/stack_service_component.js
@@ -102,7 +102,7 @@ App.StackServiceComponent = DS.Model.extend({
/** @property {Boolean} isDeletable - component supports delete action **/
isDeletable: function() {
-var ignored = ['HBASE_MASTER'];
+var ignored = [];
return this.get('isAddableToHost')
!ignored.contains(this.get('componentName'));
}.property('componentName'),
ambari git commit: AMBARI-10261. Add kerberos keytab for NFS Gateway. (Brandon Li via Jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 62d6c1cb2 - 592609bb0
AMBARI-10261. Add kerberos keytab for NFS Gateway. (Brandon Li via Jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/592609bb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/592609bb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/592609bb
Branch: refs/heads/trunk
Commit: 592609bb077e157f094da7c968ca629dc5095ae5
Parents: 62d6c1c
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Fri Mar 27 16:19:12 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Fri Mar 27 16:20:08 2015 -0700
--
.../HDFS/2.1.0.2.0/kerberos.json| 26
1 file changed, 26 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/592609bb/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
index 23d1b42..f19e391 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
@@ -150,6 +150,32 @@
]
},
{
+ name: NFS_GATEWAY,
+ identities: [
+{
+ name: nfsgateway,
+ principal: {
+value: nfs/_HOST@${realm},
+type : service,
+configuration: hdfs-site/nfs.kerberos.principal,
+local_username : ${hadoop-env/hdfs_user}
+ },
+ keytab: {
+file: ${keytab_dir}/nfs.service.keytab,
+owner: {
+ name: ${hadoop-env/hdfs_user},
+ access: r
+},
+group: {
+ name: ${cluster-env/user_group},
+ access:
+},
+configuration: hdfs-site/nfs.keytab.file
+ }
+},
+ ]
+},
+{
name: JOURNALNODE,
identities: [
{
ambari git commit: AMBARI-10259. Expose the widget artifact on stack version and stack service resource. (swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk 592609bb0 - a982836df
AMBARI-10259. Expose the widget artifact on stack version and stack service
resource. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a982836d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a982836d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a982836d
Branch: refs/heads/trunk
Commit: a982836df6fad9a8d648c6bcc5b1852b2be4d7de
Parents: 592609b
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Fri Mar 27 15:09:09 2015 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Fri Mar 27 16:49:49 2015 -0700
--
.../server/api/services/AmbariMetaInfo.java | 10 +
.../internal/StackArtifactResourceProvider.java | 77 +++-
.../ambari/server/stack/ServiceDirectory.java | 20 ++
.../ambari/server/stack/ServiceModule.java | 4 +
.../ambari/server/stack/StackDirectory.java | 18 ++
.../apache/ambari/server/stack/StackModule.java | 5 +
.../apache/ambari/server/state/ServiceInfo.java | 14 ++
.../apache/ambari/server/state/StackInfo.java | 11 ++
.../ambari/server/state/stack/WidgetLayout.java | 69 +++
.../server/state/stack/WidgetLayoutInfo.java| 115 +++
.../HBASE/0.96.0.2.0/metrics.json | 70 +++
.../HBASE/0.96.0.2.0/widgets.json | 192 +++
.../StackArtifactResourceProviderTest.java | 44 +
.../OTHER/2.0/services/HBASE/widgets.json | 192 +++
14 files changed, 834 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a982836d/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 8952153..143022e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -102,6 +102,16 @@ public class AmbariMetaInfo {
public static final String KERBEROS_DESCRIPTOR_FILE_NAME = kerberos.json;
/**
+ * The filename name for a Widgets descriptor file at either the stack or
service level
+ */
+ public static final String WIDGETS_DESCRIPTOR_FILE_NAME = widgets.json;
+
+ /**
+ * Filename for theme file at service layer
+ */
+ public static final String SERVICE_THEME_FILE_NAME = theme.json;
+
+ /**
* This string is used in placeholder in places that are common for
* all operating systems or in situations where os type is not important.
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/a982836d/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
index b7530a0..53734aa 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
@@ -18,6 +18,8 @@
package org.apache.ambari.server.controller.internal;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
import com.google.inject.Inject;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.StackAccessException;
@@ -42,9 +44,13 @@ import
org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
import
org.apache.ambari.server.state.kerberos.KerberosServiceDescriptorFactory;
import org.apache.ambari.server.state.stack.MetricDefinition;
+import org.apache.ambari.server.state.stack.WidgetLayout;
+import org.apache.commons.lang.StringUtils;
import java.io.File;
+import java.io.FileReader;
import java.io.IOException;
+import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -144,6 +150,9 @@ public class StackArtifactResourceProvider extends
AbstractControllerResourcePro
@Inject
private static KerberosServiceDescriptorFactory
kerberosServiceDescriptorFactory;
+ Type widgetLayoutType = new TypeTokenMapString,
ListWidgetLayout(){}.getType();
+ Gson gson = new Gson();
+
/**
* set resource
ambari git commit: AMBARI-10249 - Add a Log Appender for Alert State Change Events (part2) (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 5d06a3130 - 9a9492d7a
AMBARI-10249 - Add a Log Appender for Alert State Change Events (part2)
(jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a9492d7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a9492d7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a9492d7
Branch: refs/heads/trunk
Commit: 9a9492d7ae14851df919303c9d4fa859cb018b9d
Parents: 5d06a31
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Fri Mar 27 22:40:54 2015 -0400
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Fri Mar 27 22:41:03 2015 -0400
--
.../alerts/AlertStateChangedEventTest.java | 29 ++--
1 file changed, 27 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a9492d7/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java
index 961157c..b64afed 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java
@@ -36,6 +36,7 @@ import org.apache.ambari.server.orm.entities.AlertGroupEntity;
import org.apache.ambari.server.orm.entities.AlertHistoryEntity;
import org.apache.ambari.server.orm.entities.AlertNoticeEntity;
import org.apache.ambari.server.orm.entities.AlertTargetEntity;
+import org.apache.ambari.server.state.Alert;
import org.apache.ambari.server.state.AlertState;
import org.easymock.EasyMock;
import org.junit.After;
@@ -124,12 +125,24 @@ public class AlertStateChangedEventTest {
EasyMock.replay(alertTarget, alertGroup, dispatchDao);
+AlertDefinitionEntity definition =
EasyMock.createNiceMock(AlertDefinitionEntity.class);
+EasyMock.expect(definition.getDefinitionId()).andReturn(1L);
+EasyMock.expect(definition.getServiceName()).andReturn(HDFS);
+EasyMock.expect(definition.getLabel()).andReturn(hdfs-foo-alert);
+EasyMock.expect(definition.getDescription()).andReturn(HDFS Foo Alert);
+
AlertHistoryEntity history =
EasyMock.createNiceMock(AlertHistoryEntity.class);
AlertStateChangeEvent event =
EasyMock.createNiceMock(AlertStateChangeEvent.class);
+Alert alert = EasyMock.createNiceMock(Alert.class);
+
EasyMock.expect(history.getAlertState()).andReturn(AlertState.CRITICAL).atLeastOnce();
+
EasyMock.expect(history.getAlertDefinition()).andReturn(definition).atLeastOnce();
+EasyMock.expect(alert.getText()).andReturn(The HDFS Foo Alert Is Not
Good).atLeastOnce();
+
EasyMock.expect(alert.getState()).andReturn(AlertState.CRITICAL).atLeastOnce();
EasyMock.expect(event.getNewHistoricalEntry()).andReturn(history).atLeastOnce();
+EasyMock.expect(event.getAlert()).andReturn(alert).atLeastOnce();
-EasyMock.replay(history, event);
+EasyMock.replay(definition, history, event, alert);
// async publishing
eventPublisher.publish(event);
@@ -164,15 +177,27 @@ public class AlertStateChangedEventTest {
// that the create alert notice method was not called
EasyMock.replay(alertTarget, alertGroup, dispatchDao);
+AlertDefinitionEntity definition =
EasyMock.createNiceMock(AlertDefinitionEntity.class);
+EasyMock.expect(definition.getDefinitionId()).andReturn(1L);
+EasyMock.expect(definition.getServiceName()).andReturn(HDFS);
+EasyMock.expect(definition.getLabel()).andReturn(hdfs-foo-alert);
+EasyMock.expect(definition.getDescription()).andReturn(HDFS Foo Alert);
+
AlertHistoryEntity history =
EasyMock.createNiceMock(AlertHistoryEntity.class);
AlertStateChangeEvent event =
EasyMock.createNiceMock(AlertStateChangeEvent.class);
+Alert alert = EasyMock.createNiceMock(Alert.class);
// use WARNING to ensure that the target (which only cares about OK/CRIT)
// does not receive the alert notice
EasyMock.expect(history.getAlertState()).andReturn(AlertState.WARNING).atLeastOnce();
+
+
EasyMock.expect(history.getAlertDefinition()).andReturn(definition).atLeastOnce();
+EasyMock.expect(alert.getText()).andReturn(The HDFS Foo Alert Is Not
Good).atLeastOnce();
+
EasyMock.expect(alert.getState()).andReturn(AlertState.WARNING).atLeastOnce();
EasyMock.expect(event.getNewHistoricalEntry()).andReturn(history).atLeastOnce();
+EasyMock.expect(event.getAlert()).andReturn(alert).atLeastOnce();
-EasyMock.replay(history, event);
+
