Merge branch 'branch-feature-AMBARI-18456' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/97e3de68 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/97e3de68 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/97e3de68 Branch: refs/heads/trunk Commit: 97e3de68f7f2d42a98802dde4bf91d154170f9f3 Parents: 96e69d5 88c2892 Author: Jonathan Hurley <[email protected]> Authored: Wed Dec 7 16:49:43 2016 -0500 Committer: Jonathan Hurley <[email protected]> Committed: Wed Dec 7 16:49:43 2016 -0500 ---------------------------------------------------------------------- .../AmbariManagementControllerImpl.java | 13 +- .../internal/ConfigGroupResourceProvider.java | 60 +- .../serveraction/upgrades/ConfigureAction.java | 16 +- .../serveraction/upgrades/FixLzoCodecPath.java | 16 +- .../upgrades/FixOozieAdminUsers.java | 9 +- .../upgrades/HBaseConfigCalculation.java | 14 +- .../HBaseEnvMaxDirectMemorySizeAction.java | 13 +- .../upgrades/HiveEnvClasspathAction.java | 13 +- .../upgrades/HiveZKQuorumConfigAction.java | 2 +- .../upgrades/OozieConfigCalculation.java | 13 +- .../upgrades/RangerConfigCalculation.java | 4 +- .../RangerKerberosConfigCalculation.java | 20 +- .../upgrades/RangerKmsProxyConfig.java | 3 +- .../upgrades/SparkShufflePropertyConfig.java | 3 +- .../upgrades/YarnConfigCalculation.java | 2 +- .../org/apache/ambari/server/state/Config.java | 22 +- .../ambari/server/state/ConfigFactory.java | 20 +- .../apache/ambari/server/state/ConfigImpl.java | 487 +++++++-------- .../server/state/cluster/ClusterImpl.java | 6 +- .../server/state/configgroup/ConfigGroup.java | 33 +- .../state/configgroup/ConfigGroupFactory.java | 34 +- .../state/configgroup/ConfigGroupImpl.java | 613 +++++++++---------- .../ambari/server/topology/AmbariContext.java | 25 +- .../ambari/server/update/HostUpdateHelper.java | 10 +- .../ExecutionCommandWrapperTest.java | 17 +- .../TestActionSchedulerThreading.java | 19 +- .../server/agent/HeartbeatTestHelper.java | 6 +- .../server/agent/TestHeartbeatMonitor.java | 13 +- .../configuration/RecoveryConfigHelperTest.java | 2 +- .../AmbariManagementControllerImplTest.java | 22 +- .../AmbariManagementControllerTest.java | 109 +--- .../UpgradeResourceProviderHDP22Test.java | 14 +- .../internal/UpgradeResourceProviderTest.java | 13 +- .../ComponentVersionCheckActionTest.java | 19 +- .../upgrades/ConfigureActionTest.java | 96 +-- .../upgrades/FixOozieAdminUsersTest.java | 76 +-- .../HBaseEnvMaxDirectMemorySizeActionTest.java | 187 +++--- .../upgrades/HiveEnvClasspathActionTest.java | 148 ++--- .../upgrades/HiveZKQuorumConfigActionTest.java | 2 +- .../upgrades/KerberosKeytabsActionTest.java | 28 +- .../upgrades/RangerConfigCalculationTest.java | 72 +-- .../RangerKerberosConfigCalculationTest.java | 173 ++---- .../upgrades/RangerKmsProxyConfigTest.java | 36 +- .../SparkShufflePropertyConfigTest.java | 30 +- .../upgrades/UpgradeActionTest.java | 28 +- .../ambari/server/state/ConfigGroupTest.java | 26 +- .../ambari/server/state/ConfigHelperTest.java | 49 +- .../state/alerts/AlertReceivedListenerTest.java | 8 +- .../state/cluster/ClusterDeadlockTest.java | 17 +- .../server/state/cluster/ClusterTest.java | 133 +--- .../server/state/cluster/ClustersTest.java | 8 +- ...omponentHostConcurrentWriteDeadlockTest.java | 9 +- .../ambari/server/state/host/HostTest.java | 6 +- .../svccomphost/ServiceComponentHostTest.java | 24 +- .../server/topology/AmbariContextTest.java | 38 +- .../server/update/HostUpdateHelperTest.java | 40 +- .../ambari/server/utils/StageUtilsTest.java | 4 + 57 files changed, 1197 insertions(+), 1726 deletions(-) ----------------------------------------------------------------------
