Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0fa6d9fd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0fa6d9fd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0fa6d9fd Branch: refs/heads/branch-dev-patch-upgrade Commit: 0fa6d9fda5b77cd6215fc6755591e1fd40206234 Parents: ee623b7 fb62837 Author: Nate Cole <[email protected]> Authored: Fri Jan 15 13:51:27 2016 -0500 Committer: Nate Cole <[email protected]> Committed: Fri Jan 15 13:51:27 2016 -0500 ---------------------------------------------------------------------- .../libraries/providers/hdfs_resource.py | 31 ++- ambari-funtest/pom.xml | 8 +- ambari-project/pom.xml | 24 +- ambari-server/pom.xml | 25 ++- .../ambari/server/api/AmbariErrorHandler.java | 14 +- .../ambari/server/controller/AmbariServer.java | 181 +++++++++------ .../server/controller/KerberosHelperImpl.java | 18 +- .../internal/AbstractProviderModule.java | 9 +- .../internal/UpgradeResourceProvider.java | 12 +- .../ambari/server/state/stack/UpgradePack.java | 14 +- .../state/stack/upgrade/ConfigureTask.java | 38 +++- .../ambari/server/state/stack/upgrade/Task.java | 9 + .../topology/ClusterConfigurationRequest.java | 119 ++++++++-- .../server/upgrade/UpgradeCatalog221.java | 36 +++ .../2.1.0.2.0/package/scripts/params_linux.py | 17 ++ .../2.1.0.2.0/package/scripts/service_check.py | 4 +- .../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 1 + .../stacks/HDP/2.2/upgrades/config-upgrade.xml | 14 ++ .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 4 + .../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 17 +- .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 1 + .../stacks/HDP/2.2/upgrades/upgrade-2.4.xml | 9 + .../2.3/services/TEZ/configuration/tez-site.xml | 12 + .../ambari/server/RandomPortJerseyTest.java | 64 ++++++ .../ambari/server/agent/AgentResourceTest.java | 13 +- .../server/api/AmbariErrorHandlerTest.java | 11 +- .../server/api/services/PersistServiceTest.java | 7 +- .../server/bootstrap/BootStrapResourceTest.java | 13 ++ .../controller/AmbariHandlerListTest.java | 4 +- .../internal/JMXHostProviderTest.java | 24 ++ .../internal/UpgradeResourceProviderTest.java | 8 +- .../server/security/CertGenerationTest.java | 3 + .../SparkShufflePropertyConfigTest.java | 169 ++++++++++++++ .../ClusterConfigurationRequestTest.java | 76 +++++++ .../server/upgrade/UpgradeCatalog221Test.java | 60 +++++ ambari-web/app/controllers/main/host/details.js | 204 +++++++++-------- ambari-web/app/controllers/main/service/item.js | 92 +++++++- .../app/controllers/wizard/step7_controller.js | 44 ---- ambari-web/app/messages.js | 11 + ambari-web/app/models/host_component.js | 6 + ambari-web/app/styles/alerts.less | 14 +- .../main/alerts/definition_details.hbs | 30 ++- ambari-web/app/utils/date/timezone.js | 3 +- ambari-web/app/views/common/filter_view.js | 224 ++++++++----------- .../app/views/main/alert_definitions_view.js | 26 +-- .../main/alerts/definition_details_view.js | 101 ++++++++- ambari-web/app/views/main/service/item.js | 19 +- ambari-web/pom.xml | 17 -- .../global/cluster_controller_test.js | 2 +- .../admin/kerberos/step4_controller_test.js | 34 ++- .../admin/stack_and_upgrade_controller_test.js | 58 +++-- .../test/controllers/main/host/details_test.js | 60 +---- .../test/controllers/main/service/item_test.js | 92 ++++++++ .../test/controllers/wizard/step7_test.js | 54 +---- .../test/controllers/wizard/step8_test.js | 12 +- ambari-web/test/controllers/wizard_test.js | 2 +- .../configs/config_groups_mapper_test.js | 24 +- .../stack_config_properties_mapper_test.js | 20 +- .../wizard/wizardProgressPageController_test.js | 10 +- .../test/models/alerts/alert_config_test.js | 4 +- ambari-web/test/utils/blueprint_test.js | 4 +- ambari-web/test/utils/date/timezone_test.js | 10 +- ambari-web/test/utils/helper_test.js | 44 ++-- ambari-web/test/utils/object_utils_test.js | 2 +- ambari-web/test/utils/ui_effects_test.js | 2 +- .../test/views/common/filter_view_test.js | 84 ++++++- .../main/alerts/definition_details_view_test.js | 4 +- ambari-web/test/views/main/host/summary_test.js | 2 +- .../moment-timezone-with-data-2010-2020.js | 174 +------------- .../src/main/resources/ui/hive-web/bower.json | 2 +- .../pig/resources/jobs/JobResourceManager.java | 15 +- .../org/apache/ambari/view/pig/BasePigTest.java | 1 + 72 files changed, 1687 insertions(+), 889 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0fa6d9fd/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java ---------------------------------------------------------------------- diff --cc ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java index 914c547,4eebb66..9ee1099 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java @@@ -90,7 -93,10 +93,9 @@@ public class UpgradeCatalog221 extends private static final String RANGER_KMS_JDBC_DRIVER = "ranger.ks.jpa.jdbc.driver"; private static final String RANGER_KMS_PROPERTIES = "kms-properties"; + private static final String TEZ_COUNTERS_MAX = "tez.counters.max"; + private static final String TEZ_COUNTERS_MAX_GROUPS = "tez.counters.max.groups"; - // ----- Constructors ------------------------------------------------------ /** http://git-wip-us.apache.org/repos/asf/ambari/blob/0fa6d9fd/ambari-web/test/controllers/wizard/step7_test.js ---------------------------------------------------------------------- diff --cc ambari-web/test/controllers/wizard/step7_test.js index b7a48c9,e93d3f7..3875e66 --- a/ambari-web/test/controllers/wizard/step7_test.js +++ b/ambari-web/test/controllers/wizard/step7_test.js @@@ -1789,87 -1789,12 +1789,53 @@@ describe('App.InstallerStep7Controller' expect(this.yarnRmDetails.description).to.be.equal('Comma separated yarn resourcemanager host addresses with port'); }); - it('yarn.resourcemanager.scheduler.ha__yarn-client', function() { - var expectedYarnRmSchedulerValue = 'c6401.ambari.apache.org:8030,c6402.ambari.apache.org:8030'; - expect(this.yarnRmSchedulerDetails.value).to.be.equal(expectedYarnRmSchedulerValue); - expect(this.yarnRmSchedulerDetails.recommendedValue).to.be.equal(expectedYarnRmSchedulerValue); - expect(this.yarnRmSchedulerDetails.displayName).to.be.equal('yarn.resourcemanager.scheduler.ha'); - expect(this.yarnRmSchedulerDetails.description).to.be.equal('Comma separated yarn resourcemanager scheduler addresses with port'); - }); - }); - - describe('#addHawqConfigsOnKerberizedCluster', function () { - var secureProperties = [ - { - name: 'hadoop.security.authentication', - value: 'kerberos', - file: 'hdfs-client', - isOverridable: false, - isReconfigurable: false - }, { - name: 'enable_secure_filesystem', - value: 'ON', - file: 'hawq-site', - isOverridable: false, - isReconfigurable: false - }, { - name: 'krb_server_keyfile', - value: '/etc/security/keytabs/hawq.service.keytab', - file: 'hawq-site', - isOverridable: true, - isReconfigurable: true - } - ]; - - var configs = [ - { - id: 'dummy__dummy-site', - description: 'dummy__dummy-site', - displayName: 'dummy', - displayType: 'string', - name: 'dummy', - value: 'dummy' - } - ]; - ++<<<<<<< HEAD + beforeEach(function () { + this.originalConfigsLength = configs.length; + installerStep7Controller.addHawqConfigsOnKerberizedCluster(configs); + }); + + it('should add three security related configs for HAWQ if Kerberos is enabled', function () { + // ensure 3 new configs are added + expect(configs.length - this.originalConfigsLength).to.be.eql(3); + }); + + // check if all three new properties were added + secureProperties.forEach(function (newProperty) { + var id = newProperty.name + '__' + newProperty.file; + describe(id, function () { + + beforeEach(function () { + this.newPropertyAdded = configs.findProperty('id', id); + }); + + it('#name', function () { + expect(this.newPropertyAdded.name).to.be.equal(newProperty.name); + }); + it('#displayName', function () { + expect(this.newPropertyAdded.displayName).to.be.equal(newProperty.name); + }); + it('#value', function () { + expect(this.newPropertyAdded.value).to.be.equal(newProperty.value); + }); + it('#recommendedValue', function () { + expect(this.newPropertyAdded.recommendedValue).to.be.equal(newProperty.value); + }); + it('#isOverridable', function () { + expect(this.newPropertyAdded.isOverridable).to.be.equal(newProperty.isOverridable); + }); + it('#isReconfigurable', function () { + expect(this.newPropertyAdded.isReconfigurable).to.be.equal(newProperty.isReconfigurable); + }); + }); ++======= + it('yarn.resourcemanager.scheduler.ha__yarn-client', function() { + var expectedYarnRmSchedulerValue = 'c6401.ambari.apache.org:8030,c6402.ambari.apache.org:8030'; + expect(this.yarnRmSchedulerDetails.value).to.be.equal(expectedYarnRmSchedulerValue); + expect(this.yarnRmSchedulerDetails.recommendedValue).to.be.equal(expectedYarnRmSchedulerValue); + expect(this.yarnRmSchedulerDetails.displayName).to.be.equal('yarn.resourcemanager.scheduler.ha'); + expect(this.yarnRmSchedulerDetails.description).to.be.equal('Comma separated yarn resourcemanager scheduler addresses with port'); ++>>>>>>> trunk }); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/0fa6d9fd/ambari-web/test/utils/helper_test.js ---------------------------------------------------------------------- diff --cc ambari-web/test/utils/helper_test.js index 7d78678,80aec9d..4a0c03f --- a/ambari-web/test/utils/helper_test.js +++ b/ambari-web/test/utils/helper_test.js @@@ -246,7 -246,7 +246,11 @@@ describe('utils/helper', function() afterEach(removeDiv); it('should add tooltip', function() { App.tooltip($('#tooltip-test')); ++<<<<<<< HEAD + expect($('#tooltip-test').data('tooltip').enabled).to.eql(true); ++======= + expect($('#tooltip-test').data('tooltip').enabled).to.be.true; ++>>>>>>> trunk }); }); describe('#popover()', function() { @@@ -254,7 -254,7 +258,11 @@@ afterEach(removeDiv); it('should add popover', function() { App.popover($('#tooltip-test')); ++<<<<<<< HEAD + expect($('#tooltip-test').data('popover').enabled).to.eql(true); ++======= + expect($('#tooltip-test').data('popover').enabled).to.be.true; ++>>>>>>> trunk }); }); describe('#App.format', function(){ http://git-wip-us.apache.org/repos/asf/ambari/blob/0fa6d9fd/ambari-web/vendor/scripts/moment-timezone-with-data-2010-2020.js ---------------------------------------------------------------------- diff --cc ambari-web/vendor/scripts/moment-timezone-with-data-2010-2020.js index 1764e78,7ce0fe0..2f5ac05 --- a/ambari-web/vendor/scripts/moment-timezone-with-data-2010-2020.js +++ b/ambari-web/vendor/scripts/moment-timezone-with-data-2010-2020.js @@@ -1170,4 -999,4 +1000,4 @@@ return moment; --})); ++}));
