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/d222f572 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d222f572 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d222f572 Branch: refs/heads/trunk Commit: d222f572ee2952add29e60afeb47a4da7ac98685 Parents: 393ab3e 132e266 Author: Nate Cole <nc...@hortonworks.com> Authored: Fri Feb 3 09:52:46 2017 -0500 Committer: Nate Cole <nc...@hortonworks.com> Committed: Fri Feb 3 09:52:46 2017 -0500 ---------------------------------------------------------------------- .gitignore | 1 + ambari-agent/conf/unix/agent-multiplier.py | 9 +- .../src/main/python/ambari_agent/ActionQueue.py | 5 + .../src/main/python/ambari_agent/Controller.py | 51 +- .../ambari_agent/CustomServiceOrchestrator.py | 4 + .../src/main/python/ambari_agent/Hardware.py | 10 +- .../src/main/python/ambari_agent/HostInfo.py | 19 +- .../ambari_agent/StatusCommandsExecutor.py | 1 + .../test/python/ambari_agent/TestHardware.py | 84 ++- .../test/python/ambari_agent/TestHostInfo.py | 45 +- .../python/ambari_agent/TestRegistration.py | 2 +- ambari-agent/src/test/python/unitTests.py | 3 + .../ambari_commons/ambari_metrics_helper.py | 19 +- .../src/main/python/ambari_commons/firewall.py | 21 +- .../ambari/logfeeder/input/InputSimulate.java | 52 +- .../ambari/logfeeder/util/LogFeederUtil.java | 12 + .../other/daterangepicker/js/daterangepicker.js | 90 +-- .../src/main/webapp/scripts/utils/ViewUtils.js | 2 +- .../scripts/views/common/DatePickerLayout.js | 40 +- .../webapp/scripts/views/tabs/LogFileView.js | 47 +- .../sink/flume/FlumeTimelineMetricsSink.java | 3 +- .../timeline/HadoopTimelineMetricsSink.java | 6 +- .../storm/StormTimelineMetricsReporter.java | 25 +- .../storm/StormTimelineMetricsReporter.java | 16 +- ambari-server/pom.xml | 29 +- ambari-server/sbin/ambari-server | 1 + .../ambari/server/agent/HeartBeatHandler.java | 4 + .../ambari/server/agent/HeartbeatMonitor.java | 2 +- .../server/checks/AutoStartDisabledCheck.java | 74 +++ .../ambari/server/checks/CheckDescription.java | 7 + .../checks/DatabaseConsistencyCheckHelper.java | 78 +++ .../server/configuration/Configuration.java | 40 +- .../AmbariCustomCommandExecutionHelper.java | 21 +- .../AmbariManagementControllerImpl.java | 44 +- .../server/controller/ControllerModule.java | 5 +- .../HostStackVersionResourceProvider.java | 46 +- .../server/credentialapi/CredentialUtil.java | 580 +++++++++++++++++ .../system/impl/AmbariMetricSinkImpl.java | 10 + .../apache/ambari/server/orm/DBAccessor.java | 1 + .../ambari/server/orm/DBAccessorImpl.java | 5 + .../server/orm/entities/UpgradeEntity.java | 2 +- .../server/orm/helpers/dbms/H2Helper.java | 74 +++ .../ambari/server/state/ConfigHelper.java | 49 +- .../org/apache/ambari/server/state/Host.java | 5 + .../server/state/ServiceComponentHost.java | 5 + .../server/state/cluster/ClusterImpl.java | 2 +- .../ambari/server/state/host/HostImpl.java | 15 +- .../svccomphost/ServiceComponentHostImpl.java | 46 +- .../server/upgrade/UpgradeCatalog250.java | 115 ++-- .../python/ambari_server/serverConfiguration.py | 9 +- .../main/python/ambari_server/serverSetup.py | 6 +- .../common-services/DRUID/0.9.2/metainfo.xml | 28 +- .../alert_hive_interactive_thrift_port.py | 2 +- .../package/scripts/hive_server_interactive.py | 3 + .../0.12.0.2.0/package/scripts/params_linux.py | 57 +- .../PXF/3.0.0/configuration/pxf-profiles.xml | 15 +- .../0.7.0/configuration/ranger-ugsync-site.xml | 2 +- .../common-services/STORM/0.10.0/metrics.json | 4 +- .../common-services/STORM/0.9.3/metrics.json | 4 +- .../TEZ/0.4.0.2.1/configuration/tez-site.xml | 27 +- .../2.1.0.2.0/package/scripts/params_linux.py | 5 +- .../package/scripts/resourcemanager.py | 2 + .../YARN/3.0.0.3.0/configuration/yarn-env.xml | 3 + .../YARN/3.0.0.3.0/kerberos.json | 7 +- .../common-services/YARN/3.0.0.3.0/metainfo.xml | 1 - .../3.0.0.3.0/package/scripts/params_linux.py | 6 +- .../package/scripts/resourcemanager.py | 2 + .../YARN/3.0.0.3.0/service_advisor.py | 5 +- .../main/resources/scripts/Ambaripreupload.py | 16 + .../HDP/2.0.6/configuration/cluster-env.xml | 6 + .../services/TEZ/configuration/tez-site.xml | 65 +- .../2.2/services/TEZ/configuration/tez-site.xml | 83 +++ .../2.3/services/TEZ/configuration/tez-site.xml | 6 + .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 44 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 18 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 18 - .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 26 +- .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 14 +- .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 14 +- .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 19 +- .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 47 +- .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 20 +- .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 27 +- .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 14 +- .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 18 +- .../configuration/hive-interactive-site.xml | 2 +- .../2.5/services/TEZ/configuration/tez-site.xml | 6 + .../stacks/HDP/2.5/services/stack_advisor.py | 44 +- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 28 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 8 + .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 5 + .../configuration/hive-interactive-site.xml | 8 + .../PIG/configuration/pig-properties.xml | 93 +++ .../services/SPARK2/configuration/livy2-env.xml | 2 +- .../HDP/2.6/services/SPARK2/kerberos.json | 4 +- .../services/YARN/configuration/yarn-env.xml | 165 +++++ .../services/YARN/configuration/yarn-site.xml | 26 + .../stacks/HDP/2.6/services/YARN/kerberos.json | 6 +- .../stacks/HDP/2.6/services/YARN/metainfo.xml | 1 + .../HDP/3.0/configuration/cluster-env.xml | 6 + .../stacks/HDP/3.0/services/YARN/metainfo.xml | 2 + .../2.2/services/TEZ/configuration/tez-site.xml | 88 ++- .../apache/ambari/annotations/LockAreaTest.java | 7 +- .../TransactionalLockInterceptorTest.java | 7 +- .../apache/ambari/server/H2DatabaseCleaner.java | 124 ++++ .../ambari/server/StateRecoveryManagerTest.java | 6 +- .../ExecutionCommandWrapperTest.java | 8 + .../ambari/server/actionmanager/StageTest.java | 11 +- .../actionmanager/TestActionDBAccessorImpl.java | 8 +- .../server/actionmanager/TestActionManager.java | 9 +- .../actionmanager/TestActionScheduler.java | 7 +- .../TestActionSchedulerThreading.java | 8 +- .../ambari/server/actionmanager/TestStage.java | 9 + .../server/agent/HeartbeatProcessorTest.java | 10 +- .../server/agent/TestHeartbeatHandler.java | 5 +- .../server/agent/TestHeartbeatMonitor.java | 7 +- .../server/api/query/JpaSortBuilderTest.java | 7 + .../server/api/services/AmbariMetaInfoTest.java | 12 +- .../api/services/PersistKeyValueImplTest.java | 4 +- .../server/api/services/PersistServiceTest.java | 4 +- .../checks/AutoStartDisabledCheckTest.java | 121 ++++ .../DatabaseConsistencyCheckHelperTest.java | 58 ++ .../configuration/RecoveryConfigHelperTest.java | 4 +- .../AmbariCustomCommandExecutionHelperTest.java | 7 +- .../AmbariManagementControllerTest.java | 7 +- .../server/controller/AmbariServerTest.java | 5 +- .../BackgroundCustomCommandExecutionTest.java | 7 +- ...hYarnCapacitySchedulerReleaseConfigTest.java | 7 +- .../RootServiceResponseFactoryTest.java | 9 + .../internal/ActionResourceProviderTest.java | 7 +- .../internal/AlertResourceProviderTest.java | 4 +- .../internal/CalculatedStatusTest.java | 8 + ...ClusterStackVersionResourceProviderTest.java | 213 +++--- ...leRepositoryVersionResourceProviderTest.java | 8 +- .../internal/ComponentResourceProviderTest.java | 2 + .../HostStackVersionResourceProviderTest.java | 19 +- .../internal/JMXHostProviderTest.java | 8 +- .../RepositoryVersionResourceProviderTest.java | 8 +- .../StackArtifactResourceProviderTest.java | 8 +- .../StackDefinedPropertyProviderTest.java | 4 +- .../UpgradeResourceProviderHDP22Test.java | 8 +- .../internal/UpgradeResourceProviderTest.java | 9 +- .../UpgradeSummaryResourceProviderTest.java | 10 +- .../internal/UserResourceProviderDBTest.java | 7 +- .../VersionDefinitionResourceProviderTest.java | 4 +- .../LogSearchDataRetrievalServiceTest.java | 1 - .../RestMetricsPropertyProviderTest.java | 9 + .../utilities/DatabaseCheckerTest.java | 6 +- .../GeneralServiceCalculatedStateTest.java | 10 +- .../credentialapi/CredentialUtilTest.java | 644 +++++++++++++++++++ .../apache/ambari/server/events/EventsTest.java | 6 +- .../HostVersionOutOfSyncListenerTest.java | 7 +- .../metadata/AgentAlertDefinitionsTest.java | 11 + .../server/metadata/RoleCommandOrderTest.java | 7 +- .../ambari/server/metadata/RoleGraphTest.java | 7 +- .../ambari/server/orm/DBAccessorImplTest.java | 20 +- .../ambari/server/orm/JdbcPropertyTest.java | 4 +- .../apache/ambari/server/orm/OrmTestHelper.java | 13 +- .../apache/ambari/server/orm/TestOrmImpl.java | 8 +- .../server/orm/dao/AlertDefinitionDAOTest.java | 6 +- .../server/orm/dao/AlertDispatchDAOTest.java | 6 +- .../ambari/server/orm/dao/AlertsDAOTest.java | 8 +- .../server/orm/dao/ClusterVersionDAOTest.java | 12 +- .../server/orm/dao/ConfigGroupDAOTest.java | 19 +- .../ambari/server/orm/dao/CrudDAOTest.java | 11 +- .../orm/dao/HostConfigMappingDAOTest.java | 7 +- .../server/orm/dao/HostRoleCommandDAOTest.java | 9 +- .../server/orm/dao/HostVersionDAOTest.java | 11 +- .../orm/dao/RepositoryVersionDAOTest.java | 7 +- .../ambari/server/orm/dao/RequestDAOTest.java | 7 +- .../server/orm/dao/RequestScheduleDAOTest.java | 7 +- .../server/orm/dao/ServiceConfigDAOTest.java | 64 +- .../ambari/server/orm/dao/SettingDAOTest.java | 7 + .../ambari/server/orm/dao/StageDAOTest.java | 10 +- .../orm/dao/TopologyLogicalRequestDAOTest.java | 7 +- .../server/orm/dao/TopologyRequestDAOTest.java | 7 +- .../ambari/server/orm/dao/UpgradeDAOTest.java | 9 +- .../ambari/server/orm/dao/WidgetDAOTest.java | 8 +- .../server/orm/dao/WidgetLayoutDAOTest.java | 8 +- .../scheduler/ExecutionScheduleManagerTest.java | 4 +- .../server/security/AmbariLdapUtilsTest.java | 1 - .../AmbariBasicAuthenticationFilterTest.java | 6 +- ...uthenticationProviderForDNWithSpaceTest.java | 4 +- .../AmbariLdapAuthenticationProviderTest.java | 4 +- .../AmbariLocalUserProviderTest.java | 7 + .../AmbariPamAuthenticationProviderTest.java | 4 +- .../security/authorization/TestUsers.java | 7 +- .../security/ldap/LdapPerformanceTest.java | 8 + .../serveraction/ServerActionExecutorTest.java | 11 +- .../kerberos/KerberosServerActionTest.java | 2 +- .../UpdateKerberosConfigsServerActionTest.java | 18 +- .../AutoSkipFailedSummaryActionTest.java | 6 +- .../ComponentVersionCheckActionTest.java | 6 +- .../upgrades/ConfigureActionTest.java | 6 +- .../upgrades/UpgradeActionTest.java | 6 +- .../server/stageplanner/TestStagePlanner.java | 7 +- .../ambari/server/state/ConfigGroupTest.java | 17 +- .../ambari/server/state/ConfigHelperTest.java | 7 +- .../server/state/ConfigMergeHelperTest.java | 8 +- .../server/state/RequestExecutionTest.java | 4 +- .../server/state/ServiceComponentTest.java | 7 +- .../apache/ambari/server/state/ServiceTest.java | 7 +- .../ambari/server/state/UpgradeHelperTest.java | 9 +- .../alerts/AggregateAlertListenerTest.java | 6 +- .../state/alerts/AlertEventPublisherTest.java | 22 +- .../state/alerts/AlertReceivedListenerTest.java | 10 +- .../alerts/AlertStateChangedEventTest.java | 4 +- .../state/alerts/InitialAlertEventTest.java | 6 +- .../state/cluster/AlertDataManagerTest.java | 10 +- .../state/cluster/ClusterDeadlockTest.java | 7 +- .../server/state/cluster/ClusterImplTest.java | 11 +- .../server/state/cluster/ClusterTest.java | 15 +- .../state/cluster/ClustersDeadlockTest.java | 7 +- .../server/state/cluster/ClustersTest.java | 7 +- .../ConcurrentServiceConfigVersionTest.java | 7 +- ...omponentHostConcurrentWriteDeadlockTest.java | 7 +- .../ambari/server/state/host/HostTest.java | 9 +- .../services/RetryUpgradeActionServiceTest.java | 8 + .../state/stack/ConfigUpgradePackTest.java | 8 +- .../state/stack/ConfigUpgradeValidityTest.java | 8 +- .../ambari/server/state/stack/OSFamilyTest.java | 12 +- .../server/state/stack/UpgradePackTest.java | 8 +- .../svccomphost/ServiceComponentHostTest.java | 7 +- .../topology/AsyncCallableServiceTest.java | 6 +- .../server/upgrade/StackUpgradeUtilTest.java | 4 +- .../server/upgrade/UpgradeCatalog200Test.java | 6 +- .../server/upgrade/UpgradeCatalog210Test.java | 6 +- .../server/upgrade/UpgradeCatalog2121Test.java | 8 +- .../server/upgrade/UpgradeCatalog212Test.java | 7 +- .../server/upgrade/UpgradeCatalog220Test.java | 6 +- .../server/upgrade/UpgradeCatalog240Test.java | 8 +- .../server/upgrade/UpgradeCatalog242Test.java | 6 +- .../server/upgrade/UpgradeCatalog250Test.java | 83 ++- .../server/upgrade/UpgradeCatalogTest.java | 6 +- .../src/test/python/TestAmbariServer.py | 52 +- .../stacks/2.0.6/YARN/test_historyserver.py | 3 +- .../stacks/2.0.6/YARN/test_mapreduce2_client.py | 3 +- .../stacks/2.0.6/YARN/test_nodemanager.py | 3 +- .../stacks/2.0.6/YARN/test_resourcemanager.py | 3 +- .../stacks/2.0.6/YARN/test_yarn_client.py | 3 +- .../stacks/2.3/ATLAS/test_metadata_server.py | 65 +- .../stacks/2.5/common/test_stack_advisor.py | 50 +- .../main/admin/stack_and_upgrade_controller.js | 46 +- .../controllers/main/service/info/configs.js | 24 +- .../main/service/reassign/step3_controller.js | 9 + .../main/service/reassign/step4_controller.js | 12 +- .../main/service/reassign_controller.js | 18 +- .../app/controllers/wizard/step7_controller.js | 41 +- ambari-web/app/messages.js | 20 +- ambari-web/app/mixins.js | 1 + .../configs/config_recommendation_parser.js | 6 +- .../common/configs/config_recommendations.js | 11 +- ...onfig_with_override_recommendation_parser.js | 3 +- .../mixins/common/configs/enhanced_configs.js | 6 +- .../configs/widgets/unique/num_llap_nodes.js | 70 ++ .../configs/component_actions_by_configs.js | 18 +- ambari-web/app/models/host_stack_version.js | 4 +- .../stack_version/stack_upgrade_history.js | 7 +- ambari-web/app/routes/reassign_master_routes.js | 3 +- .../common/configs/widgets/controls.hbs | 2 + .../stack_upgrade/stack_upgrade_wizard.hbs | 1 + .../admin/stack_upgrade/upgrade_history.hbs | 2 +- ambari-web/app/utils/string_utils.js | 14 + .../configs/service_config_layout_tab_view.js | 23 +- .../dependent_configs_list_popup.js | 12 +- .../app/views/main/service/services/hdfs.js | 10 +- .../app/views/main/service/services/yarn.js | 2 +- .../admin/stack_and_upgrade_controller_test.js | 150 +---- .../service/reassign/step4_controller_test.js | 10 +- .../configs/config_recommendations_test.js | 600 ++++++++--------- .../common/configs/enhanced_configs_test.js | 2 +- ambari-web/test/utils/string_utils_test.js | 30 + .../dependent_configs_list_popup_test.js | 2 +- .../views/main/service/services/hdfs_test.js | 6 +- .../views/main/service/services/yarn_test.js | 2 +- contrib/utils/perf/deploy-gce-perf-cluster.py | 11 +- .../src/main/python/preinstall_checker.py | 2 +- .../ambari/view/hive2/actor/LogAggregator.java | 18 +- .../view/hive2/actor/StatementExecutor.java | 9 +- .../actor/message/StartLogAggregation.java | 10 +- .../ambari/view/hive20/actor/LogAggregator.java | 18 +- .../view/hive20/actor/StatementExecutor.java | 10 +- .../actor/message/StartLogAggregation.java | 10 +- .../resources/ui/app/adapters/application.js | 16 + .../resources/ui/app/adapters/service-check.js | 42 ++ .../hive20/src/main/resources/ui/app/app.js | 9 - .../resources/ui/app/components/job-item.js | 21 +- .../resources/ui/app/components/jobs-browser.js | 4 - .../ui/app/components/service-check-entry.js | 50 ++ .../resources/ui/app/components/tabs-item.js | 20 +- .../ui/app/components/top-application-bar.js | 1 + .../ui/app/configs/service-check-status.js | 19 + .../resources/ui/app/controllers/application.js | 25 + .../main/resources/ui/app/controllers/jobs.js | 7 +- .../ui/app/controllers/service-check.js | 66 ++ .../src/main/resources/ui/app/models/job.js | 2 +- .../main/resources/ui/app/models/worksheet.js | 3 +- .../hive20/src/main/resources/ui/app/router.js | 2 + .../main/resources/ui/app/routes/application.js | 9 + .../src/main/resources/ui/app/routes/jobs.js | 25 +- .../resources/ui/app/routes/queries/query.js | 14 +- .../resources/ui/app/routes/service-check.js | 28 + .../src/main/resources/ui/app/services/jobs.js | 12 +- .../resources/ui/app/services/service-check.js | 117 ++++ .../src/main/resources/ui/app/styles/app.scss | 2 +- .../ui/app/styles/bootstrap-overrides.scss | 15 +- .../resources/ui/app/templates/application.hbs | 13 +- .../app/templates/components/jobs-browser.hbs | 1 + .../templates/components/query-result-table.hbs | 64 +- .../components/service-check-entry.hbs | 47 ++ .../components/top-application-bar.hbs | 12 +- .../databases/database/tables/table/ddl.hbs | 8 +- .../ui/app/templates/queries/query.hbs | 85 +-- .../ui/app/templates/service-check.hbs | 42 ++ .../src/main/resources/ui/config/environment.js | 2 - contrib/views/wfmanager/pom.xml | 1 + .../oozie/ambari/view/assets/AssetResource.java | 3 +- .../resources/ui/app/components/asset-config.js | 6 +- .../ui/app/components/bundle-config.js | 7 +- .../resources/ui/app/components/coord-config.js | 17 +- .../ui/app/components/designer-workspace.js | 49 +- .../resources/ui/app/components/drafts-wf.js | 81 ++- .../ui/app/components/flow-designer.js | 49 +- .../resources/ui/app/components/job-config.js | 1 - .../resources/ui/app/components/job-details.js | 28 +- .../ui/app/components/recent-projects.js | 57 ++ .../main/resources/ui/app/components/save-wf.js | 3 +- .../ui/app/components/workflow-action-editor.js | 14 +- .../ui/app/domain/workflow-importer.js | 3 + .../ui/app/helpers/format-unicode-date.js | 3 +- .../main/resources/ui/app/models/wfproject.js | 3 +- .../src/main/resources/ui/app/routes/design.js | 23 +- .../ui/app/routes/design/proj-manager-tab.js | 7 +- .../resources/ui/app/services/current-job.js | 28 + .../src/main/resources/ui/app/styles/app.less | 151 ++++- .../app/templates/components/archive-config.hbs | 4 +- .../ui/app/templates/components/arg-config.hbs | 2 +- .../app/templates/components/asset-config.hbs | 2 +- .../ui/app/templates/components/asset-list.hbs | 2 +- .../app/templates/components/asset-manager.hbs | 2 +- .../app/templates/components/bundle-config.hbs | 2 +- .../components/bundle-coord-config.hbs | 2 +- .../templates/components/bundle-job-details.hbs | 6 +- .../app/templates/components/coord-config.hbs | 8 +- .../templates/components/coord-job-details.hbs | 10 +- .../app/templates/components/date-with-expr.hbs | 4 +- .../templates/components/designer-errors.hbs | 2 +- .../templates/components/designer-workspace.hbs | 41 +- .../ui/app/templates/components/drafts-wf.hbs | 170 ++--- .../ui/app/templates/components/file-config.hbs | 6 +- .../app/templates/components/flow-designer.hbs | 27 +- .../app/templates/components/global-config.hbs | 4 +- .../ui/app/templates/components/help-icon.hbs | 3 + .../ui/app/templates/components/hive-action.hbs | 2 +- .../app/templates/components/hive2-action.hbs | 2 +- .../components/instance-list-config.hbs | 2 +- .../ui/app/templates/components/job-config.hbs | 8 +- .../ui/app/templates/components/job-details.hbs | 13 +- .../ui/app/templates/components/job-row.hbs | 2 +- .../templates/components/name-value-config.hbs | 2 +- .../ui/app/templates/components/pig-action.hbs | 2 +- .../templates/components/prepare-config-fs.hbs | 12 +- .../app/templates/components/prepare-config.hbs | 6 +- .../templates/components/recent-projects.hbs | 33 + .../ui/app/templates/components/save-wf.hbs | 2 +- .../app/templates/components/shell-action.hbs | 2 +- .../app/templates/components/spark-action.hbs | 2 +- .../app/templates/components/sub-workflow.hbs | 2 +- .../components/workflow-action-editor.hbs | 6 +- .../templates/components/workflow-config.hbs | 2 +- .../components/workflow-job-details.hbs | 14 +- .../main/resources/ui/app/templates/design.hbs | 2 +- .../app/templates/design/proj-manager-tab.hbs | 2 +- .../main/resources/ui/app/utils/constants.js | 2 +- .../ui/app/validators/operand-length.js | 2 +- .../src/main/resources/view.log4j.properties | 29 + pom.xml | 2 + 377 files changed, 6192 insertions(+), 2255 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d222f572/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d222f572/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d222f572/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d222f572/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java ---------------------------------------------------------------------- diff --cc ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java index a7f8ae3,e7572f4..5c71329 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java @@@ -27,9 -28,9 +28,10 @@@ import java.util.List import java.util.Map; import org.apache.ambari.server.AmbariException; + import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.controller.ServiceComponentResponse; +import org.apache.ambari.server.events.listeners.upgrade.StackVersionListener; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.apache.ambari.server.orm.OrmTestHelper; http://git-wip-us.apache.org/repos/asf/ambari/blob/d222f572/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java ---------------------------------------------------------------------- diff --cc ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java index be8ab53,8e5ad0a..d952ac4 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java @@@ -37,9 -38,8 +38,10 @@@ import java.util.Set import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.ambari.annotations.Experimental; +import org.apache.ambari.annotations.ExperimentalFeature; import org.apache.ambari.server.AmbariException; + import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.controller.ClusterRequest;