You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/04/27 20:19:53 UTC
[06/50] [abbrv] 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/89852311
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/89852311
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/89852311
Branch: refs/heads/trunk
Commit: 8985231131061178103423c980c29caee45960c4
Parents: a3d7aec b236ef4
Author: Nate Cole <nc...@hortonworks.com>
Authored: Wed Oct 19 12:57:55 2016 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Wed Oct 19 12:57:55 2016 -0400
----------------------------------------------------------------------
.../funtest/server/utils/ClusterUtils.java | 1 -
ambari-project/pom.xml | 2 +-
.../ambari/server/api/services/BaseRequest.java | 49 +-
.../controller/AmbariManagementController.java | 8 -
.../AmbariManagementControllerImpl.java | 33 +-
.../ambari/server/controller/AmbariServer.java | 11 +-
.../internal/ComponentResourceProvider.java | 26 +-
.../internal/ServiceResourceProvider.java | 38 +-
.../internal/UpgradeResourceProvider.java | 2 +-
.../alerts/AlertServiceStateListener.java | 122 +-
.../orm/dao/ConfigGroupHostMappingDAO.java | 137 +-
.../orm/dao/HostComponentDesiredStateDAO.java | 7 +-
.../server/orm/dao/HostComponentStateDAO.java | 9 +-
.../apache/ambari/server/orm/dao/HostDAO.java | 2 +-
.../orm/entities/ClusterServiceEntity.java | 2 +-
.../HostComponentDesiredStateEntity.java | 11 +
.../orm/entities/HostComponentStateEntity.java | 11 +
.../org/apache/ambari/server/state/Cluster.java | 12 -
.../apache/ambari/server/state/Clusters.java | 9 +
.../apache/ambari/server/state/ConfigImpl.java | 98 +-
.../org/apache/ambari/server/state/Host.java | 11 -
.../apache/ambari/server/state/HostConfig.java | 12 +-
.../org/apache/ambari/server/state/Service.java | 13 -
.../ambari/server/state/ServiceComponent.java | 13 -
.../server/state/ServiceComponentHost.java | 6 -
.../server/state/ServiceComponentImpl.java | 719 ++++-----
.../apache/ambari/server/state/ServiceImpl.java | 642 +++------
.../server/state/cluster/ClusterImpl.java | 1360 +++++++-----------
.../server/state/cluster/ClustersImpl.java | 628 ++++----
.../state/configgroup/ConfigGroupImpl.java | 92 +-
.../ambari/server/state/host/HostFactory.java | 2 +-
.../ambari/server/state/host/HostImpl.java | 948 ++++--------
.../svccomphost/ServiceComponentHostImpl.java | 1066 +++++---------
.../ambari/server/topology/TopologyManager.java | 1 -
.../apache/ambari/server/utils/RetryHelper.java | 19 +-
.../ExecutionCommandWrapperTest.java | 1 -
.../actionmanager/TestActionDBAccessorImpl.java | 9 -
.../server/actionmanager/TestActionManager.java | 8 +-
.../ambari/server/agent/AgentResourceTest.java | 12 +-
.../server/agent/HeartbeatProcessorTest.java | 132 +-
.../server/agent/HeartbeatTestHelper.java | 16 +-
.../server/agent/TestHeartbeatHandler.java | 136 +-
.../server/agent/TestHeartbeatMonitor.java | 87 +-
.../server/api/services/AmbariMetaInfoTest.java | 3 +
.../server/api/services/ClusterServiceTest.java | 43 +-
.../server/checks/InstallPackagesCheckTest.java | 5 +-
.../configuration/RecoveryConfigHelperTest.java | 122 +-
.../AmbariCustomCommandExecutionHelperTest.java | 1 -
.../AmbariManagementControllerTest.java | 185 +--
.../BackgroundCustomCommandExecutionTest.java | 1 -
.../server/controller/KerberosHelperTest.java | 80 +-
...hYarnCapacitySchedulerReleaseConfigTest.java | 7 +-
.../internal/ClusterResourceProviderTest.java | 7 +-
.../internal/JMXHostProviderTest.java | 6 -
.../PreUpgradeCheckResourceProviderTest.java | 52 +-
.../internal/ServiceResourceProviderTest.java | 63 +-
.../StackDefinedPropertyProviderTest.java | 1 -
.../UpgradeResourceProviderHDP22Test.java | 2 -
.../internal/UpgradeResourceProviderTest.java | 4 -
.../UpgradeSummaryResourceProviderTest.java | 48 +-
.../DefaultServiceCalculatedStateTest.java | 6 +-
.../state/FlumeServiceCalculatedStateTest.java | 7 +-
.../GeneralServiceCalculatedStateTest.java | 47 +-
.../state/HBaseServiceCalculatedStateTest.java | 7 +-
.../state/HDFSServiceCalculatedStateTest.java | 7 +-
.../state/HiveServiceCalculatedStateTest.java | 7 +-
.../state/OozieServiceCalculatedStateTest.java | 7 +-
.../state/YarnServiceCalculatedStateTest.java | 7 +-
.../apache/ambari/server/events/EventsTest.java | 5 -
.../HostVersionOutOfSyncListenerTest.java | 3 -
.../apache/ambari/server/orm/OrmTestHelper.java | 34 +-
.../server/orm/dao/ClusterVersionDAOTest.java | 12 +-
.../server/orm/dao/ConfigGroupDAOTest.java | 33 +-
.../dao/HostComponentDesiredStateDAOTest.java | 27 +-
.../orm/dao/HostComponentStateDAOTest.java | 28 +-
.../orm/dao/RepositoryVersionDAOTest.java | 6 +-
.../ambari/server/orm/dao/SettingDAOTest.java | 19 +-
.../ambari/server/orm/dao/WidgetDAOTest.java | 8 +-
.../server/orm/dao/WidgetLayoutDAOTest.java | 13 +-
.../ComponentVersionCheckActionTest.java | 5 -
.../upgrades/ConfigureActionTest.java | 2 -
.../upgrades/UpgradeActionTest.java | 8 -
.../ambari/server/state/ConfigGroupTest.java | 10 +-
.../ambari/server/state/ConfigHelperTest.java | 12 +-
.../server/state/RequestExecutionTest.java | 12 +-
.../server/state/ServiceComponentTest.java | 47 +-
.../apache/ambari/server/state/ServiceTest.java | 15 +-
.../ambari/server/state/UpgradeHelperTest.java | 8 -
.../state/alerts/AlertEventPublisherTest.java | 7 +-
.../state/alerts/InitialAlertEventTest.java | 3 +-
.../state/cluster/ClusterDeadlockTest.java | 41 +-
.../cluster/ClusterEffectiveVersionTest.java | 19 +-
.../server/state/cluster/ClusterImplTest.java | 66 +-
.../server/state/cluster/ClusterTest.java | 122 +-
.../state/cluster/ClustersDeadlockTest.java | 12 +-
.../server/state/cluster/ClustersTest.java | 17 -
.../ConcurrentServiceConfigVersionTest.java | 4 -
...omponentHostConcurrentWriteDeadlockTest.java | 4 -
.../ambari/server/state/host/HostImplTest.java | 50 +-
.../ambari/server/state/host/HostTest.java | 22 +-
.../svccomphost/ServiceComponentHostTest.java | 5 -
.../server/update/HostUpdateHelperTest.java | 40 +-
.../ambari/server/utils/StageUtilsTest.java | 3 +-
ambari-web/app/controllers/main/host/details.js | 124 +-
.../app/controllers/wizard/step3_controller.js | 1170 +--------------
ambari-web/app/messages.js | 2 +
ambari-web/app/mixins.js | 1 +
.../main/host/details/actions/check_host.js | 1187 +++++++++++++++
.../wizard/step3/step3_host_warnings_popup.hbs | 165 +--
ambari-web/app/views/main/host/details.js | 6 +
110 files changed, 4367 insertions(+), 6258 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/89852311/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/89852311/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/89852311/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
----------------------------------------------------------------------