[11/11] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade
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/71c4c17a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/71c4c17a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/71c4c17a Branch: refs/heads/branch-dev-patch-upgrade Commit: 71c4c17a110aa21b6e83f300ba8aa6af31116dc1 Parents: 75a91e3 f503655 Author: Nate Cole Authored: Thu Sep 29 10:28:52 2016 -0400 Committer: Nate Cole Committed: Thu Sep 29 10:28:52 2016 -0400 -- .../checks/ServiceCheckValidityCheck.java | 16 +- .../internal/HostResourceProvider.java | 130 -- .../server/controller/internal/RequestImpl.java | 2 +- .../AMBARI_METRICS/0.1.0/metainfo.xml | 17 +- .../stacks/HDP/2.5/services/ATLAS/metainfo.xml | 2 +- .../stacks/HDP/2.5/services/SPARK/kerberos.json | 2 +- .../stacks/HDP/2.5/services/YARN/metainfo.xml | 5 + .../main/resources/stacks/HDP/2.6/metainfo.xml | 23 + .../resources/stacks/HDP/2.6/repos/repoinfo.xml | 132 ++ .../HDP/2.6/services/ACCUMULO/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/ATLAS/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/FALCON/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/FLUME/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/HBASE/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/HDFS/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/HIVE/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/KAFKA/metainfo.xml | 26 ++ .../HDP/2.6/services/KERBEROS/metainfo.xml | 25 ++ .../stacks/HDP/2.6/services/KNOX/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/MAHOUT/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/OOZIE/metainfo.xml | 25 ++ .../stacks/HDP/2.6/services/PIG/metainfo.xml| 26 ++ .../stacks/HDP/2.6/services/RANGER/metainfo.xml | 29 ++ .../HDP/2.6/services/RANGER_KMS/metainfo.xml| 29 ++ .../stacks/HDP/2.6/services/SLIDER/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/SPARK/metainfo.xml | 29 ++ .../stacks/HDP/2.6/services/SPARK2/metainfo.xml | 29 ++ .../stacks/HDP/2.6/services/SQOOP/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/STORM/metainfo.xml | 27 ++ .../stacks/HDP/2.6/services/TEZ/metainfo.xml| 26 ++ .../stacks/HDP/2.6/services/YARN/metainfo.xml | 27 ++ .../HDP/2.6/services/ZEPPELIN/metainfo.xml | 27 ++ .../HDP/2.6/services/ZOOKEEPER/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/stack_advisor.py| 21 + .../server/agent/TestHeartbeatMonitor.java | 32 +- .../server/api/services/AmbariMetaInfoTest.java | 14 +- .../checks/ServiceCheckValidityCheckTest.java | 4 +- .../server/checks/UpgradeCheckOrderTest.java| 4 +- .../AmbariManagementControllerTest.java | 106 + .../internal/HostResourceProviderTest.java | 15 +- ...ThreadPoolExecutorCompletionServiceTest.java | 2 +- .../metadata/AgentAlertDefinitionsTest.java | 2 +- .../apache/ambari/server/orm/OrmTestHelper.java | 12 +- .../apache/ambari/server/orm/TestOrmImpl.java | 94 ++--- .../server/orm/dao/AlertDispatchDAOTest.java| 419 ++- .../security/authorization/TestUsers.java | 369 ++-- .../upgrades/ConfigureActionTest.java | 104 ++--- .../upgrades/UpgradeActionTest.java | 150 ++- .../apache/ambari/server/state/ServiceTest.java | 106 ++--- .../svccomphost/ServiceComponentHostTest.java | 167 +++- .../server/upgrade/UpgradeCatalog210Test.java | 34 +- 51 files changed, 1533 insertions(+), 1088 deletions(-) --
[11/11] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade
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/79e67865 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/79e67865 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/79e67865 Branch: refs/heads/branch-dev-patch-upgrade Commit: 79e678653eff30ca07cc5c76ee6901d763a7566d Parents: e2085dd d1ac8bd Author: Nate Cole Authored: Mon Sep 19 11:31:36 2016 -0400 Committer: Nate Cole Committed: Mon Sep 19 11:31:36 2016 -0400 -- .../src/main/python/ambari_agent/Controller.py | 18 ++- .../src/main/python/core/config_reader.py | 12 +- .../eventcreator/RequestEventCreator.java | 30 - .../ambari/server/stack/ComponentModule.java| 3 + .../ambari/server/state/ComponentInfo.java | 2 +- .../package/templates/metric_monitor.ini.j2 | 1 + .../hadoop-metrics2.properties.xml | 125 +++ .../2.0.6/hooks/before-START/scripts/params.py | 3 +- .../scripts/shared_initialization.py| 18 ++- .../creator/RequestEventCreatorTest.java| 27 .../server/stack/ComponentModuleTest.java | 15 ++- .../python/stacks/2.0.6/configs/default.json| 3 + .../python/stacks/2.0.6/configs/secured.json| 3 + .../hooks/before-START/test_before_start.py | 8 +- ambari-web/app/models/host_component.js | 4 +- .../8.0.0/package/scripts/service_check.py | 1 + .../MICROSOFT_R/8.0.0/role_command_order.json | 6 + contrib/version-builder/example.py | 4 +- contrib/version-builder/example.sh | 4 +- contrib/version-builder/version_builder.py | 12 +- .../ambari/view/hive2/ConnectionSystem.java | 23 ++-- 21 files changed, 281 insertions(+), 41 deletions(-) --
[11/11] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade
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/e06d95d1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e06d95d1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e06d95d1
Branch: refs/heads/branch-dev-patch-upgrade
Commit: e06d95d1b779da2762e46de6c8d72a3523498401
Parents: cbef0c1 083ac6d
Author: Nate Cole
Authored: Tue Feb 23 16:21:20 2016 -0500
Committer: Nate Cole
Committed: Tue Feb 23 16:21:20 2016 -0500
--
.../loginActivities/LoginMessageMainCtrl.js | 51 +-
.../ui/admin-web/app/scripts/i18n.config.js |4 +-
.../app/views/loginActivities/loginMessage.html | 14 +-
.../src/main/repo/install_ambari_tarball.py |2 +-
ambari-server/conf/unix/ca.config |3 +-
ambari-server/conf/unix/install-helper.sh | 28 +-
ambari-server/conf/unix/log4j.properties|3 +-
ambari-server/pom.xml |1 +
.../ambari/server/agent/HeartBeatHandler.java | 550 +--
.../ambari/server/agent/HeartbeatMonitor.java |6 +
.../ambari/server/agent/HeartbeatProcessor.java | 773 +
.../api/services/ActiveWidgetLayoutService.java | 10 +-
.../api/services/UserAuthorizationService.java |4 +-
.../api/services/UserPrivilegeService.java |3 +-
.../ambari/server/api/services/UserService.java |3 +-
.../server/configuration/Configuration.java | 23 +-
.../ambari/server/controller/AmbariServer.java |6 +-
.../ambari/server/orm/dao/HostVersionDAO.java | 78 +-
.../server/orm/entities/HostVersionEntity.java |9 +
.../encryption/MasterKeyServiceImpl.java|3 +-
.../server/state/cluster/ClusterImpl.java |6 +-
.../svccomphost/ServiceComponentHostImpl.java | 72 +-
.../apache/ambari/server/utils/AmbariPath.java | 39 +
.../src/main/package/deb/control/postinst |2 +-
.../src/main/package/deb/control/preinst| 22 +-
.../src/main/package/deb/control/prerm |2 +-
.../src/main/package/rpm/postinstall.sh | 10 +-
.../src/main/package/rpm/posttrans_server.sh| 10 +-
.../src/main/package/rpm/preinstall.sh | 19 +-
ambari-server/src/main/package/rpm/preremove.sh |6 +-
.../server/agent/HeartbeatProcessorTest.java| 1290 +++
.../server/agent/HeartbeatTestHelper.java | 229 +++
.../server/agent/TestHeartbeatHandler.java | 1488 ++
.../services/ActiveWidgetLayoutServiceTest.java | 76 +
.../services/UserAuthorizationServiceTest.java | 12 +
.../api/services/UserPrivilegeServiceTest.java | 13 +
.../server/api/services/UserServiceTest.java| 71 +
.../resourceManager/step3_controller.js |2 +-
.../main/admin/kerberos/step4_controller.js |3 +-
.../main/admin/serviceAccounts_controller.js|5 +-
.../controllers/main/service/info/configs.js| 32 +-
ambari-web/app/controllers/wizard.js|1 -
.../app/controllers/wizard/step7_controller.js | 66 +-
.../configs/stack_config_properties_mapper.js |4 +-
.../common/kdc_credentials_controller_mixin.js |2 +-
ambari-web/app/models/stack_service.js | 15 +-
ambari-web/app/router.js| 11 +-
ambari-web/app/utils.js |1 +
ambari-web/app/utils/config.js | 187 +--
ambari-web/app/utils/configs/theme/theme.js | 103 ++
.../configs/widgets/config_widget_view.js |2 +-
.../admin/kerberos/step4_controller_test.js |9 +-
.../test/controllers/wizard/step7_test.js |7 +-
ambari-web/test/utils/config_test.js| 126 +-
54 files changed, 3149 insertions(+), 2368 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e06d95d1/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e06d95d1/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
--
diff --cc
ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index a4136ee,ba14446..a13b421
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@@ -339,448 -286,7 +286,6 @@@ public class HeartBeatHandler
host.setRecoveryReport(recoveryReport);
}
- protected void processHostStatus(HeartBeat heartbeat, String hostname)
throws AmbariException {
-
- Host host = clusterFsm.getHost(hostname);
- HealthStatus healthStatus = ho
[11/11] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade
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/4c5d2bd0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4c5d2bd0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4c5d2bd0 Branch: refs/heads/branch-dev-patch-upgrade Commit: 4c5d2bd0a927f45f99c4045c4c9036859f0d19c8 Parents: 77af8e5 8ba3d0b Author: Nate Cole Authored: Tue Feb 2 07:40:38 2016 -0500 Committer: Nate Cole Committed: Tue Feb 2 07:40:38 2016 -0500 -- .../src/main/python/ambari_agent/HostInfo.py| 4 +- ambari-server/conf/unix/ambari.properties | 3 + ambari-server/conf/windows/ambari.properties| 3 + .../resources/ResourceInstanceFactoryImpl.java | 4 +- .../api/services/AdminSettingService.java | 148 .../server/api/services/SettingService.java | 148 .../StackAdvisorBlueprintProcessor.java | 66 +++- .../server/configuration/Configuration.java | 20 ++ .../server/controller/KerberosHelperImpl.java | 16 +- .../internal/AbstractProviderModule.java| 187 ++ .../internal/AdminSettingResourceProvider.java | 250 - .../internal/DefaultProviderModule.java | 4 +- .../internal/SettingResourceProvider.java | 251 + .../internal/UpgradeResourceProvider.java | 2 +- .../server/controller/jmx/JMXHostProvider.java | 8 +- .../controller/jmx/JMXPropertyProvider.java | 15 +- .../ambari/server/controller/spi/Resource.java | 4 +- .../ambari/server/orm/dao/AdminSettingDAO.java | 100 -- .../ambari/server/orm/dao/SettingDAO.java | 100 ++ .../server/orm/entities/AdminSettingEntity.java | 149 .../server/orm/entities/SettingEntity.java | 149 .../authorization/RoleAuthorization.java| 2 +- .../serveraction/ServerActionExecutor.java | 25 +- .../main/resources/Ambari-DDL-Derby-CREATE.sql | 8 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 8 +- .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 8 +- .../resources/Ambari-DDL-Postgres-CREATE.sql| 8 +- .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 10 +- .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 8 +- .../resources/Ambari-DDL-SQLServer-CREATE.sql | 8 +- .../src/main/resources/META-INF/persistence.xml | 2 +- .../HAWQ/2.0.0/package/scripts/params.py| 21 -- .../0.4.0/package/scripts/setup_ranger_xml.py | 5 + .../RANGER/configuration/ranger-admin-site.xml | 10 + .../stacks/HDP/2.3/services/stack_advisor.py| 11 + .../api/services/AdminSettingServiceTest.java | 101 -- .../server/api/services/SettingServiceTest.java | 101 ++ .../StackAdvisorBlueprintProcessorTest.java | 100 +- .../server/configuration/ConfigurationTest.java | 15 + .../AdminSettingResourceProviderTest.java | 356 --- .../internal/JMXHostProviderTest.java | 130 +-- .../internal/SettingResourceProviderTest.java | 355 ++ .../metrics/JMXPropertyProviderTest.java| 6 +- .../server/orm/dao/AdminSettingDAOTest.java | 93 - .../ambari/server/orm/dao/SettingDAOTest.java | 93 + .../orm/entities/AdminSettingEntityTest.java| 91 - .../server/orm/entities/SettingEntityTest.java | 90 + .../stacks/2.3/common/test_stack_advisor.py | 3 +- ambari-web/app/messages.js | 3 +- .../main/alerts/definition_details.hbs | 6 + .../main/alerts/definition_details_view.js | 6 + .../global/cluster_controller_test.js | 4 +- .../progress_controller_test.js | 4 +- .../admin/kerberos/step4_controller_test.js | 7 +- ...anage_alert_notifications_controller_test.js | 85 +++-- .../main/host/add_controller_test.js| 2 + .../test/controllers/wizard/step3_test.js | 43 +-- .../test/controllers/wizard/step4_test.js | 19 +- .../test/controllers/wizard/step5_test.js | 7 +- .../test/controllers/wizard/step6_test.js | 6 +- .../test/controllers/wizard/step7_test.js | 13 +- .../test/controllers/wizard/step8_test.js | 19 +- .../test/controllers/wizard/step9_test.js | 23 +- ambari-web/test/controllers/wizard_test.js | 8 +- ambari-web/test/mappers/service_mapper_test.js | 8 +- .../common/configs/toggle_isrequired_test.js| 12 +- .../kdc_credentials_controller_mixin_test.js| 29 +- .../test/mixins/common/serverValidator_test.js | 14 +- ambari-web/test/models/cluster_states_test.js | 20 +- .../objects/service_config_property_test.js | 38 +- ambari-web/test/router_test.js | 84 ++--- ambari-web/test/utils/ajax/ajax_queue_test.js | 2 +- ambari-web/test/utils/config_test.js| 32 +- ambari-web/t
[11/11] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade
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/e7bdb7b0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e7bdb7b0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e7bdb7b0 Branch: refs/heads/branch-dev-patch-upgrade Commit: e7bdb7b05478d39970680cc92c95177595ff3277 Parents: 986a518 f4edad8 Author: Nate Cole Authored: Wed Jan 27 10:33:04 2016 -0500 Committer: Nate Cole Committed: Wed Jan 27 10:33:04 2016 -0500 -- .../app/scripts/directives/editableList.js | 9 ++ .../src/main/python/core/host_info.py | 8 +- ambari-server/pom.xml | 11 +- .../server/configuration/Configuration.java | 13 ++ .../ambari/server/controller/AmbariServer.java | 2 + .../server/controller/ControllerModule.java | 2 + .../controller/utilities/KerberosChecker.java | 127 +++ .../server/upgrade/SchemaUpgradeHelper.java | 1 + .../server/upgrade/UpgradeCatalog222.java | 125 ++ .../server/upgrade/UpgradeCatalog230.java | 2 +- .../server/upgrade/UpgradeCatalog240.java | 26 ++-- .../src/main/package/deb/control/postinst | 6 +- .../src/main/package/deb/control/prerm | 4 +- .../src/main/package/rpm/postinstall.sh | 6 +- ambari-server/src/main/package/rpm/preremove.sh | 4 +- .../python/ambari_server/serverConfiguration.py | 5 +- .../main/python/ambari_server/setupSecurity.py | 5 +- .../HBASE/0.96.0.2.0/alerts.json| 37 -- .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 10 ++ .../OOZIE/4.0.0.2.0/package/scripts/oozie.py| 14 ++ .../4.0.0.2.0/package/scripts/params_linux.py | 5 + .../4.0.0.2.0/package/templates/oozie.conf.j2 | 35 + .../stacks/HDP/2.0.6/services/stack_advisor.py | 3 + .../utilities/KerberosCheckerTest.java | 88 + .../server/upgrade/UpgradeCatalog222Test.java | 104 +++ .../server/upgrade/UpgradeCatalog230Test.java | 2 +- .../stacks/2.0.6/OOZIE/test_oozie_client.py | 33 + .../stacks/2.0.6/OOZIE/test_oozie_server.py | 44 +++ ambari-web/app/controllers/main/host/details.js | 7 +- ambari-web/app/messages.js | 2 + ambari-web/app/models/host_component.js | 6 + ambari-web/app/styles/application.less | 3 + .../main/host/details/host_component.hbs| 3 +- ambari-web/app/utils/ember_computed.js | 2 +- .../main/host/details/host_component_view.js| 17 +++ .../test/controllers/main/host/details_test.js | 10 ++ 36 files changed, 713 insertions(+), 68 deletions(-) --
