ambari git commit: AMBARI-15054 Changing Yarn queues does not update hive.server2.tez.default.queues. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk e4800e1c9 -> 8cfb2db63
AMBARI-15054 Changing Yarn queues does not update
hive.server2.tez.default.queues. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8cfb2db6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8cfb2db6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8cfb2db6
Branch: refs/heads/trunk
Commit: 8cfb2db63021fe5d1ed7f44f1d4412e397810090
Parents: e4800e1
Author: ababiichuk
Authored: Wed Feb 17 11:55:27 2016 +0200
Committer: ababiichuk
Committed: Wed Feb 17 11:55:27 2016 +0200
--
.../controllers/main/service/info/configs.js| 23 +-
ambari-web/app/controllers/wizard.js| 3 -
.../app/controllers/wizard/step7_controller.js | 6 +-
.../app/mixins/common/configs/configs_saver.js | 4 -
.../configs/objects/service_config_property.js | 2 +
ambari-web/app/utils/config.js | 151 +---
ambari-web/app/views/common/controls_view.js| 75 +-
.../test/controllers/wizard/step7_test.js | 26 --
ambari-web/test/utils/config_test.js| 242 ---
9 files changed, 140 insertions(+), 392 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8cfb2db6/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 b6a434c..3cd652a 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -181,24 +181,6 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ConfigsLoader, A
],
/**
- * get array of config properties that are shown in settings tab
- * @type {String[]}
- */
- settingsTabProperties: function () {
-var properties = [];
-App.Tab.find().forEach(function (t) {
- if (!t.get('isAdvanced') && t.get('serviceName') ===
this.get('content.serviceName')) {
-t.get('sections').forEach(function (s) {
- s.get('subSections').forEach(function (ss) {
-properties = properties.concat(ss.get('configProperties'));
- });
-});
- }
-}, this);
-return properties;
- }.property('content.serviceName',
'App.router.clusterController.isStackConfigsLoaded'),
-
- /**
* Dropdown menu items in filter combobox
* @type {{attributeName: string, attributeValue: string, name: string,
selected: boolean}[]}
*/
@@ -379,8 +361,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ConfigsLoader, A
//put properties from capacity-scheduler.xml into one config with textarea
view
if (this.get('content.serviceName') === 'YARN') {
- var configsToSkip =
this.get('settingsTabProperties').filterProperty('filename',
'capacity-scheduler.xml');
- configs = App.config.fileConfigsIntoTextarea(configs,
'capacity-scheduler.xml', configsToSkip);
+ configs = App.config.addYarnCapacityScheduler(configs);
}
if (this.get('content.serviceName') === 'KERBEROS') {
@@ -407,7 +388,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ConfigsLoader, A
* @method mergeWithStackProperties
*/
mergeWithStackProperties: function (configs) {
-this.get('settingsTabProperties').forEach(function (advanced_id) {
+
App.config.getPropertiesFromTheme(this.get('content.serviceName')).forEach(function
(advanced_id) {
if (!configs.someProperty('id', advanced_id)) {
var advanced = App.configsCollection.getConfig(advanced_id);
if (advanced) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/8cfb2db6/ambari-web/app/controllers/wizard.js
--
diff --git a/ambari-web/app/controllers/wizard.js
b/ambari-web/app/controllers/wizard.js
index 05ef68e..329d246 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -889,9 +889,6 @@ App.WizardController =
Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
var installedServiceNames = stepController.get('installedServiceNames') ||
[];
var installedServiceNamesMap = installedServiceNames.toWickMap();
stepController.get('stepConfigs').forEach(function (_content) {
- if (_content.serviceName === 'YARN') {
-_content.set('configs',
App.config.textareaIntoFileConfigs(_content.get('configs'),
'capacity-scheduler.xml'));
- }
_content.get('configs').forEach(function (_configProperties) {
if (!Em.isNone(_configProperties.get('group'))) {
return false;
http://git-wip-us.apache.org/repos/
ambari git commit: AMBARI-15054 Changing Yarn queues does not update hive.server2.tez.default.queues. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 94129bbc8 -> 2d485431c
AMBARI-15054 Changing Yarn queues does not update
hive.server2.tez.default.queues. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2d485431
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2d485431
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2d485431
Branch: refs/heads/branch-2.2
Commit: 2d485431c257972e6c909bc269b06a013f59d243
Parents: 94129bb
Author: ababiichuk
Authored: Wed Feb 17 12:03:10 2016 +0200
Committer: ababiichuk
Committed: Wed Feb 17 12:03:10 2016 +0200
--
.../controllers/main/service/info/configs.js| 3 +-
ambari-web/app/controllers/wizard.js| 3 -
.../app/controllers/wizard/step7_controller.js | 6 +-
.../app/mixins/common/configs/configs_saver.js | 4 -
.../configs/objects/service_config_property.js | 2 +
ambari-web/app/utils/config.js | 152 +++
ambari-web/app/views/common/controls_view.js| 75 +
.../test/controllers/wizard/step7_test.js | 37 -
ambari-web/test/utils/config_test.js| 149 --
9 files changed, 140 insertions(+), 291 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2d485431/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 f265c66..8b96113 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -392,8 +392,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ConfigsLoader, A
//put properties from capacity-scheduler.xml into one config with textarea
view
if (this.get('content.serviceName') === 'YARN') {
- var configsToSkip =
this.get('settingsTabProperties').filterProperty('filename',
'capacity-scheduler.xml');
- configs = App.config.fileConfigsIntoTextarea(configs,
'capacity-scheduler.xml', configsToSkip);
+ configs = App.config.addYarnCapacityScheduler(configs);
}
if (this.get('content.serviceName') === 'KERBEROS') {
http://git-wip-us.apache.org/repos/asf/ambari/blob/2d485431/ambari-web/app/controllers/wizard.js
--
diff --git a/ambari-web/app/controllers/wizard.js
b/ambari-web/app/controllers/wizard.js
index aa82234..9e94182 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -870,9 +870,6 @@ App.WizardController =
Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
installedServiceNamesMap[name] = true;
});
stepController.get('stepConfigs').forEach(function (_content) {
- if (_content.serviceName === 'YARN') {
-_content.set('configs',
App.config.textareaIntoFileConfigs(_content.get('configs'),
'capacity-scheduler.xml'));
- }
_content.get('configs').forEach(function (_configProperties) {
if (!Em.isNone(_configProperties.get('group'))) {
return false;
http://git-wip-us.apache.org/repos/asf/ambari/blob/2d485431/ambari-web/app/controllers/wizard/step7_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js
b/ambari-web/app/controllers/wizard/step7_controller.js
index 148a9a2..74de5d6 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -713,9 +713,6 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
},
applyServicesConfigs: function (configs, storedConfigs) {
-if (this.get('allSelectedServiceNames').contains('YARN')) {
- configs = App.config.fileConfigsIntoTextarea(configs,
'capacity-scheduler.xml', []);
-}
// If HAWQ service is being added, add NN-HA/RM-HA/Kerberos related
parameters to hdfs-client/yarn-client if applicable
if (this.get('wizardController.name') == 'addServiceController') {
if (!this.get('installedServiceNames').contains('HAWQ') &&
this.get('allSelectedServiceNames').contains('HAWQ')) {
@@ -990,6 +987,9 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
serviceConfigProperty.validate();
configsByService.pushObject(serviceConfigProperty);
}, this);
+ if (service.get('serviceName') === 'YARN') {
+configsByService =
App.config.addYarnCapacityScheduler(configsByService);
+ }
var serviceConfig =
App.config.createServiceConfig(service.get('serviceName'
ambari git commit: AMBARI-15071. Functional tests hang on BAO forever (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 8cfb2db63 -> 03f804c24
AMBARI-15071. Functional tests hang on BAO forever (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/03f804c2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/03f804c2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/03f804c2
Branch: refs/heads/trunk
Commit: 03f804c24772bec7e7ccfd31d5d2f594ac0f0262
Parents: 8cfb2db
Author: Andrew Onishuk
Authored: Wed Feb 17 14:28:05 2016 +0200
Committer: Andrew Onishuk
Committed: Wed Feb 17 14:28:05 2016 +0200
--
ambari-funtest/pom.xml | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/03f804c2/ambari-funtest/pom.xml
--
diff --git a/ambari-funtest/pom.xml b/ambari-funtest/pom.xml
index 4fa342f..8d19631 100644
--- a/ambari-funtest/pom.xml
+++ b/ambari-funtest/pom.xml
@@ -22,6 +22,9 @@
${packagingFormat}
Ambari Functional Tests
Ambari Functional Tests
+
+true
+
ambari git commit: Revert "AMBARI-14875. Ranger Smart configs : Need to hide Audit DB properties if Audit to DB is off (gautam)"
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 2d485431c -> 1eb5de019
Revert "AMBARI-14875. Ranger Smart configs : Need to hide Audit DB properties
if Audit to DB is off (gautam)"
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1eb5de01
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1eb5de01
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1eb5de01
Branch: refs/heads/branch-2.2
Commit: 1eb5de019d29609664fddcfea06ec07a66e00310
Parents: 2d48543
Author: Jaimin Jetly
Authored: Wed Feb 17 19:47:59 2016 +0530
Committer: Jaimin Jetly
Committed: Wed Feb 17 19:47:59 2016 +0530
--
.../services/RANGER/themes/theme_version_2.json | 40 +---
1 file changed, 2 insertions(+), 38 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1eb5de01/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json
index 59e58a4..fff50fb 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json
@@ -896,47 +896,11 @@
},
{
"config": "admin-properties/audit_db_user",
- "subsection-name": "subsection-ranger-audit-db-row2-col1",
- "depends-on": [
-{
- "configs":[
-"ranger-env/xasecure.audit.destination.db"
- ],
- "if": "${ranger-env/xasecure.audit.destination.db}",
- "then": {
-"property_value_attributes": {
- "visible": true
-}
- },
- "else": {
-"property_value_attributes": {
- "visible": false
-}
- }
-}
- ]
+ "subsection-name": "subsection-ranger-audit-db-row2-col1"
},
{
"config": "admin-properties/audit_db_name",
- "subsection-name": "subsection-ranger-audit-db-row2-col2",
- "depends-on": [
-{
- "configs":[
-"ranger-env/xasecure.audit.destination.db"
- ],
- "if": "${ranger-env/xasecure.audit.destination.db}",
- "then": {
-"property_value_attributes": {
- "visible": true
-}
- },
- "else": {
-"property_value_attributes": {
- "visible": false
-}
- }
-}
- ]
+ "subsection-name": "subsection-ranger-audit-db-row2-col2"
},
{
"config": "admin-properties/audit_db_password",
ambari git commit: Revert "AMBARI-14562. Ranger - If configured audit store is 'solr', then audit_store value should be 'solr'(gautam)"
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 1eb5de019 -> c2ced5c25
Revert "AMBARI-14562. Ranger - If configured audit store is 'solr', then
audit_store value should be 'solr'(gautam)"
This reverts commit c5e6cb75de56375e1a52b75c78cb4ab6f3592339.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c2ced5c2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c2ced5c2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c2ced5c2
Branch: refs/heads/branch-2.2
Commit: c2ced5c25a66321cc903cad403710e6c51ea96f9
Parents: 1eb5de0
Author: Jaimin Jetly
Authored: Wed Feb 17 19:52:38 2016 +0530
Committer: Jaimin Jetly
Committed: Wed Feb 17 19:52:38 2016 +0530
--
.../RANGER/0.4.0/package/scripts/setup_ranger_xml.py | 5 -
.../services/RANGER/configuration/ranger-admin-site.xml | 10 --
.../resources/stacks/HDP/2.3/services/stack_advisor.py | 11 ---
.../test/python/stacks/2.3/common/test_stack_advisor.py | 3 +--
4 files changed, 1 insertion(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2ced5c2/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
--
diff --git
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
index 4f9b260..fcceaa6 100644
---
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
+++
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
@@ -192,11 +192,6 @@ def setup_ranger_db(upgrade_type=None):
owner = params.unix_user,
)
- ModifyPropertiesFile(format("{ranger_home}/install.properties"),
-properties = {'audit_store': params.ranger_audit_source_type},
-owner = params.unix_user,
- )
-
if params.db_flavor.lower() == 'sqla':
ModifyPropertiesFile(format("{ranger_home}/install.properties"),
properties = {'SQL_CONNECTOR_JAR':
format('{ranger_home}/ews/lib/{jdbc_jar_name}')},
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2ced5c2/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
index 16fae19..462fe56 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
@@ -159,16 +159,6 @@
ranger.audit.source.type
solr
db or solr, based on the audit destination used
-
-
-ranger-env
-xasecure.audit.destination.solr
-
-
-ranger-env
-xasecure.audit.destination.db
-
-
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2ced5c2/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index 8892349..71b0e2a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -625,17 +625,6 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
rangerAuditProperty =
services["configurations"][item['filename']]["properties"][item['configname']]
putRangerAuditProperty(item['target_configname'],
rangerAuditProperty)
-audit_solr_flag = 'false'
-audit_db_flag = 'false'
-ranger_audit_source_type = 'solr'
-if 'ranger-env' in services['configurations'] and
'xasecure.audit.destination.solr' in
services['configurations']["ranger-env"]["properties"]:
- audit_solr_flag =
services['configurations']["ranger-env"]["properties"]['xasecure.audit.destination.solr']
-if 'ranger-env' in services['configurations'] and
'xasecure.audit.destination.db' in
services['configurations']["ranger-env"]["properties"]:
- audit_db_flag =
services['configurations']["ranger-env"]["properties"]['xasecure.audit.destination.db']
-
-if audit_db_flag == 'true' and audit_solr_flag == 'false':
- ranger_audit_source_type = 'db'
-putRangerAdminProperty('ranger.audit.source.type'
ambari git commit: AMBARI-15069 Add HDP 2.5 stack for Ambari 2.2.2 (dsen)
Repository: ambari Updated Branches: refs/heads/trunk 03f804c24 -> b339542e0 AMBARI-15069 Add HDP 2.5 stack for Ambari 2.2.2 (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b339542e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b339542e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b339542e Branch: refs/heads/trunk Commit: b339542e04290725d3a171afb62e6233950e30b0 Parents: 03f804c Author: Dmytro Sen Authored: Wed Feb 17 16:46:55 2016 +0200 Committer: Dmytro Sen Committed: Wed Feb 17 16:46:55 2016 +0200 -- .../main/resources/stacks/HDP/2.5/metainfo.xml | 25 ++ .../resources/stacks/HDP/2.5/repos/repoinfo.xml | 92 .../HDP/2.5/services/ACCUMULO/metainfo.xml | 26 ++ .../stacks/HDP/2.5/services/ATLAS/metainfo.xml | 26 ++ .../stacks/HDP/2.5/services/FALCON/metainfo.xml | 26 ++ .../stacks/HDP/2.5/services/FLUME/metainfo.xml | 26 ++ .../stacks/HDP/2.5/services/HBASE/metainfo.xml | 26 ++ .../stacks/HDP/2.5/services/HDFS/metainfo.xml | 26 ++ .../stacks/HDP/2.5/services/HIVE/metainfo.xml | 26 ++ .../stacks/HDP/2.5/services/KAFKA/metainfo.xml | 26 ++ .../HDP/2.5/services/KERBEROS/metainfo.xml | 25 ++ .../stacks/HDP/2.5/services/KNOX/metainfo.xml | 26 ++ .../stacks/HDP/2.5/services/MAHOUT/metainfo.xml | 26 ++ .../stacks/HDP/2.5/services/OOZIE/metainfo.xml | 26 ++ .../stacks/HDP/2.5/services/PIG/metainfo.xml| 26 ++ .../stacks/HDP/2.5/services/RANGER/metainfo.xml | 29 ++ .../HDP/2.5/services/RANGER_KMS/metainfo.xml| 29 ++ .../stacks/HDP/2.5/services/SLIDER/metainfo.xml | 26 ++ .../stacks/HDP/2.5/services/SPARK/metainfo.xml | 29 ++ .../stacks/HDP/2.5/services/SQOOP/metainfo.xml | 26 ++ .../stacks/HDP/2.5/services/STORM/metainfo.xml | 27 ++ .../stacks/HDP/2.5/services/TEZ/metainfo.xml| 26 ++ .../stacks/HDP/2.5/services/YARN/metainfo.xml | 27 ++ .../HDP/2.5/services/ZOOKEEPER/metainfo.xml | 26 ++ .../stacks/HDP/2.5/services/stack_advisor.py| 22 + ambari-server/src/test/python/TestSetupAgent.py | 2 +- .../stacks/2.0.6/common/test_stack_advisor.py | 12 +-- 27 files changed, 728 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b339542e/ambari-server/src/main/resources/stacks/HDP/2.5/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/metainfo.xml new file mode 100644 index 000..df3c4ee --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/metainfo.xml @@ -0,0 +1,25 @@ + + + + +true + + 2.4 + 1.7 + 1.8 + http://git-wip-us.apache.org/repos/asf/ambari/blob/b339542e/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml new file mode 100644 index 000..acf1c07 --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml @@ -0,0 +1,92 @@ + + + + http://s3.amazonaws.com/dev.hortonworks.com/HDP/hdp_urlinfo.json + + + http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.5.0.0 + HDP-2.5 + HDP + + + http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6 + HDP-UTILS-1.1.0.20 + HDP-UTILS + + + + + http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos7/2.x/updates/2.5.0.0 + HDP-2.5 + HDP + + + http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos7 + HDP-UTILS-1.1.0.20 + HDP-UTILS + + + + + http://s3.amazonaws.com/dev.hortonworks.com/HDP/suse11sp3/2.x/updates/2.5.0.0 + HDP-2.5 + HDP + + + http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/suse11sp3 + HDP-UTILS-1.1.0.20 + HDP-UTILS + + + + + http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu12/2.x/updates/2.5.0.0 + HDP-2.5 + HDP + + + http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/ubuntu12 + HDP-UTILS-1.1.0.20 + HDP-UTILS + + + + + http://s3.amazonaws.com/dev.hortonworks.com/HDP/debian7/2.x/updates/2.5.0.0 + HDP-2.5 + HDP + + + http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/debian6 + HDP-UTILS-1.1.0.20 + HDP-UTILS + + + + + http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu14/2.x/updates/2.5.0.0 + HDP-2.5 + H
ambari git commit: AMBARI-14875. Ranger Smart configs : Need to hide Audit DB properties if Audit to DB is off. (addendum patch) (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk b339542e0 -> 506bb8d18
AMBARI-14875. Ranger Smart configs : Need to hide Audit DB properties if Audit
to DB is off. (addendum patch) (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/506bb8d1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/506bb8d1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/506bb8d1
Branch: refs/heads/trunk
Commit: 506bb8d186500ba700bc3f58f1520f105876e0c4
Parents: b339542
Author: Jaimin Jetly
Authored: Wed Feb 17 20:16:40 2016 +0530
Committer: Jaimin Jetly
Committed: Wed Feb 17 20:18:15 2016 +0530
--
.../services/RANGER/themes/theme_version_2.json | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/506bb8d1/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json
index 59e58a4..cbd27e4 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme_version_2.json
@@ -940,7 +940,25 @@
},
{
"config": "admin-properties/audit_db_password",
- "subsection-name": "subsection-ranger-audit-db-row2-col2"
+ "subsection-name": "subsection-ranger-audit-db-row2-col2",
+ "depends-on": [
+{
+ "configs":[
+"ranger-env/xasecure.audit.destination.db"
+ ],
+ "if": "${ranger-env/xasecure.audit.destination.db}",
+ "then": {
+"property_value_attributes": {
+ "visible": true
+}
+ },
+ "else": {
+"property_value_attributes": {
+ "visible": false
+}
+ }
+}
+ ]
},
{
"config": "ranger-env/xasecure.audit.destination.solr",
ambari git commit: AMBARI-15069 Add HDP 2.5 stack for Ambari 2.2.2 (dsen)
Repository: ambari Updated Branches: refs/heads/branch-2.2 c2ced5c25 -> e1a735975 AMBARI-15069 Add HDP 2.5 stack for Ambari 2.2.2 (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e1a73597 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e1a73597 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e1a73597 Branch: refs/heads/branch-2.2 Commit: e1a7359754cfd36b274f07aa9d559a7c1c8a7d47 Parents: c2ced5c Author: Dmytro Sen Authored: Wed Feb 17 16:46:55 2016 +0200 Committer: Dmytro Sen Committed: Wed Feb 17 17:09:40 2016 +0200 -- .../main/resources/stacks/HDP/2.5/metainfo.xml | 25 .../resources/stacks/HDP/2.5/repos/repoinfo.xml | 92 +++ .../HDP/2.5/services/ACCUMULO/metainfo.xml | 55 + .../stacks/HDP/2.5/services/ATLAS/metainfo.xml | 44 .../stacks/HDP/2.5/services/FALCON/metainfo.xml | 44 .../stacks/HDP/2.5/services/FLUME/metainfo.xml | 46 .../stacks/HDP/2.5/services/HBASE/metainfo.xml | 52 + .../stacks/HDP/2.5/services/HDFS/metainfo.xml | 99 .../stacks/HDP/2.5/services/HIVE/metainfo.xml | 113 +++ .../stacks/HDP/2.5/services/KAFKA/metainfo.xml | 44 .../HDP/2.5/services/KERBEROS/metainfo.xml | 25 .../stacks/HDP/2.5/services/KNOX/metainfo.xml | 44 .../stacks/HDP/2.5/services/MAHOUT/metainfo.xml | 26 + .../stacks/HDP/2.5/services/OOZIE/metainfo.xml | 70 .../stacks/HDP/2.5/services/PIG/metainfo.xml| 50 .../stacks/HDP/2.5/services/RANGER/metainfo.xml | 55 + .../HDP/2.5/services/RANGER_KMS/metainfo.xml| 49 .../stacks/HDP/2.5/services/SLIDER/metainfo.xml | 50 .../stacks/HDP/2.5/services/SPARK/metainfo.xml | 54 + .../stacks/HDP/2.5/services/SQOOP/metainfo.xml | 53 + .../stacks/HDP/2.5/services/STORM/metainfo.xml | 46 .../stacks/HDP/2.5/services/TEZ/metainfo.xml| 46 .../stacks/HDP/2.5/services/YARN/metainfo.xml | 80 + .../HDP/2.5/services/ZOOKEEPER/metainfo.xml | 51 + .../stacks/HDP/2.5/services/stack_advisor.py| 22 .../stacks/2.0.6/common/test_stack_advisor.py | 12 +- 26 files changed, 1341 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/e1a73597/ambari-server/src/main/resources/stacks/HDP/2.5/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/metainfo.xml new file mode 100644 index 000..f397032 --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/metainfo.xml @@ -0,0 +1,25 @@ + + + + + true + +2.4 +1.7 +1.8 + http://git-wip-us.apache.org/repos/asf/ambari/blob/e1a73597/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml new file mode 100644 index 000..acf1c07 --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml @@ -0,0 +1,92 @@ + + + + http://s3.amazonaws.com/dev.hortonworks.com/HDP/hdp_urlinfo.json + + + http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.5.0.0 + HDP-2.5 + HDP + + + http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6 + HDP-UTILS-1.1.0.20 + HDP-UTILS + + + + + http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos7/2.x/updates/2.5.0.0 + HDP-2.5 + HDP + + + http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos7 + HDP-UTILS-1.1.0.20 + HDP-UTILS + + + + + http://s3.amazonaws.com/dev.hortonworks.com/HDP/suse11sp3/2.x/updates/2.5.0.0 + HDP-2.5 + HDP + + + http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/suse11sp3 + HDP-UTILS-1.1.0.20 + HDP-UTILS + + + + + http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu12/2.x/updates/2.5.0.0 + HDP-2.5 + HDP + + + http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/ubuntu12 + HDP-UTILS-1.1.0.20 + HDP-UTILS + + + + + http://s3.amazonaws.com/dev.hortonworks.com/HDP/debian7/2.x/updates/2.5.0.0 + HDP-2.5 + HDP + + + http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/debian6 + HDP-UTILS-1.1.0.20 + HDP-UTILS + + + + + http://s3.amazonaws.com/dev.hortonworks.com
ambari git commit: AMBARI-15070. Graph scale behaviour is incorrect if time range is switched before graph data API call is complete (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 e1a735975 -> 4c73a51dc
AMBARI-15070. Graph scale behaviour is incorrect if time range is switched
before graph data API call is complete (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4c73a51d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4c73a51d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4c73a51d
Branch: refs/heads/branch-2.2
Commit: 4c73a51dc42c243ff100869d323042e75c7f6431
Parents: e1a7359
Author: Alex Antonenko
Authored: Wed Feb 17 15:23:19 2016 +0200
Committer: Alex Antonenko
Committed: Wed Feb 17 17:46:06 2016 +0200
--
.../app/mixins/common/widgets/widget_mixin.js | 62 +++
ambari-web/app/utils/ajax/ajax.js | 12 +++
.../app/views/common/chart/linear_time.js | 84 +++-
.../main/admin/stack_upgrade/versions_view.js | 6 +-
.../test/mixins/common/widget_mixin_test.js | 18 -
ambari-web/test/utils/ajax/ajax_test.js | 32
.../test/views/common/chart/linear_time_test.js | 10 ++-
7 files changed, 179 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c73a51d/ambari-web/app/mixins/common/widgets/widget_mixin.js
--
diff --git a/ambari-web/app/mixins/common/widgets/widget_mixin.js
b/ambari-web/app/mixins/common/widgets/widget_mixin.js
index eb2cf19..863b510 100644
--- a/ambari-web/app/mixins/common/widgets/widget_mixin.js
+++ b/ambari-web/app/mixins/common/widgets/widget_mixin.js
@@ -122,9 +122,18 @@ App.WidgetMixin = Ember.Mixin.create({
startCallName: 'getHostComponentMetrics',
successCallback: this.getHostComponentMetricsSuccessCallback,
errorCallback: this.getMetricsErrorCallback,
- completeCallback: function () {
+ completeCallback: function (xhr) {
requestCounter--;
if (requestCounter === 0) this.onMetricsLoaded();
+if (this.get('graphView')) {
+ var graph = this.get('childViews') &&
this.get('childViews').findProperty('runningRequests');
+ if (graph) {
+var requestsArrayName = graph.get('isPopup') ?
'runningPopupRequests' : 'runningRequests';
+graph.set(requestsArrayName,
graph.get(requestsArrayName).reject(function (item) {
+ return item === xhr;
+}));
+ }
+}
}
});
} else {
@@ -134,9 +143,18 @@ App.WidgetMixin = Ember.Mixin.create({
startCallName: 'getServiceComponentMetrics',
successCallback: this.getMetricsSuccessCallback,
errorCallback: this.getMetricsErrorCallback,
- completeCallback: function () {
+ completeCallback: function (xhr) {
requestCounter--;
if (requestCounter === 0) this.onMetricsLoaded();
+if (this.get('graphView')) {
+ var graph = this.get('childViews') &&
this.get('childViews').findProperty('runningRequests');
+ if (graph) {
+var requestsArrayName = graph.get('isPopup') ?
'runningPopupRequests' : 'runningRequests';
+graph.set(requestsArrayName,
graph.get(requestsArrayName).reject(function (item) {
+ return item === xhr;
+}));
+ }
+}
}
});
}
@@ -194,7 +212,7 @@ App.WidgetMixin = Ember.Mixin.create({
* @returns {$.ajax}
*/
getServiceComponentMetrics: function (request) {
-return App.ajax.send({
+var xhr = App.ajax.send({
name: 'widgets.serviceComponent.metrics.get',
sender: this,
data: {
@@ -203,6 +221,14 @@ App.WidgetMixin = Ember.Mixin.create({
metricPaths: this.prepareMetricPaths(request.metric_paths)
}
});
+if (this.get('graphView')) {
+ var graph = this.get('childViews') &&
this.get('childViews').findProperty('runningRequests');
+ if (graph) {
+var requestsArrayName = graph.get('isPopup') ? 'runningPopupRequests'
: 'runningRequests';
+graph.get(requestsArrayName).push(xhr);
+ }
+}
+return xhr;
},
/**
@@ -232,15 +258,21 @@ App.WidgetMixin = Ember.Mixin.create({
var metricPaths = this.prepareMetricPaths(request.metric_paths);
if (metricPaths.length) {
- return App.ajax.send({
-name: 'widgets.hostComponent.metrics.get',
-sender: this,
-data: {
- componentName: request.component_name,
- metricPaths: this.prepareMetricPaths(request.metric_paths),
- hostComponentCriteria: this.computeHostComponentCriteria(request)
-}
- });
+ var xh
ambari git commit: AMBARI-15070. Graph scale behaviour is incorrect if time range is switched before graph data API call is complete (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 506bb8d18 -> a91890a81
AMBARI-15070. Graph scale behaviour is incorrect if time range is switched
before graph data API call is complete (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a91890a8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a91890a8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a91890a8
Branch: refs/heads/trunk
Commit: a91890a819e77638d5cb371e49a9a5d0fdebf4d1
Parents: 506bb8d
Author: Alex Antonenko
Authored: Wed Feb 17 15:20:14 2016 +0200
Committer: Alex Antonenko
Committed: Wed Feb 17 17:46:45 2016 +0200
--
.../app/mixins/common/widgets/widget_mixin.js | 62 +++
ambari-web/app/utils/ajax/ajax.js | 12 +++
.../app/views/common/chart/linear_time.js | 84 +++-
.../main/admin/stack_upgrade/versions_view.js | 6 +-
.../test/mixins/common/widget_mixin_test.js | 18 -
ambari-web/test/utils/ajax/ajax_test.js | 32
.../test/views/common/chart/linear_time_test.js | 10 ++-
7 files changed, 179 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a91890a8/ambari-web/app/mixins/common/widgets/widget_mixin.js
--
diff --git a/ambari-web/app/mixins/common/widgets/widget_mixin.js
b/ambari-web/app/mixins/common/widgets/widget_mixin.js
index 6d65c33..13e55f2 100644
--- a/ambari-web/app/mixins/common/widgets/widget_mixin.js
+++ b/ambari-web/app/mixins/common/widgets/widget_mixin.js
@@ -120,9 +120,18 @@ App.WidgetMixin = Ember.Mixin.create({
startCallName: 'getHostComponentMetrics',
successCallback: this.getHostComponentMetricsSuccessCallback,
errorCallback: this.getMetricsErrorCallback,
- completeCallback: function () {
+ completeCallback: function (xhr) {
requestCounter--;
if (requestCounter === 0) this.onMetricsLoaded();
+if (this.get('graphView')) {
+ var graph = this.get('childViews') &&
this.get('childViews').findProperty('runningRequests');
+ if (graph) {
+var requestsArrayName = graph.get('isPopup') ?
'runningPopupRequests' : 'runningRequests';
+graph.set(requestsArrayName,
graph.get(requestsArrayName).reject(function (item) {
+ return item === xhr;
+}));
+ }
+}
}
});
} else {
@@ -132,9 +141,18 @@ App.WidgetMixin = Ember.Mixin.create({
startCallName: 'getServiceComponentMetrics',
successCallback: this.getMetricsSuccessCallback,
errorCallback: this.getMetricsErrorCallback,
- completeCallback: function () {
+ completeCallback: function (xhr) {
requestCounter--;
if (requestCounter === 0) this.onMetricsLoaded();
+if (this.get('graphView')) {
+ var graph = this.get('childViews') &&
this.get('childViews').findProperty('runningRequests');
+ if (graph) {
+var requestsArrayName = graph.get('isPopup') ?
'runningPopupRequests' : 'runningRequests';
+graph.set(requestsArrayName,
graph.get(requestsArrayName).reject(function (item) {
+ return item === xhr;
+}));
+ }
+}
}
});
}
@@ -192,7 +210,7 @@ App.WidgetMixin = Ember.Mixin.create({
* @returns {$.ajax}
*/
getServiceComponentMetrics: function (request) {
-return App.ajax.send({
+var xhr = App.ajax.send({
name: 'widgets.serviceComponent.metrics.get',
sender: this,
data: {
@@ -201,6 +219,14 @@ App.WidgetMixin = Ember.Mixin.create({
metricPaths: this.prepareMetricPaths(request.metric_paths)
}
});
+if (this.get('graphView')) {
+ var graph = this.get('childViews') &&
this.get('childViews').findProperty('runningRequests');
+ if (graph) {
+var requestsArrayName = graph.get('isPopup') ? 'runningPopupRequests'
: 'runningRequests';
+graph.get(requestsArrayName).push(xhr);
+ }
+}
+return xhr;
},
/**
@@ -230,15 +256,21 @@ App.WidgetMixin = Ember.Mixin.create({
var metricPaths = this.prepareMetricPaths(request.metric_paths);
if (metricPaths.length) {
- return App.ajax.send({
-name: 'widgets.hostComponent.metrics.get',
-sender: this,
-data: {
- componentName: request.component_name,
- metricPaths: this.prepareMetricPaths(request.metric_paths),
- hostComponentCriteria: this.computeHostComponentCriteria(request)
-}
- });
+ var xhr = App.aj
ambari git commit: AMBARI-14912: Add upgrade support for Setting feature (Ajit Kumar via smnaha)
Repository: ambari
Updated Branches:
refs/heads/trunk a91890a81 -> 7d06e8bf6
AMBARI-14912: Add upgrade support for Setting feature (Ajit Kumar via smnaha)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7d06e8bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7d06e8bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7d06e8bf
Branch: refs/heads/trunk
Commit: 7d06e8bf68abe725620c0eb60cce16959901c747
Parents: a91890a
Author: Nahappan Somasundaram
Authored: Wed Feb 17 09:06:39 2016 -0800
Committer: Nahappan Somasundaram
Committed: Wed Feb 17 09:06:39 2016 -0800
--
.../server/upgrade/UpgradeCatalog240.java | 76 +---
.../server/upgrade/UpgradeCatalog240Test.java | 92 ++--
2 files changed, 132 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d06e8bf/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
index 2ea326a..d97962f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.upgrade;
+import com.google.common.collect.Lists;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
@@ -30,6 +31,8 @@ import
org.apache.ambari.server.controller.AmbariManagementController;
import org.apache.ambari.server.orm.DBAccessor;
import org.apache.ambari.server.orm.dao.AlertDefinitionDAO;
import org.apache.ambari.server.orm.dao.DaoUtils;
+import org.apache.ambari.server.orm.dao.PermissionDAO;
+import org.apache.ambari.server.orm.dao.ResourceTypeDAO;
import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
import org.apache.ambari.server.orm.entities.PermissionEntity;
import org.apache.ambari.server.state.Cluster;
@@ -37,7 +40,9 @@ import org.apache.ambari.server.state.Clusters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Statement;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -58,12 +63,19 @@ public class UpgradeCatalog240 extends
AbstractUpgradeCatalog {
@Inject
DaoUtils daoUtils;
+ @Inject
+ PermissionDAO permissionDAO;
+
+ @Inject
+ ResourceTypeDAO resourceTypeDAO;
+
/**
* Logger.
*/
private static final Logger LOG =
LoggerFactory.getLogger(UpgradeCatalog240.class);
-
+ private static final String ID = "id";
+ private static final String SETTING_TABLE = "setting";
// - Constructors --
@@ -76,7 +88,7 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog
{
@Inject
public UpgradeCatalog240(Injector injector) {
super(injector);
-this.injector = injector;
+injector.injectMembers(this);
}
// - UpgradeCatalog
@@ -103,6 +115,7 @@ public class UpgradeCatalog240 extends
AbstractUpgradeCatalog {
@Override
protected void executeDDLUpdates() throws AmbariException, SQLException {
updateAdminPermissionTable();
+createSettingTable();
}
@Override
@@ -115,7 +128,39 @@ public class UpgradeCatalog240 extends
AbstractUpgradeCatalog {
addNewConfigurationsFromXml();
updateAlerts();
setRoleSortOrder();
+addSettingPermission();
+ }
+
+ private void createSettingTable() throws SQLException {
+List columns = new ArrayList<>();
+// Add setting table
+LOG.info("Creating " + SETTING_TABLE + " table");
+
+columns.add(new DBAccessor.DBColumnInfo(ID, Long.class, null, null,
false));
+columns.add(new DBAccessor.DBColumnInfo("name", String.class, 255, null,
false));
+columns.add(new DBAccessor.DBColumnInfo("setting_type", String.class, 255,
null, false));
+columns.add(new DBAccessor.DBColumnInfo("content", String.class, 3000,
null, false));
+columns.add(new DBAccessor.DBColumnInfo("updated_by", String.class, 255,
"_db", false));
+columns.add(new DBAccessor.DBColumnInfo("update_timestamp", Long.class,
null, null, false));
+dbAccessor.createTable(SETTING_TABLE, columns, ID);
+addSequence("setting_id_seq", 0L, false);
+ }
+
+ protected void addSettingPermission() throws SQLException {
+String administratorPermissionId =
+permissionDAO.findPermissionByNameAndType("AMBARI.ADMINISTRATO
ambari git commit: AMBARI-15072. Failures in Express Upgrade from Dal M20 to Derg due to missing modules (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 4c73a51dc -> 70c7432b8
AMBARI-15072. Failures in Express Upgrade from Dal M20 to Derg due to missing
modules (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/70c7432b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/70c7432b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/70c7432b
Branch: refs/heads/branch-2.2
Commit: 70c7432b873f147f8c8ea7c905f12f3d59db4404
Parents: 4c73a51
Author: Andrew Onishuk
Authored: Wed Feb 17 19:53:23 2016 +0200
Committer: Andrew Onishuk
Committed: Wed Feb 17 19:53:23 2016 +0200
--
.../main/resources/custom_actions/scripts/ru_execute_tasks.py| 2 +-
.../src/test/python/custom_actions/test_ru_execute_tasks.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/70c7432b/ambari-server/src/main/resources/custom_actions/scripts/ru_execute_tasks.py
--
diff --git
a/ambari-server/src/main/resources/custom_actions/scripts/ru_execute_tasks.py
b/ambari-server/src/main/resources/custom_actions/scripts/ru_execute_tasks.py
index 928fef8..8e526c5 100644
---
a/ambari-server/src/main/resources/custom_actions/scripts/ru_execute_tasks.py
+++
b/ambari-server/src/main/resources/custom_actions/scripts/ru_execute_tasks.py
@@ -144,7 +144,7 @@ class ExecuteUpgradeTasks(Script):
self.logging_level,
Script.get_tmp_dir()]
- task.command = " ".join(command_params)
+ task.command = "source /var/lib/ambari-agent/ambari-env.sh ; " + "
".join(command_params)
# Replace redundant whitespace to make the unit tests easier to
validate
task.command = re.sub("\s+", " ", task.command).strip()
http://git-wip-us.apache.org/repos/asf/ambari/blob/70c7432b/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py
--
diff --git
a/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py
b/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py
index 3fa29a6..266be42 100644
--- a/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py
+++ b/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py
@@ -104,7 +104,7 @@ class TestRUExecuteTasks(RMFTestCase):
ru_execute = ExecuteUpgradeTasks()
ru_execute.actionexecute(None)
-call_mock.assert_called_with("/usr/bin/ambari-python-wrap
/var/lib/ambari-agent/cache/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
prepare_rolling_upgrade /tmp", logoutput=True, quiet=True)
+call_mock.assert_called_with("source /var/lib/ambari-agent/ambari-env.sh ;
/usr/bin/ambari-python-wrap
/var/lib/ambari-agent/cache/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
prepare_rolling_upgrade /tmp", logoutput=True, quiet=True)
@patch("resource_management.core.shell.checked_call")
@patch("os.path.exists")
@@ -149,4 +149,4 @@ class TestRUExecuteTasks(RMFTestCase):
ru_execute = ExecuteUpgradeTasks()
ru_execute.actionexecute(None)
-call_mock.assert_called_with("/usr/bin/ambari-python-wrap
/var/lib/ambari-agent/cache/custom_actions/scripts/namenode.py
prepare_rolling_upgrade /tmp", logoutput=True, quiet=True)
+call_mock.assert_called_with("source /var/lib/ambari-agent/ambari-env.sh ;
/usr/bin/ambari-python-wrap
/var/lib/ambari-agent/cache/custom_actions/scripts/namenode.py
prepare_rolling_upgrade /tmp", logoutput=True, quiet=True)
ambari git commit: AMBARI-15072. Failures in Express Upgrade from Dal M20 to Derg due to missing modules (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 7d06e8bf6 -> d4b67b1fd
AMBARI-15072. Failures in Express Upgrade from Dal M20 to Derg due to missing
modules (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d4b67b1f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d4b67b1f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d4b67b1f
Branch: refs/heads/trunk
Commit: d4b67b1fd39fdbdc05c8f0d9449d0c0156befa6c
Parents: 7d06e8b
Author: Andrew Onishuk
Authored: Wed Feb 17 19:58:17 2016 +0200
Committer: Andrew Onishuk
Committed: Wed Feb 17 19:58:17 2016 +0200
--
.../main/resources/custom_actions/scripts/ru_execute_tasks.py| 2 +-
.../src/test/python/custom_actions/test_ru_execute_tasks.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d4b67b1f/ambari-server/src/main/resources/custom_actions/scripts/ru_execute_tasks.py
--
diff --git
a/ambari-server/src/main/resources/custom_actions/scripts/ru_execute_tasks.py
b/ambari-server/src/main/resources/custom_actions/scripts/ru_execute_tasks.py
index 928fef8..8e526c5 100644
---
a/ambari-server/src/main/resources/custom_actions/scripts/ru_execute_tasks.py
+++
b/ambari-server/src/main/resources/custom_actions/scripts/ru_execute_tasks.py
@@ -144,7 +144,7 @@ class ExecuteUpgradeTasks(Script):
self.logging_level,
Script.get_tmp_dir()]
- task.command = " ".join(command_params)
+ task.command = "source /var/lib/ambari-agent/ambari-env.sh ; " + "
".join(command_params)
# Replace redundant whitespace to make the unit tests easier to
validate
task.command = re.sub("\s+", " ", task.command).strip()
http://git-wip-us.apache.org/repos/asf/ambari/blob/d4b67b1f/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py
--
diff --git
a/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py
b/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py
index 31c1030..6147b87 100644
--- a/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py
+++ b/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py
@@ -129,7 +129,7 @@ class TestRUExecuteTasks(RMFTestCase):
ru_execute.actionexecute(None)
call_mock.assert_called_with(
-"/usr/bin/ambari-python-wrap
/var/lib/ambari-agent/cache/common-services/HDFS/2.1.0.2.0/package" + os.sep +
+"source /var/lib/ambari-agent/ambari-env.sh ;
/usr/bin/ambari-python-wrap
/var/lib/ambari-agent/cache/common-services/HDFS/2.1.0.2.0/package" + os.sep +
"scripts/namenode.py prepare_rolling_upgrade /tmp", logoutput=True,
quiet=True)
pass
@@ -176,6 +176,6 @@ class TestRUExecuteTasks(RMFTestCase):
ru_execute = ExecuteUpgradeTasks()
ru_execute.actionexecute(None)
-call_mock.assert_called_with("/usr/bin/ambari-python-wrap
/var/lib/ambari-agent/cache/custom_actions" + os.sep +
+call_mock.assert_called_with("source /var/lib/ambari-agent/ambari-env.sh ;
/usr/bin/ambari-python-wrap /var/lib/ambari-agent/cache/custom_actions" +
os.sep +
"scripts/namenode.py prepare_rolling_upgrade
/tmp", logoutput=True, quiet=True)
pass
ambari git commit: AMBARI-15062. Combo Search: Create auto suggest for Component State filter (Joe Wang via rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk d4b67b1fd -> 4124ae032
AMBARI-15062. Combo Search: Create auto suggest for Component State filter (Joe
Wang via rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4124ae03
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4124ae03
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4124ae03
Branch: refs/heads/trunk
Commit: 4124ae032646ca3f7bbea19288da9cba259933e5
Parents: d4b67b1
Author: Richard Zang
Authored: Wed Feb 17 11:00:59 2016 -0800
Committer: Richard Zang
Committed: Wed Feb 17 11:00:59 2016 -0800
--
ambari-web/app/controllers/main/host/combo_search_box.js | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4124ae03/ambari-web/app/controllers/main/host/combo_search_box.js
--
diff --git a/ambari-web/app/controllers/main/host/combo_search_box.js
b/ambari-web/app/controllers/main/host/combo_search_box.js
index d835e97..f4cc50f 100644
--- a/ambari-web/app/controllers/main/host/combo_search_box.js
+++ b/ambari-web/app/controllers/main/host/combo_search_box.js
@@ -88,13 +88,7 @@ App.MainHostComboSearchBoxController = Em.Controller.extend({
callback(App.HostComponent.find().toArray().mapProperty('componentName').uniq(),
{preserveOrder: true});
break;
case 'state':
- callback([
-Em.I18n.t('common.started'),
-Em.I18n.t('common.stopped'),
-Em.I18n.t('hosts.host.stackVersions.status.install_failed'),
-Em.I18n.t('hosts.host.decommissioning'),
-Em.I18n.t('hosts.host.decommissioned')
- ], {preserveOrder: true});
+ callback(App.HostComponentStatus.getStatusesList(), {preserveOrder:
true});
break;
}
}
ambari git commit: AMBARI-15020: HAWQ service check fails when PXF is present due to cmd syntax error (bhuvnesh2703 via jaoki)
Repository: ambari
Updated Branches:
refs/heads/trunk 4124ae032 -> c282a0eec
AMBARI-15020: HAWQ service check fails when PXF is present due to cmd syntax
error (bhuvnesh2703 via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c282a0ee
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c282a0ee
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c282a0ee
Branch: refs/heads/trunk
Commit: c282a0eec34809290be93a4c08f6686948ff896f
Parents: 4124ae0
Author: Jun Aoki
Authored: Wed Feb 17 11:12:57 2016 -0800
Committer: Jun Aoki
Committed: Wed Feb 17 11:12:57 2016 -0800
--
.../common-services/HAWQ/2.0.0/package/scripts/utils.py | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c282a0ee/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
index 51a38d1..f40e982 100644
---
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
+++
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
@@ -79,12 +79,8 @@ def exec_ssh_cmd(hostname, cmd):
"""
Runs the command on the remote host as gpadmin user
"""
- import params
# Only gpadmin should be allowed to run command via ssh, thus not exposing
user as a parameter
- if params.hostname != hostname:
-cmd = "su - {0} -c 'ssh -o StrictHostKeyChecking=no -o
UserKnownHostsFile=/dev/null {1} \"{2} \" '".format(hawq_constants.hawq_user,
hostname, cmd)
- else:
-cmd = "su - {0} -c \"{1}\"".format(hawq_constants.hawq_user, cmd)
+ cmd = "su - {0} -c \"ssh -o StrictHostKeyChecking=no -o
UserKnownHostsFile=/dev/null {1} \\\"{2} \\\"
\"".format(hawq_constants.hawq_user, hostname, cmd)
Logger.info("Command executed: {0}".format(cmd))
process = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stdin=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
(stdout, stderr) = process.communicate()
@@ -97,9 +93,9 @@ def exec_psql_cmd(command, host, port, db="template1",
tuples_only=True):
"""
src_cmd = "export PGPORT={0} && source {1}".format(port,
hawq_constants.hawq_greenplum_path_file)
if tuples_only:
-cmd = src_cmd + " && psql -d {0} -c \\\"{1};\\\"".format(db, command)
+cmd = src_cmd + " && psql -d {0} -c \\\"{1};\\\"".format(db,
command)
else:
-cmd = src_cmd + " && psql -t -d {0} -c \\\"{1};\\\"".format(db, command)
+cmd = src_cmd + " && psql -t -d {0} -c \\\"{1};\\\"".format(db,
command)
retcode, out, err = exec_ssh_cmd(host, cmd)
if retcode:
Logger.error("SQL command executed failed: {0}\nReturncode: {1}\nStdout:
{2}\nStderr: {3}".format(cmd, retcode, out, err))
ambari git commit: AMBARI-15020: HAWQ service check fails when PXF is present due to cmd syntax error (bhuvnesh2703 via jaoki)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 70c7432b8 -> 750e4e45d
AMBARI-15020: HAWQ service check fails when PXF is present due to cmd syntax
error (bhuvnesh2703 via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/750e4e45
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/750e4e45
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/750e4e45
Branch: refs/heads/branch-2.2
Commit: 750e4e45d6ea5bf4e73129475c1f3d67f10cf662
Parents: 70c7432
Author: Jun Aoki
Authored: Wed Feb 17 11:13:31 2016 -0800
Committer: Jun Aoki
Committed: Wed Feb 17 11:13:31 2016 -0800
--
.../common-services/HAWQ/2.0.0/package/scripts/utils.py | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/750e4e45/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
index a8036d8..dc6c203 100644
---
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
+++
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
@@ -79,12 +79,8 @@ def exec_ssh_cmd(hostname, cmd):
"""
Runs the command on the remote host as gpadmin user
"""
- import params
# Only gpadmin should be allowed to run command via ssh, thus not exposing
user as a parameter
- if params.hostname != hostname:
-cmd = "su - {0} -c 'ssh -o StrictHostKeyChecking=no -o
UserKnownHostsFile=/dev/null {1} \"{2} \" '".format(hawq_constants.hawq_user,
hostname, cmd)
- else:
-cmd = "su - {0} -c \"{1}\"".format(hawq_constants.hawq_user, cmd)
+ cmd = "su - {0} -c \"ssh -o StrictHostKeyChecking=no -o
UserKnownHostsFile=/dev/null {1} \\\"{2} \\\"
\"".format(hawq_constants.hawq_user, hostname, cmd)
Logger.info("Command executed: {0}".format(cmd))
process = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stdin=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
(stdout, stderr) = process.communicate()
@@ -97,9 +93,9 @@ def exec_psql_cmd(command, host, port, db="template1",
tuples_only=True):
"""
src_cmd = "export PGPORT={0} && source {1}".format(port,
hawq_constants.hawq_greenplum_path_file)
if tuples_only:
-cmd = src_cmd + " && psql -d {0} -c \\\"{1};\\\"".format(db, command)
+cmd = src_cmd + " && psql -d {0} -c \\\"{1};\\\"".format(db,
command)
else:
-cmd = src_cmd + " && psql -t -d {0} -c \\\"{1};\\\"".format(db, command)
+cmd = src_cmd + " && psql -t -d {0} -c \\\"{1};\\\"".format(db,
command)
retcode, out, err = exec_ssh_cmd(host, cmd)
if retcode:
Logger.error("SQL command executed failed: {0}\nReturncode: {1}\nStdout:
{2}\nStderr: {3}".format(cmd, retcode, out, err))
ambari git commit: AMBARI-15036. Return privilege information with results from GroupResourceProvider (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk c282a0eec -> 5a9bb7158
AMBARI-15036. Return privilege information with results from
GroupResourceProvider (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5a9bb715
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5a9bb715
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5a9bb715
Branch: refs/heads/trunk
Commit: 5a9bb715811f93104cc593215049a861c13d45d0
Parents: c282a0e
Author: Robert Levas
Authored: Wed Feb 17 14:14:31 2016 -0500
Committer: Robert Levas
Committed: Wed Feb 17 14:14:39 2016 -0500
--
.../api/resources/GroupResourceDefinition.java | 1 +
.../resources/ResourceInstanceFactoryImpl.java | 4 +
.../api/services/GroupPrivilegeService.java | 76
.../server/api/services/GroupService.java | 11 +
.../internal/DefaultProviderModule.java | 2 +
.../GroupPrivilegeResourceProvider.java | 237
.../ambari/server/controller/spi/Resource.java | 2 +
.../api/services/GroupPrivilegeServiceTest.java | 109 ++
.../GroupPrivilegeResourceProviderTest.java | 362 +++
9 files changed, 804 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5a9bb715/ambari-server/src/main/java/org/apache/ambari/server/api/resources/GroupResourceDefinition.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/GroupResourceDefinition.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/GroupResourceDefinition.java
index 783e04b..57e5e20 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/GroupResourceDefinition.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/GroupResourceDefinition.java
@@ -44,6 +44,7 @@ public class GroupResourceDefinition extends
BaseResourceDefinition {
public Set getSubResourceDefinitions() {
final Set subResourceDefinitions = new
HashSet();
subResourceDefinitions.add(new
SubResourceDefinition(Resource.Type.Member));
+subResourceDefinitions.add(new
SubResourceDefinition(Resource.Type.GroupPrivilege));
return subResourceDefinitions;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5a9bb715/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
index 4c12094..b0160b9 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
@@ -297,6 +297,10 @@ public class ResourceInstanceFactoryImpl implements
ResourceInstanceFactory {
resourceDefinition = new
PrivilegeResourceDefinition(Resource.Type.UserPrivilege);
break;
+ case GroupPrivilege:
+resourceDefinition = new
PrivilegeResourceDefinition(Resource.Type.GroupPrivilege);
+break;
+
case ViewPermission:
resourceDefinition = new ViewPermissionResourceDefinition();
break;
http://git-wip-us.apache.org/repos/asf/ambari/blob/5a9bb715/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupPrivilegeService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupPrivilegeService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupPrivilegeService.java
new file mode 100644
index 000..290d488
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupPrivilegeService.java
@@ -0,0 +1,76 @@
+/*
+ * 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 governin
ambari git commit: AMBARI-15001: Hdfs keytab for hawq service check on secured cluster
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 750e4e45d -> 7517c4dad
AMBARI-15001: Hdfs keytab for hawq service check on secured cluster
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7517c4da
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7517c4da
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7517c4da
Branch: refs/heads/branch-2.2
Commit: 7517c4dad6a71278921037db9af404311ca35347
Parents: 750e4e4
Author: Jun Aoki
Authored: Wed Feb 17 12:26:20 2016 -0800
Committer: Jun Aoki
Committed: Wed Feb 17 12:26:20 2016 -0800
--
.../common-services/HAWQ/2.0.0/kerberos.json| 125 +--
1 file changed, 56 insertions(+), 69 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7517c4da/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/kerberos.json
--
diff --git
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/kerberos.json
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/kerberos.json
index cc11c15..da11986 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/kerberos.json
@@ -1,73 +1,60 @@
{
-"services": [
+ "services": [
+{
+ "name": "HAWQ",
+ "identities": [
{
-"name": "HAWQ",
-"identities": [
-{
-"name": "/hdfs"
-}
-],
-"configurations": [
-{
-"hawq-site": {
-"enable_secure_filesystem": "ON",
-"krb_server_keyfile":
"${keytab_dir}/hawq.service.keytab"
-}
-},
-{
-"hdfs-client": {
-"hadoop.security.authentication": "kerberos"
-}
-}
-],
-"components": [
-{
-"identities": [
-{
-"keytab": {
-"file": "${keytab_dir}/hawq.service.keytab",
-"group": {
-"access": "",
-"name": "${cluster-env/user_group}"
-},
-"owner": {
-"access": "r",
-"name": "gpadmin"
-}
-},
-"name": "hawq_master_hawq",
-"principal": {
-"type": "service",
-"value": "postgres@${realm}"
-}
-}
-],
-"name": "HAWQMASTER"
-},
-{
-"identities": [
-{
-"keytab": {
-"file": "${keytab_dir}/hawq.service.keytab",
-"group": {
-"access": "",
-"name": "${cluster-env/user_group}"
-},
-"owner": {
-"access": "r",
-"name": "gpadmin"
-}
-},
-"name": "hawq_standby_hawq",
-"principal": {
-"type": "service",
-"value": "postgres@${realm}"
-}
-}
-],
-"name": "HAWQSTANDBY"
-}
-]
+ "name": "/HDFS/NAMENODE/hdfs"
+},
+{
+ "name": "hawq_identity",
+ "principal": {
+"type": "user",
+"value": "postgres@${realm}"
+ },
+ "keytab": {
+"file": "${keytab_dir}/hawq.service.keytab",
+"owner": {
+ "access": "r",
+ "name": "gpadmin"
+},
+"group": {
+ "name": "${cluster-env/user_group}"
+}
+ }
+}
+ ],
+ "configurations": [
+{
+ "hawq-site": {
+"enable_secure_filesystem": "ON",
+"krb_server_keyfile": "${keytab_dir}/hawq.service.keytab"
+ }
+},
+{
+ "hdfs-client": {
+
ambari git commit: AMBARI-15001: Hdfs keytab for hawq service check on secured cluster
Repository: ambari
Updated Branches:
refs/heads/trunk 5a9bb7158 -> 0ea255c59
AMBARI-15001: Hdfs keytab for hawq service check on secured cluster
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0ea255c5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0ea255c5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0ea255c5
Branch: refs/heads/trunk
Commit: 0ea255c59005eda4d5684230460d8b1c647c78f7
Parents: 5a9bb71
Author: Jun Aoki
Authored: Wed Feb 17 12:27:50 2016 -0800
Committer: Jun Aoki
Committed: Wed Feb 17 12:27:50 2016 -0800
--
.../common-services/HAWQ/2.0.0/kerberos.json| 125 +--
1 file changed, 56 insertions(+), 69 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0ea255c5/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/kerberos.json
--
diff --git
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/kerberos.json
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/kerberos.json
index cc11c15..da11986 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/kerberos.json
@@ -1,73 +1,60 @@
{
-"services": [
+ "services": [
+{
+ "name": "HAWQ",
+ "identities": [
{
-"name": "HAWQ",
-"identities": [
-{
-"name": "/hdfs"
-}
-],
-"configurations": [
-{
-"hawq-site": {
-"enable_secure_filesystem": "ON",
-"krb_server_keyfile":
"${keytab_dir}/hawq.service.keytab"
-}
-},
-{
-"hdfs-client": {
-"hadoop.security.authentication": "kerberos"
-}
-}
-],
-"components": [
-{
-"identities": [
-{
-"keytab": {
-"file": "${keytab_dir}/hawq.service.keytab",
-"group": {
-"access": "",
-"name": "${cluster-env/user_group}"
-},
-"owner": {
-"access": "r",
-"name": "gpadmin"
-}
-},
-"name": "hawq_master_hawq",
-"principal": {
-"type": "service",
-"value": "postgres@${realm}"
-}
-}
-],
-"name": "HAWQMASTER"
-},
-{
-"identities": [
-{
-"keytab": {
-"file": "${keytab_dir}/hawq.service.keytab",
-"group": {
-"access": "",
-"name": "${cluster-env/user_group}"
-},
-"owner": {
-"access": "r",
-"name": "gpadmin"
-}
-},
-"name": "hawq_standby_hawq",
-"principal": {
-"type": "service",
-"value": "postgres@${realm}"
-}
-}
-],
-"name": "HAWQSTANDBY"
-}
-]
+ "name": "/HDFS/NAMENODE/hdfs"
+},
+{
+ "name": "hawq_identity",
+ "principal": {
+"type": "user",
+"value": "postgres@${realm}"
+ },
+ "keytab": {
+"file": "${keytab_dir}/hawq.service.keytab",
+"owner": {
+ "access": "r",
+ "name": "gpadmin"
+},
+"group": {
+ "name": "${cluster-env/user_group}"
+}
+ }
+}
+ ],
+ "configurations": [
+{
+ "hawq-site": {
+"enable_secure_filesystem": "ON",
+"krb_server_keyfile": "${keytab_dir}/hawq.service.keytab"
+ }
+},
+{
+ "hdfs-client": {
+"had
ambari git commit: AMBARI-15051. Improvements and fixes for database check.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 7517c4dad -> a088c7059
AMBARI-15051. Improvements and fixes for database check.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a088c705
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a088c705
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a088c705
Branch: refs/heads/branch-2.2
Commit: a088c7059e7d4e306e58a0b3df1b5f02501ac68a
Parents: 7517c4d
Author: Vitaly Brodetskyi
Authored: Mon Feb 15 14:43:20 2016 +0200
Committer: Vitaly Brodetskyi
Committed: Mon Feb 15 14:43:20 2016 +0200
--
ambari-server/conf/unix/log4j.properties| 9 ++
ambari-server/conf/windows/log4j.properties | 9 ++
ambari-server/src/main/conf/log4j.properties| 9 ++
.../server/checks/CheckDatabaseHelper.java | 155 +--
.../main/python/ambari_server/checkDatabase.py | 7 +-
.../server/checks/CheckDatabaseHelperTest.java | 29 ++--
.../src/test/python/TestAmbariServer.py | 3 +-
7 files changed, 152 insertions(+), 69 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a088c705/ambari-server/conf/unix/log4j.properties
--
diff --git a/ambari-server/conf/unix/log4j.properties
b/ambari-server/conf/unix/log4j.properties
index c87b1f4..18ec33e 100644
--- a/ambari-server/conf/unix/log4j.properties
+++ b/ambari-server/conf/unix/log4j.properties
@@ -23,6 +23,7 @@ ambari.log.file=ambari-server.log
ambari.config-changes.file=ambari-config-changes.log
ambari.alerts.file=ambari-alerts.log
ambari.eclipselink.file=ambari-eclipselink.log
+ambari.dbcheck.file=ambari-server-check-database.log
log4j.rootLogger=INFO,file
@@ -50,6 +51,14 @@
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
+# Log database check process
+log4j.logger.org.apache.ambari.server.checks.CheckDatabaseHelper=INFO, dbcheck
+log4j.additivity.org.apache.ambari.server.checks.CheckDatabaseHelper=false
+log4j.appender.dbcheck=org.apache.log4j.FileAppender
+log4j.appender.dbcheck.File=${ambari.log.dir}/${ambari.dbcheck.file}
+log4j.appender.dbcheck.layout=org.apache.log4j.PatternLayout
+log4j.appender.dbcheck.layout.ConversionPattern=%d{ISO8601} %m%n
+
# EclipsLink -> slf4j bridge
log4j.logger.eclipselink=TRACE,eclipselink
log4j.additivity.eclipselink=false
http://git-wip-us.apache.org/repos/asf/ambari/blob/a088c705/ambari-server/conf/windows/log4j.properties
--
diff --git a/ambari-server/conf/windows/log4j.properties
b/ambari-server/conf/windows/log4j.properties
index 8a69508..09505cf 100644
--- a/ambari-server/conf/windows/log4j.properties
+++ b/ambari-server/conf/windows/log4j.properties
@@ -23,6 +23,7 @@ ambari.log.file=ambari-server.log
ambari.config-changes.file=ambari-config-changes.log
ambari.alerts.file=ambari-alerts.log
ambari.eclipselink.file=ambari-eclipselink.log
+ambari.dbcheck.file=ambari-server-check-database.log
# Define the root logger to the system property "ambari.root.logger".
log4j.rootLogger=${ambari.root.logger}
@@ -76,6 +77,14 @@
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
+# Log database check process
+log4j.logger.org.apache.ambari.server.checks.CheckDatabaseHelper=INFO, dbcheck
+log4j.additivity.org.apache.ambari.server.checks.CheckDatabaseHelper=false
+log4j.appender.dbcheck=org.apache.log4j.FileAppender
+log4j.appender.dbcheck.File=${ambari.log.dir}/${ambari.dbcheck.file}
+log4j.appender.dbcheck.layout=org.apache.log4j.PatternLayout
+log4j.appender.dbcheck.layout.ConversionPattern=%d{ISO8601} %m%n
+
# EclipsLink -> slf4j bridge
log4j.logger.eclipselink=TRACE,eclipselink
log4j.additivity.eclipselink=false
http://git-wip-us.apache.org/repos/asf/ambari/blob/a088c705/ambari-server/src/main/conf/log4j.properties
--
diff --git a/ambari-server/src/main/conf/log4j.properties
b/ambari-server/src/main/conf/log4j.properties
index 11e8d51..1211fe3 100644
--- a/ambari-server/src/main/conf/log4j.properties
+++ b/ambari-server/src/main/conf/log4j.properties
@@ -23,6 +23,7 @@ ambari.log.file=ambari-server.log
ambari.config-changes.file=ambari-config-changes.log
ambari.alerts.file=ambari-alerts.log
ambari.eclipselink.file=ambari-eclipselink.log
+ambari.dbcheck.file=ambari-server-check-database.log
# Define the root logger to the system property "ambari.root.logger".
log4j.rootLog
ambari git commit: AMBARI-15051. Improvements and fixes for database check.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk 0ea255c59 -> 4761fe7c4
AMBARI-15051. Improvements and fixes for database check.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4761fe7c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4761fe7c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4761fe7c
Branch: refs/heads/trunk
Commit: 4761fe7c40b10d4a5c1f7b2564df475c4a66222b
Parents: 0ea255c
Author: Vitaly Brodetskyi
Authored: Mon Feb 15 14:51:36 2016 +0200
Committer: Vitaly Brodetskyi
Committed: Mon Feb 15 14:51:36 2016 +0200
--
ambari-server/conf/unix/log4j.properties| 9 ++
ambari-server/conf/windows/log4j.properties | 9 ++
ambari-server/src/main/conf/log4j.properties| 9 ++
.../server/checks/CheckDatabaseHelper.java | 155 +--
.../main/python/ambari_server/checkDatabase.py | 7 +-
.../server/checks/CheckDatabaseHelperTest.java | 29 ++--
.../src/test/python/TestAmbariServer.py | 3 +-
7 files changed, 152 insertions(+), 69 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4761fe7c/ambari-server/conf/unix/log4j.properties
--
diff --git a/ambari-server/conf/unix/log4j.properties
b/ambari-server/conf/unix/log4j.properties
index c87b1f4..18ec33e 100644
--- a/ambari-server/conf/unix/log4j.properties
+++ b/ambari-server/conf/unix/log4j.properties
@@ -23,6 +23,7 @@ ambari.log.file=ambari-server.log
ambari.config-changes.file=ambari-config-changes.log
ambari.alerts.file=ambari-alerts.log
ambari.eclipselink.file=ambari-eclipselink.log
+ambari.dbcheck.file=ambari-server-check-database.log
log4j.rootLogger=INFO,file
@@ -50,6 +51,14 @@
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
+# Log database check process
+log4j.logger.org.apache.ambari.server.checks.CheckDatabaseHelper=INFO, dbcheck
+log4j.additivity.org.apache.ambari.server.checks.CheckDatabaseHelper=false
+log4j.appender.dbcheck=org.apache.log4j.FileAppender
+log4j.appender.dbcheck.File=${ambari.log.dir}/${ambari.dbcheck.file}
+log4j.appender.dbcheck.layout=org.apache.log4j.PatternLayout
+log4j.appender.dbcheck.layout.ConversionPattern=%d{ISO8601} %m%n
+
# EclipsLink -> slf4j bridge
log4j.logger.eclipselink=TRACE,eclipselink
log4j.additivity.eclipselink=false
http://git-wip-us.apache.org/repos/asf/ambari/blob/4761fe7c/ambari-server/conf/windows/log4j.properties
--
diff --git a/ambari-server/conf/windows/log4j.properties
b/ambari-server/conf/windows/log4j.properties
index 8a69508..09505cf 100644
--- a/ambari-server/conf/windows/log4j.properties
+++ b/ambari-server/conf/windows/log4j.properties
@@ -23,6 +23,7 @@ ambari.log.file=ambari-server.log
ambari.config-changes.file=ambari-config-changes.log
ambari.alerts.file=ambari-alerts.log
ambari.eclipselink.file=ambari-eclipselink.log
+ambari.dbcheck.file=ambari-server-check-database.log
# Define the root logger to the system property "ambari.root.logger".
log4j.rootLogger=${ambari.root.logger}
@@ -76,6 +77,14 @@
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
+# Log database check process
+log4j.logger.org.apache.ambari.server.checks.CheckDatabaseHelper=INFO, dbcheck
+log4j.additivity.org.apache.ambari.server.checks.CheckDatabaseHelper=false
+log4j.appender.dbcheck=org.apache.log4j.FileAppender
+log4j.appender.dbcheck.File=${ambari.log.dir}/${ambari.dbcheck.file}
+log4j.appender.dbcheck.layout=org.apache.log4j.PatternLayout
+log4j.appender.dbcheck.layout.ConversionPattern=%d{ISO8601} %m%n
+
# EclipsLink -> slf4j bridge
log4j.logger.eclipselink=TRACE,eclipselink
log4j.additivity.eclipselink=false
http://git-wip-us.apache.org/repos/asf/ambari/blob/4761fe7c/ambari-server/src/main/conf/log4j.properties
--
diff --git a/ambari-server/src/main/conf/log4j.properties
b/ambari-server/src/main/conf/log4j.properties
index 11e8d51..1211fe3 100644
--- a/ambari-server/src/main/conf/log4j.properties
+++ b/ambari-server/src/main/conf/log4j.properties
@@ -23,6 +23,7 @@ ambari.log.file=ambari-server.log
ambari.config-changes.file=ambari-config-changes.log
ambari.alerts.file=ambari-alerts.log
ambari.eclipselink.file=ambari-eclipselink.log
+ambari.dbcheck.file=ambari-server-check-database.log
# Define the root logger to the system property "ambari.root.logger".
log4j.rootLogger=${amba
ambari git commit: AMBARI-14997: Update gpcheck.cnf to hawq_check.cnf file as recommended in HAWQ documentation (bhuvnesh2703 via jaoki)
Repository: ambari Updated Branches: refs/heads/branch-2.2 a088c7059 -> 52b72ac59 AMBARI-14997: Update gpcheck.cnf to hawq_check.cnf file as recommended in HAWQ documentation (bhuvnesh2703 via jaoki) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/52b72ac5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/52b72ac5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/52b72ac5 Branch: refs/heads/branch-2.2 Commit: 52b72ac5988cfa51eb4bf4fa7094f942b0cf7fb4 Parents: a088c70 Author: Jun Aoki Authored: Wed Feb 17 13:50:14 2016 -0800 Committer: Jun Aoki Committed: Wed Feb 17 13:50:14 2016 -0800 -- .../HAWQ/2.0.0/configuration/gpcheck-env.xml| 86 --- .../HAWQ/2.0.0/configuration/hawq-check-env.xml | 87 .../common-services/HAWQ/2.0.0/metainfo.xml | 2 +- .../2.0.0/package/scripts/hawq_constants.py | 2 +- .../HAWQ/2.0.0/package/scripts/master_helper.py | 2 +- .../HAWQ/2.0.0/package/scripts/params.py| 2 +- .../stacks/2.3/common/services-hawq-1-host.json | 2 +- .../2.3/common/services-hawq-3-hosts.json | 2 +- .../2.3/common/services-hawq-pxf-hdfs.json | 4 +- .../services-master_ambari_colo-3-hosts.json| 2 +- .../services-master_standby_colo-3-hosts.json | 2 +- .../common/services-normal-hawq-3-hosts.json| 2 +- .../services-standby_ambari_colo-3-hosts.json | 2 +- ambari-web/app/data/HDP2.3/site_properties.js | 4 +- ambari-web/app/models/stack_service.js | 4 +- 15 files changed, 103 insertions(+), 102 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml deleted file mode 100755 index a61a34f..000 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - content - Content - Contents of the configuration file /usr/local/hawq/etc/gpcheck.cnf. This file is used by 'hawq check' command, which can be run manually by gpadmin user on the HAWQ master host. This command validates the system parameters and HDFS parameters mentioned in this file to ensure optimal HAWQ operation. - -[global] -configfile_version = 4 - -[linux.mount] -mount.points = / - -[linux.sysctl] -sysctl.kernel.shmmax = 5 -sysctl.kernel.shmmni = 4096 -sysctl.kernel.shmall = 40 -sysctl.kernel.sem = 250 512000 100 2048 -sysctl.kernel.sysrq = 1 -sysctl.kernel.core_uses_pid = 1 -sysctl.kernel.msgmnb = 65536 -sysctl.kernel.msgmax = 65536 -sysctl.kernel.msgmni = 2048 -sysctl.net.ipv4.tcp_syncookies = 0 -sysctl.net.ipv4.ip_forward = 0 -sysctl.net.ipv4.conf.default.accept_source_route = 0 -sysctl.net.ipv4.tcp_tw_recycle = 1 -sysctl.net.ipv4.tcp_max_syn_backlog = 20 -sysctl.net.ipv4.conf.all.arp_filter = 1 -sysctl.net.ipv4.ip_local_port_range = 1281 65535 -sysctl.net.core.netdev_max_backlog = 20 -sysctl.vm.overcommit_memory = 2 -sysctl.fs.nr_open = 300 -sysctl.kernel.threads-max = 798720 -sysctl.kernel.pid_max = 798720 -# increase network -sysctl.net.core.rmem_max = 2097152 -sysctl.net.core.wmem_max = 2097152 - -[linux.limits] -soft.nofile = 290 -hard.nofile = 290 -soft.nproc = 131072 -hard.nproc = 131072 - -[linux.diskusage] -diskusage.monitor.mounts = / -diskusage.monitor.usagemax = 90% - -[hdfs] -dfs.mem.namenode.heap = 40960 -dfs.mem.datanode.heap = 6144 -# in hdfs-site.xml -dfs.support.append = true -dfs.client.enable.read.from.local = true -dfs.block.local-path-access.user = gpadmin -dfs.datanode.max.transfer.threads = 40960 -dfs.client.socket-timeout = 3 -dfs.datanode.socket.write.timeout = 720 -dfs.namenode.handler.count = 60 -ipc.server.handler.queue.size = 3300 -dfs.datanode.handler.count = 60 -ipc.client.connection.maxidletime = 360 -dfs.namenode.accesstime.precision = -1 - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml new file mode 100644 index 000..58bfa27 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml @@ -0,0
ambari git commit: AMBARI-15074 Combo Search: Implement "host" related filters (Joe Wang via rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk 4761fe7c4 -> f11d76db2
AMBARI-15074 Combo Search: Implement "host" related filters (Joe Wang via rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f11d76db
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f11d76db
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f11d76db
Branch: refs/heads/trunk
Commit: f11d76db25714e0bea2b52f907051664ee160aaa
Parents: 4761fe7
Author: Richard Zang
Authored: Wed Feb 17 13:51:07 2016 -0800
Committer: Richard Zang
Committed: Wed Feb 17 13:51:07 2016 -0800
--
ambari-web/app/controllers/main/host.js | 18 +++
.../controllers/main/host/combo_search_box.js | 28 +-
.../app/views/main/host/combo_search_box.js | 55 +++-
3 files changed, 74 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f11d76db/ambari-web/app/controllers/main/host.js
--
diff --git a/ambari-web/app/controllers/main/host.js
b/ambari-web/app/controllers/main/host.js
index a38b2db..d3574b2 100644
--- a/ambari-web/app/controllers/main/host.js
+++ b/ambari-web/app/controllers/main/host.js
@@ -100,6 +100,21 @@ App.MainHostController =
Em.ArrayController.extend(App.TableServerMixin, {
type: 'MULTIPLE'
},
{
+ name: 'hostComponents2',
+ key: 'host_components/HostRoles/component_name',
+ type: 'MATCH'
+},
+{
+ name: 'services',
+ key: 'host_components/HostRoles/service_name',
+ type: 'MATCH'
+},
+{
+ name: 'state',
+ key: 'host_components/HostRoles/state',
+ type: 'MATCH'
+},
+{
name: 'healthClass',
key: 'Hosts/host_status',
type: 'EQUAL'
@@ -544,6 +559,9 @@ App.MainHostController =
Em.ArrayController.extend(App.TableServerMixin, {
associations[10] = 'selected';
associations[11] = 'hostStackVersion';
associations[12] = 'rack';
+associations[13] = 'services';
+associations[14] = 'state';
+associations[15] = 'hostComponents2';
return associations;
}.property()
http://git-wip-us.apache.org/repos/asf/ambari/blob/f11d76db/ambari-web/app/controllers/main/host/combo_search_box.js
--
diff --git a/ambari-web/app/controllers/main/host/combo_search_box.js
b/ambari-web/app/controllers/main/host/combo_search_box.js
index f4cc50f..0aeb31b 100644
--- a/ambari-web/app/controllers/main/host/combo_search_box.js
+++ b/ambari-web/app/controllers/main/host/combo_search_box.js
@@ -24,23 +24,6 @@ App.MainHostComboSearchBoxController = Em.Controller.extend({
page_size: 10,
VSCallbacks : {
-search: function (query, searchCollection) {
- var $query = $('#search_query');
- var count = searchCollection.size();
- $query.stop().animate({opacity: 1}, {duration: 300, queue: false});
- $query.html('ยป You searched for: ' +
- '' + (query || 'nothing') + '. ' +
- '(' + count + ' facet' + (count == 1 ? '' : 's') + ')');
- clearTimeout(window.queryHideDelay);
- window.queryHideDelay = setTimeout(function () {
-$query.animate({
- opacity: 0
-}, {
- duration: 1000,
- queue: false
-});
- }, 2000);
-},
facetMatches: function (callback) {
callback([
@@ -57,6 +40,7 @@ App.MainHostComboSearchBoxController = Em.Controller.extend({
valueMatches: function (facet, searchTerm, callback) {
var controller = App.router.get('mainHostComboSearchBoxController');
+ var category_mocks = require('data/host/categories');
switch (facet) {
case 'host_name':
case 'ip':
@@ -71,15 +55,7 @@ App.MainHostComboSearchBoxController = Em.Controller.extend({
callback(App.StackVersion.find().toArray().mapProperty('name'));
break;
case 'health':
- callback([
-Em.I18n.t('hosts.host.healthStatusCategory.green'),
-Em.I18n.t('hosts.host.healthStatusCategory.red'),
-Em.I18n.t('hosts.host.healthStatusCategory.orange'),
-Em.I18n.t('hosts.host.healthStatusCategory.yellow'),
-Em.I18n.t('hosts.host.alerts.label'),
-Em.I18n.t('common.restart'),
-Em.I18n.t('common.passive_state')
- ]);
+ callback(category_mocks.slice(1).mapProperty('healthStatus'),
{preserveOrder: true});
break;
case 'service':
callback(App.Service.find().toArray().mapProperty('serviceName'),
{preserveOrder: true});
http://git-wip-us.apache.org/repos/asf/ambari/blob/f11d76db/ambari-web/app/views/main/host/combo_search_box.js
--
ambari git commit: AMBARI-15019: Refactor HAWQ common.py after moving config substitution to UI (lavjain via jaoki)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 52b72ac59 -> bb314bd35
AMBARI-15019: Refactor HAWQ common.py after moving config substitution to UI
(lavjain via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bb314bd3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bb314bd3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bb314bd3
Branch: refs/heads/branch-2.2
Commit: bb314bd35549d1fa79534041146e2033d795514a
Parents: 52b72ac
Author: Jun Aoki
Authored: Wed Feb 17 14:45:44 2016 -0800
Committer: Jun Aoki
Committed: Wed Feb 17 14:45:44 2016 -0800
--
.../HAWQ/2.0.0/package/scripts/common.py| 60
.../HAWQ/2.0.0/package/scripts/params.py| 19 +--
2 files changed, 23 insertions(+), 56 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb314bd3/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
index 05b56f5..edeb5af 100644
---
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
+++
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
@@ -20,9 +20,7 @@ import os
import time
import crypt
import filecmp
-from resource_management.libraries.resources.xml_config import XmlConfig
from resource_management.core.resources.system import Execute, Directory, File
-from resource_management.libraries.script.config_dictionary import
ConfigDictionary
from resource_management.core.logger import Logger
from resource_management.core.system import System
from resource_management.core.exceptions import Fail
@@ -67,58 +65,20 @@ def setup_common_configurations():
"""
Sets up the config files common to master, standby and segment nodes.
"""
- __update_hdfs_client()
- __update_yarn_client()
- __update_hawq_site()
- __set_osparams()
-
-def __update_hdfs_client():
- """
- Writes hdfs-client.xml on the local filesystem on hawq nodes.
- If hdfs ha is enabled, appends related parameters to hdfs-client.xml
- """
import params
- hdfs_client_dict = params.hdfs_client.copy()
+ params.XmlConfig(filename="hdfs-client.xml",
+ configurations=params.hdfs_client,
+ configuration_attributes=params.config_attrs['hdfs-client'])
- XmlConfig("hdfs-client.xml",
-conf_dir=hawq_constants.hawq_config_dir,
-configurations=ConfigDictionary(hdfs_client_dict),
-
configuration_attributes=params.config['configuration_attributes']['hdfs-client'],
-owner=hawq_constants.hawq_user,
-group=hawq_constants.hawq_group,
-mode=0644)
+ params.XmlConfig(filename="yarn-client.xml",
+ configurations=params.yarn_client,
+ configuration_attributes=params.config_attrs['yarn-client'])
-
-def __update_yarn_client():
- """
- Writes yarn-client.xml on the local filesystem on hawq nodes.
- If yarn ha is enabled, appends related parameters to yarn-client.xml
- """
- import params
-
- XmlConfig("yarn-client.xml",
-conf_dir=hawq_constants.hawq_config_dir,
-configurations=params.yarn_client,
-
configuration_attributes=params.config['configuration_attributes']['yarn-client'],
-owner=hawq_constants.hawq_user,
-group=hawq_constants.hawq_group,
-mode=0644)
-
-
-def __update_hawq_site():
- """
- Sets up hawq-site.xml
- """
- import params
-
- XmlConfig("hawq-site.xml",
-conf_dir=hawq_constants.hawq_config_dir,
-configurations=ConfigDictionary(params.hawq_site),
-
configuration_attributes=params.config['configuration_attributes']['hawq-site'],
-owner=hawq_constants.hawq_user,
-group=hawq_constants.hawq_group,
-mode=0644)
+ params.XmlConfig(filename="hawq-site.xml",
+ configurations=params.hawq_site,
+ configuration_attributes=params.config_attrs['hawq-site'])
+ __set_osparams()
def __set_osparams():
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb314bd3/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py
index 48b933e..74c9813 100644
---
a/ambari-server/src/m
ambari git commit: AMBARI-15019: Refactor HAWQ common.py after moving config substitution to UI (lavjain via jaoki)
Repository: ambari
Updated Branches:
refs/heads/trunk f11d76db2 -> b15c0f3d7
AMBARI-15019: Refactor HAWQ common.py after moving config substitution to UI
(lavjain via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b15c0f3d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b15c0f3d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b15c0f3d
Branch: refs/heads/trunk
Commit: b15c0f3d7432dbd6b6ce6c678b6cc2884a73c68b
Parents: f11d76d
Author: Jun Aoki
Authored: Wed Feb 17 14:46:58 2016 -0800
Committer: Jun Aoki
Committed: Wed Feb 17 14:46:58 2016 -0800
--
.../HAWQ/2.0.0/package/scripts/common.py| 63
.../HAWQ/2.0.0/package/scripts/params.py| 19 --
2 files changed, 26 insertions(+), 56 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b15c0f3d/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
index 23342f5..b5353e8 100644
---
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
+++
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
@@ -20,9 +20,7 @@ import os
import time
import crypt
import filecmp
-from resource_management.libraries.resources.xml_config import XmlConfig
from resource_management.core.resources.system import Execute, Directory, File
-from resource_management.libraries.script.config_dictionary import
ConfigDictionary
from resource_management.core.logger import Logger
from resource_management.core.system import System
from resource_management.core.exceptions import Fail
@@ -67,58 +65,23 @@ def setup_common_configurations():
"""
Sets up the config files common to master, standby and segment nodes.
"""
- __update_hdfs_client()
- __update_yarn_client()
- __update_hawq_site()
- __set_osparams()
-
-def __update_hdfs_client():
- """
- Writes hdfs-client.xml on the local filesystem on hawq nodes.
- If hdfs ha is enabled, appends related parameters to hdfs-client.xml
- """
- import params
-
- hdfs_client_dict = params.hdfs_client.copy()
-
- XmlConfig("hdfs-client.xml",
-conf_dir=hawq_constants.hawq_config_dir,
-configurations=ConfigDictionary(hdfs_client_dict),
-
configuration_attributes=params.config['configuration_attributes']['hdfs-client'],
-owner=hawq_constants.hawq_user,
-group=hawq_constants.hawq_group,
-mode=0644)
-
-
-def __update_yarn_client():
- """
- Writes yarn-client.xml on the local filesystem on hawq nodes.
- If yarn ha is enabled, appends related parameters to yarn-client.xml
- """
import params
- XmlConfig("yarn-client.xml",
-conf_dir=hawq_constants.hawq_config_dir,
-configurations=params.yarn_client,
-
configuration_attributes=params.config['configuration_attributes']['yarn-client'],
-owner=hawq_constants.hawq_user,
-group=hawq_constants.hawq_group,
-mode=0644)
+ # Write hdfs-client.xml on the local filesystem. If hdfs HA is enabled,
append related parameters
+ params.XmlConfig(filename="hdfs-client.xml",
+ configurations=params.hdfs_client,
+ configuration_attributes=params.config_attrs['hdfs-client'])
+ # Write yarn-client.xml on the local filesystem. If yarn HA is enabled,
append related parameters
+ params.XmlConfig(filename="yarn-client.xml",
+ configurations=params.yarn_client,
+ configuration_attributes=params.config_attrs['yarn-client'])
-def __update_hawq_site():
- """
- Sets up hawq-site.xml
- """
- import params
-
- XmlConfig("hawq-site.xml",
-conf_dir=hawq_constants.hawq_config_dir,
-configurations=ConfigDictionary(params.hawq_site),
-
configuration_attributes=params.config['configuration_attributes']['hawq-site'],
-owner=hawq_constants.hawq_user,
-group=hawq_constants.hawq_group,
-mode=0644)
+ # Write hawq-site.xml on the local filesystem.
+ params.XmlConfig(filename="hawq-site.xml",
+ configurations=params.hawq_site,
+ configuration_attributes=params.config_attrs['hawq-site'])
+ __set_osparams()
def __set_osparams():
http://git-wip-us.apache.org/repos/asf/ambari/blob/b15c0f3d/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py
--
d
[2/2] ambari git commit: AMBARI-15079. Preupload.py should pre-create hdfs directories (aonishuk)
AMBARI-15079. Preupload.py should pre-create hdfs directories (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/df2dbe15
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/df2dbe15
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/df2dbe15
Branch: refs/heads/trunk
Commit: df2dbe150b97ecb74ddf4652463b8062f288203a
Parents: b15c0f3
Author: Andrew Onishuk
Authored: Thu Feb 18 00:50:21 2016 +0200
Committer: Andrew Onishuk
Committed: Thu Feb 18 00:50:48 2016 +0200
--
.../libraries/providers/hdfs_resource.py| 63 +---
.../libraries/resources/hdfs_resource.py| 12
.../1.6.1.2.2.0/package/scripts/params.py | 1 +
.../0.1.0/package/scripts/params.py | 1 +
.../0.5.0.2.1/package/scripts/params_linux.py | 1 +
.../0.96.0.2.0/package/scripts/params_linux.py | 1 +
.../2.1.0.2.0/package/scripts/params_linux.py | 1 +
.../0.12.0.2.0/package/scripts/params_linux.py | 1 +
.../KAFKA/0.8.1.2.2/package/scripts/params.py | 1 +
.../0.5.0.2.2/package/scripts/params_linux.py | 1 +
.../MAHOUT/1.0.0.2.3/package/scripts/params.py | 1 +
.../4.0.0.2.0/package/scripts/params_linux.py | 1 +
.../0.12.0.2.0/package/scripts/params_linux.py | 1 +
.../0.60.0.2.2/package/scripts/params_linux.py | 1 +
.../SPARK/1.2.0.2.2/package/scripts/params.py | 1 +
.../0.9.1.2.1/package/scripts/params_linux.py | 1 +
.../0.4.0.2.1/package/scripts/params_linux.py | 1 +
.../2.1.0.2.0/package/scripts/params_linux.py | 1 +
.../main/resources/scripts/Ambaripreupload.py | 54 ++---
.../2.0.6/hooks/before-START/scripts/params.py | 1 +
.../AMBARI_METRICS/test_metrics_collector.py| 6 +-
.../stacks/2.0.6/HBASE/test_hbase_master.py | 18 +++---
.../python/stacks/2.0.6/HDFS/test_namenode.py | 54 -
.../stacks/2.0.6/HDFS/test_service_check.py | 8 +--
.../stacks/2.0.6/HIVE/test_hive_server.py | 28 -
.../2.0.6/HIVE/test_hive_service_check.py | 12 ++--
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 32 +-
.../stacks/2.0.6/OOZIE/test_service_check.py| 10 ++--
.../stacks/2.0.6/PIG/test_pig_service_check.py | 12 ++--
.../stacks/2.0.6/YARN/test_historyserver.py | 29 +
.../2.0.6/YARN/test_mapreduce2_service_check.py | 12 ++--
.../stacks/2.1/FALCON/test_falcon_server.py | 12 ++--
.../python/stacks/2.1/TEZ/test_service_check.py | 16 ++---
.../stacks/2.1/YARN/test_apptimelineserver.py | 2 +-
.../stacks/2.2/PIG/test_pig_service_check.py| 12 ++--
.../stacks/2.2/SPARK/test_job_history_server.py | 11 ++--
.../2.3/MAHOUT/test_mahout_service_check.py | 8 +--
.../2.3/SPARK/test_spark_thrift_server.py | 4 +-
.../test/python/stacks/2.3/YARN/test_ats_1_5.py | 10 ++--
39 files changed, 267 insertions(+), 175 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/df2dbe15/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
b/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
index ebcf1a4..b73ae56 100644
---
a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
+++
b/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
@@ -151,32 +151,13 @@ class WebHDFSUtil:
# only hdfs seems to support webHDFS
return (is_webhdfs_enabled and default_fs.startswith("hdfs"))
- def parse_path(self, path):
-"""
-hdfs://nn_url:1234/a/b/c -> /a/b/c
-hdfs://nn_ha_name/a/b/c -> /a/b/c
-hdfs:///a/b/c -> /a/b/c
-/a/b/c -> /a/b/c
-"""
-math_with_protocol_and_nn_url = re.match("[a-zA-Z]+://[^/]+(/.+)", path)
-math_with_protocol = re.match("[a-zA-Z]+://(/.+)", path)
-
-if math_with_protocol_and_nn_url:
- path = math_with_protocol_and_nn_url.group(1)
-elif math_with_protocol:
- path = math_with_protocol.group(1)
-else:
- path = path
-
-return re.sub("[/]+", "/", path)
-
valid_status_codes = ["200", "201"]
def run_command(self, target, operation, method='POST',
assertable_result=True, file_to_put=None, ignore_status_codes=[], **kwargs):
"""
assertable_result - some POST requests return '{"boolean":false}' or
'{"boolean":true}'
depending on if query was successful or not, we can assert this for them
"""
-target = self.parse_path(target)
+target = HdfsResourceProvider.parse_path(target)
url =
format("{address}/webhdfs/v1{target}?op={operation}&user.name={run_user}",
address=self.address, run_
[1/2] ambari git commit: AMBARI-15079. Preupload.py should pre-create hdfs directories (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk b15c0f3d7 -> df2dbe150
http://git-wip-us.apache.org/repos/asf/ambari/blob/df2dbe15/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
index 185db68..69e1f5d 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
@@ -60,6 +60,7 @@ class TestHistoryServer(RMFTestCase):
self.assertResourceCalled("HdfsResource", "/apps/tez/",
type="directory",
action=["create_on_execute"],
+
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
user=u"hdfs",
dfs_type = '',
owner=u"tez",
@@ -77,6 +78,7 @@ class TestHistoryServer(RMFTestCase):
self.assertResourceCalled("HdfsResource", "/apps/tez/lib/",
type="directory",
action=["create_on_execute"],
+
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
user=u'hdfs',
owner=u"tez",
dfs_type = '',
@@ -93,6 +95,7 @@ class TestHistoryServer(RMFTestCase):
self.assertResourceCalled("HdfsResource", None,
action=['execute'],
+
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
user=u'hdfs',
hadoop_bin_dir="/usr/bin",
dfs_type = '',
@@ -205,7 +208,7 @@ class TestHistoryServer(RMFTestCase):
group = 'hadoop',
hadoop_bin_dir = '/usr/bin',
type = 'directory',
-action = ['create_on_execute'],
hdfs_site=self.getConfig()['configurations']['hdfs-site'],
principal_name=UnknownConfigurationMock(),
default_fs='hdfs://c6401.ambari.apache.org:8020',
+action = ['create_on_execute'],
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hdfs_site=self.getConfig()['configurations']['hdfs-site'],
principal_name=UnknownConfigurationMock(),
default_fs='hdfs://c6401.ambari.apache.org:8020',
mode = 0777,
)
self.assertResourceCalled('HdfsResource',
'/tmp/entity-file-history/active',
@@ -222,7 +225,7 @@ class TestHistoryServer(RMFTestCase):
group = 'hadoop',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
-action = ['create_on_execute'],
+action = ['create_on_execute'],
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', '/mapred',
security_enabled = False,
@@ -234,7 +237,7 @@ class TestHistoryServer(RMFTestCase):
owner = 'mapred',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
-action = ['create_on_execute'],
hdfs_site=self.getConfig()['configurations']['hdfs-site'],
principal_name=UnknownConfigurationMock(),
default_fs='hdfs://c6401.ambari.apache.org:8020',
+action = ['create_on_execute'],
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hdfs_site=self.getConfig()['configurations']['hdfs-site'],
principal_name=UnknownConfigurationMock(),
default_fs='hdfs://c6401.ambari.apache.org:8020',
)
self.assertResourceCalled('HdfsResource', '/mapred/system',
security_enabled = False,
@@ -246,7 +249,7 @@ class TestHistoryServer(RMFTestCase):
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
-action = ['create_on_execute'],
hdfs_site=self.getConfig()['configurations']['hdfs-site'],
principal_name=UnknownConfigurationMock(),
default_fs='hdfs://c6401.ambari.apache.org:8020',
+action = ['create_on_execute'],
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
hdfs_site=self.getConfig()['configurations']['hdfs-site'],
principal_name=UnknownConfigurationMock(),
default_fs='hdfs://c6401.ambari.apache.org:8020',
)
self.assertResourceCalled('HdfsResource', '/mr-history/done',
security_enabled = False,
@@ -260,7 +263,7 @@ class TestHistoryServer(RMFTestCase):
group = 'hadoop',
hadoop_bin_dir = '/usr/bin',
type = 'directory',
-action = ['create_on_execute'],
hdfs_site=self.getConfig()['configurations']['hdfs-site'],
principal_name=UnknownConfigurationMock(),
default_fs='hdfs://c6401.ambari.apache.org:8020',
+action = ['create_on_execute'],
hdfs_r
ambari git commit: AMBARI-15063 : Metrics monitor fails on restart - Commit 2 (avijayan)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 bb314bd35 -> 4c4c5bc1e
AMBARI-15063 : Metrics monitor fails on restart - Commit 2 (avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4c4c5bc1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4c4c5bc1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4c4c5bc1
Branch: refs/heads/branch-2.2
Commit: 4c4c5bc1e59c9014cdbdf4b2a47c8be355249e9e
Parents: bb314bd
Author: Aravindan Vijayan
Authored: Wed Feb 17 15:18:17 2016 -0800
Committer: Aravindan Vijayan
Committed: Wed Feb 17 15:18:17 2016 -0800
--
.../conf/unix/ambari-metrics-monitor | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c4c5bc1/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
--
diff --git
a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
index aa4ae02..7464c55 100644
---
a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
+++
b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
@@ -131,7 +131,7 @@ case "$1" in
echo "Checking for previously running Metric Monitor..."
if [ -f ${PIDFILE} ]; then
PID=`cat ${PIDFILE}`
- if [ -z "`ps ax -o pid | grep -w ${PID} | grep resource_monitoring`" ];
then
+ if [ -z "`ps ax | grep -w ${PID} | grep resource_monitoring`" ]; then
echo "${PIDFILE} found with no process. Removing ${PID}..."
rm -f ${PIDFILE}
else
@@ -152,7 +152,7 @@ case "$1" in
sleep 2
echo "Verifying ${METRIC_MONITOR} process status..."
-if [ -z "`ps ax -o pid | grep -w ${PID} | grep resource_monitoring`" ];
then
+if [ -z "`ps ax | grep -w ${PID} | grep resource_monitoring`" ]; then
if [ -s ${OUTFILE} ]; then
echo "ERROR: ${METRIC_MONITOR} start failed. For more details, see
${OUTFILE}:"
echo ""
@@ -173,7 +173,7 @@ case "$1" in
if [ -f ${PIDFILE} ]; then
PID=`cat ${PIDFILE}`
echo "Found ${METRIC_MONITOR} PID: $PID"
- if [ -z "`ps ax -o pid | grep -w ${PID} | grep resource_monitoring`" ];
then
+ if [ -z "`ps ax | grep -w ${PID} | grep resource_monitoring`" ]; then
echo "${METRIC_MONITOR} not running. Stale PID File at: $PIDFILE"
retcode=2
else
ambari git commit: AMBARI-15063 : Metrics monitor fails on restart - Commit 2 (avijayan)
Repository: ambari
Updated Branches:
refs/heads/trunk df2dbe150 -> 8999aee37
AMBARI-15063 : Metrics monitor fails on restart - Commit 2 (avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8999aee3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8999aee3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8999aee3
Branch: refs/heads/trunk
Commit: 8999aee37b2f4129304f6e93b7928d0bafd68f25
Parents: df2dbe1
Author: Aravindan Vijayan
Authored: Wed Feb 17 15:20:10 2016 -0800
Committer: Aravindan Vijayan
Committed: Wed Feb 17 15:20:10 2016 -0800
--
.../conf/unix/ambari-metrics-monitor | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8999aee3/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
--
diff --git
a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
index aa4ae02..7464c55 100644
---
a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
+++
b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
@@ -131,7 +131,7 @@ case "$1" in
echo "Checking for previously running Metric Monitor..."
if [ -f ${PIDFILE} ]; then
PID=`cat ${PIDFILE}`
- if [ -z "`ps ax -o pid | grep -w ${PID} | grep resource_monitoring`" ];
then
+ if [ -z "`ps ax | grep -w ${PID} | grep resource_monitoring`" ]; then
echo "${PIDFILE} found with no process. Removing ${PID}..."
rm -f ${PIDFILE}
else
@@ -152,7 +152,7 @@ case "$1" in
sleep 2
echo "Verifying ${METRIC_MONITOR} process status..."
-if [ -z "`ps ax -o pid | grep -w ${PID} | grep resource_monitoring`" ];
then
+if [ -z "`ps ax | grep -w ${PID} | grep resource_monitoring`" ]; then
if [ -s ${OUTFILE} ]; then
echo "ERROR: ${METRIC_MONITOR} start failed. For more details, see
${OUTFILE}:"
echo ""
@@ -173,7 +173,7 @@ case "$1" in
if [ -f ${PIDFILE} ]; then
PID=`cat ${PIDFILE}`
echo "Found ${METRIC_MONITOR} PID: $PID"
- if [ -z "`ps ax -o pid | grep -w ${PID} | grep resource_monitoring`" ];
then
+ if [ -z "`ps ax | grep -w ${PID} | grep resource_monitoring`" ]; then
echo "${METRIC_MONITOR} not running. Stale PID File at: $PIDFILE"
retcode=2
else
ambari git commit: AMBARI-15033. RU/EU from HDP 2.2 to 2.3 or 2.4 to remove deprecated kafka-broker port property (alejandro)
Repository: ambari Updated Branches: refs/heads/trunk 8999aee37 -> b53a13fe6 AMBARI-15033. RU/EU from HDP 2.2 to 2.3 or 2.4 to remove deprecated kafka-broker port property (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b53a13fe Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b53a13fe Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b53a13fe Branch: refs/heads/trunk Commit: b53a13fe6a96eb8e620f0ee86643c8b96ed19c77 Parents: 8999aee Author: Alejandro Fernandez Authored: Wed Feb 17 15:30:56 2016 -0800 Committer: Alejandro Fernandez Committed: Wed Feb 17 16:24:02 2016 -0800 -- .../stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 3 +-- .../stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 3 +-- .../src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 2 ++ .../src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml | 2 ++ .../HDP/2.3/services/KAFKA/configuration/kafka-broker.xml | 2 +- .../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml | 5 +++-- .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 3 +-- .../src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 4 .../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 5 +++-- 9 files changed, 18 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b53a13fe/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml index 84da86c..5c6c456 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml @@ -526,9 +526,8 @@ - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/b53a13fe/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml index c0eae48..eca1789 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml @@ -564,9 +564,8 @@ - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/b53a13fe/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml index 353dc86..61540b7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml @@ -811,6 +811,8 @@ scripts/kafka_broker.py stop + + http://git-wip-us.apache.org/repos/asf/ambari/blob/b53a13fe/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml index cfd2904..5c91764 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml @@ -824,6 +824,8 @@ scripts/kafka_broker.py stop + + http://git-wip-us.apache.org/repos/asf/ambari/blob/b53a13fe/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml index 6e924e2..8802f13 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml @@ -23,7 +23,7 @@ listeners
ambari git commit: AMBARI-15033. RU/EU from HDP 2.2 to 2.3 or 2.4 to remove deprecated kafka-broker port property (alejandro)
Repository: ambari Updated Branches: refs/heads/branch-2.2 4c4c5bc1e -> 4923ff0a7 AMBARI-15033. RU/EU from HDP 2.2 to 2.3 or 2.4 to remove deprecated kafka-broker port property (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4923ff0a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4923ff0a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4923ff0a Branch: refs/heads/branch-2.2 Commit: 4923ff0a72499bd5e8cad9ea42598605a64c1b4d Parents: 4c4c5bc Author: Alejandro Fernandez Authored: Wed Feb 17 16:21:27 2016 -0800 Committer: Alejandro Fernandez Committed: Wed Feb 17 17:10:01 2016 -0800 -- .../stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 3 +-- .../stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 3 +-- .../src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 2 ++ .../src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml | 2 ++ .../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml | 5 +++-- .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 3 +-- .../src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 4 .../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 5 +++-- 8 files changed, 17 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/4923ff0a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml index dc461a9..47e7a64 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml @@ -526,9 +526,8 @@ - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/4923ff0a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml index c0eae48..eca1789 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml @@ -564,9 +564,8 @@ - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/4923ff0a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml index b1ac2ed..6dcbcb2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml @@ -816,6 +816,8 @@ scripts/kafka_broker.py stop + + http://git-wip-us.apache.org/repos/asf/ambari/blob/4923ff0a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml index cfd2904..5c91764 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml @@ -824,6 +824,8 @@ scripts/kafka_broker.py stop + + http://git-wip-us.apache.org/repos/asf/ambari/blob/4923ff0a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml index b8963bc..04d5d6d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml @@ -893,9 +893,10 @@ - + kafka-broker - + + http://git-wip-us.apac
ambari git commit: AMBARI-14881: Enable/Disable Custom Commands on Host Component page (goutamtadi via jaoki)
Repository: ambari
Updated Branches:
refs/heads/trunk b53a13fe6 -> dcebcca60
AMBARI-14881: Enable/Disable Custom Commands on Host Component page (goutamtadi
via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dcebcca6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dcebcca6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dcebcca6
Branch: refs/heads/trunk
Commit: dcebcca60d47743176519b7758b86505263e39a7
Parents: b53a13f
Author: Jun Aoki
Authored: Wed Feb 17 18:52:38 2016 -0800
Committer: Jun Aoki
Committed: Wed Feb 17 18:52:38 2016 -0800
--
ambari-web/app/templates/main/host/details/host_component.hbs | 2 +-
ambari-web/app/views/main/host/details/host_component_view.js | 7 ---
2 files changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcebcca6/ambari-web/app/templates/main/host/details/host_component.hbs
--
diff --git a/ambari-web/app/templates/main/host/details/host_component.hbs
b/ambari-web/app/templates/main/host/details/host_component.hbs
index 00db8d1..60031de 100644
--- a/ambari-web/app/templates/main/host/details/host_component.hbs
+++ b/ambari-web/app/templates/main/host/details/host_component.hbs
@@ -143,7 +143,7 @@
{{/if}}
{{#each command in view.customCommands}}
-
+
{{command.label}}
{{/each}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcebcca6/ambari-web/app/views/main/host/details/host_component_view.js
--
diff --git a/ambari-web/app/views/main/host/details/host_component_view.js
b/ambari-web/app/views/main/host/details/host_component_view.js
index 6205604..d059498 100644
--- a/ambari-web/app/views/main/host/details/host_component_view.js
+++ b/ambari-web/app/views/main/host/details/host_component_view.js
@@ -311,14 +311,15 @@ App.HostComponentView = Em.View.extend({
return;
}
- var isContextPresent = command in
App.HostComponentActionMap.getMap(self) &&
App.HostComponentActionMap.getMap(self)[command].context;
+ var commandMap = App.HostComponentActionMap.getMap(self)[command];
customCommands.push({
label: self.getCustomCommandLabel(command),
service: component.get('serviceName'),
hosts: hostComponent.get('hostName'),
-context: isContextPresent ?
App.HostComponentActionMap.getMap(self)[command].context : null,
+context: (!!commandMap && !!commandMap.context) ? commandMap.context :
null,
component: component.get('componentName'),
-command: command
+command: command,
+disabled: !!commandMap ? !!commandMap.disabled : false
});
});
ambari git commit: AMBARI-15081: Ambari functional tests: Build issues - tests should not run during regular build; JAR file not required.
Repository: ambari
Updated Branches:
refs/heads/trunk dcebcca60 -> 84ca6a88d
AMBARI-15081: Ambari functional tests: Build issues - tests should not run
during regular build; JAR file not required.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/84ca6a88
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/84ca6a88
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/84ca6a88
Branch: refs/heads/trunk
Commit: 84ca6a88d0ba80011394a0ab767a80c7e342aa3c
Parents: dcebcca
Author: Nahappan Somasundaram
Authored: Wed Feb 17 18:00:07 2016 -0800
Committer: Nahappan Somasundaram
Committed: Wed Feb 17 22:39:49 2016 -0800
--
ambari-funtest/pom.xml | 16 +
ambari-funtest/src/main/assemblies/empty.xml | 22 ++
ambari-funtest/src/main/assemblies/funtest.xml | 79 -
3 files changed, 24 insertions(+), 93 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/84ca6a88/ambari-funtest/pom.xml
--
diff --git a/ambari-funtest/pom.xml b/ambari-funtest/pom.xml
index 8d19631..28225c2 100644
--- a/ambari-funtest/pom.xml
+++ b/ambari-funtest/pom.xml
@@ -22,9 +22,6 @@
${packagingFormat}
Ambari Functional Tests
Ambari Functional Tests
-
-true
-
@@ -62,15 +59,6 @@
once
-
-
-run-integration-tests
-test
-
- integration-test
-
-
run-verify
@@ -128,7 +116,7 @@
sh
sh
-
src/main/assemblies/funtest.xml
+src/main/assemblies/empty.xml
jar
@@ -146,7 +134,7 @@
cmd
cmd
-
src/main/assemblies/funtest.xml
+src/main/assemblies/empty.xml
jar
http://git-wip-us.apache.org/repos/asf/ambari/blob/84ca6a88/ambari-funtest/src/main/assemblies/empty.xml
--
diff --git a/ambari-funtest/src/main/assemblies/empty.xml
b/ambari-funtest/src/main/assemblies/empty.xml
new file mode 100644
index 000..9226f2c
--- /dev/null
+++ b/ambari-funtest/src/main/assemblies/empty.xml
@@ -0,0 +1,22 @@
+
+
+
+ empty
+
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/84ca6a88/ambari-funtest/src/main/assemblies/funtest.xml
--
diff --git a/ambari-funtest/src/main/assemblies/funtest.xml
b/ambari-funtest/src/main/assemblies/funtest.xml
deleted file mode 100644
index 93d2e17..000
--- a/ambari-funtest/src/main/assemblies/funtest.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
- dist
-
-dir
-tar.gz
-
- false
-
-
-
${project.build.directory}/${artifact.artifactId}-${artifact.version}.jar
-
ambari-funtest-${project.version}/lib/ambari-funtest
-
-
-
-
-
- ${basedir}/../
- ambari-funtest-${project.version}/
-
-*.txt
-
-
-
-
- ${basedir}/src/main/resources/
-
/ambari-funtest-${project.version}/keystore
-
-db/*
-ca.config
-pass.txt
-
-
-
- ${basedir}/../ambari-web/public
- ambari-funtest-${project.version}/web
-
-**
-
-
-
- src/main/conf
-
/ambari-funtest-${project.version}/etc/ambari-funtest/conf
-
-
-
-
-
ambari-funtest-${project.version}/lib/ambari-funtest
- false
- compile
-
-
-
