You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/10/03 20:16:09 UTC
[22/22] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-20859
Merge branch 'trunk' into branch-feature-AMBARI-20859
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/45ca79b3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/45ca79b3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/45ca79b3
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 45ca79b38e65756dad1095d49670d5b972e060c8
Parents: f36413f 67396ba
Author: Robert Levas <rl...@hortonworks.com>
Authored: Tue Oct 3 16:15:29 2017 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Tue Oct 3 16:15:29 2017 -0400
----------------------------------------------------------------------
ambari-agent/pom.xml | 4 +-
.../main/python/ambari_agent/AmbariConfig.py | 74 +---
.../src/main/python/ambari_agent/FileCache.py | 5 +-
.../main/python/ambari_agent/ProcessHelper.py | 71 ----
.../src/main/python/ambari_agent/StatusCheck.py | 142 -------
.../src/main/python/ambari_agent/main.py | 12 +-
.../test/python/ambari_agent/TestFileCache.py | 4 +-
.../src/test/python/ambari_agent/TestMain.py | 8 +-
.../python/ambari_agent/TestProcessHelper.py | 70 ----
.../test/python/ambari_agent/TestStatusCheck.py | 180 ---------
.../libraries/functions/conf_select.py | 4 +-
.../src/app/classes/histogram-options.class.ts | 36 ++
.../logs-container.component.html | 4 +-
.../logs-container/logs-container.component.ts | 13 +-
.../time-histogram.component.less | 22 +-
.../time-histogram/time-histogram.component.ts | 94 ++++-
.../src/app/services/filtering.service.ts | 23 +-
ambari-server/pom.xml | 2 +
ambari-server/src/main/assemblies/server.xml | 20 +-
.../actionmanager/ExecutionCommandWrapper.java | 3 +-
.../ambari/server/agent/HeartbeatMonitor.java | 3 +-
.../server/controller/ControllerModule.java | 4 +
.../controller/ResourceProviderFactory.java | 8 +
.../AbstractControllerResourceProvider.java | 4 +
.../internal/AlertTargetResourceProvider.java | 3 +-
.../internal/ClientConfigResourceProvider.java | 2 -
.../internal/DefaultProviderModule.java | 4 -
.../internal/UpgradeResourceProvider.java | 3 +-
.../internal/ViewInstanceResourceProvider.java | 147 +++----
.../upgrades/AbstractUpgradeServerAction.java | 6 +-
.../upgrades/AutoSkipFailedSummaryAction.java | 15 +-
.../upgrades/ComponentVersionCheckAction.java | 2 +-
.../serveraction/upgrades/ConfigureAction.java | 11 +-
.../upgrades/FinalizeUpgradeAction.java | 2 +-
.../FixCapacitySchedulerOrderingPolicy.java | 12 +-
.../serveraction/upgrades/FixLzoCodecPath.java | 10 +-
.../upgrades/FixOozieAdminUsers.java | 10 +-
.../upgrades/FixYarnWebServiceUrl.java | 11 +-
.../upgrades/HBaseConfigCalculation.java | 10 +-
.../HBaseEnvMaxDirectMemorySizeAction.java | 11 +-
.../upgrades/HiveEnvClasspathAction.java | 11 +-
.../upgrades/HiveZKQuorumConfigAction.java | 13 +-
.../upgrades/KerberosKeytabsAction.java | 13 +-
.../upgrades/ManualStageAction.java | 3 +-
.../upgrades/OozieConfigCalculation.java | 11 +-
.../upgrades/PreconfigureKerberosAction.java | 2 +-
.../upgrades/RangerConfigCalculation.java | 11 +-
.../RangerKerberosConfigCalculation.java | 11 +-
.../upgrades/RangerKmsProxyConfig.java | 11 +-
.../RangerUsersyncConfigCalculation.java | 11 +-
.../upgrades/RangerWebAlertConfigAction.java | 9 +-
.../upgrades/SparkShufflePropertyConfig.java | 11 +-
.../upgrades/UpdateDesiredRepositoryAction.java | 10 +-
.../upgrades/UpgradeUserKerberosDescriptor.java | 6 +-
.../upgrades/YarnConfigCalculation.java | 11 +-
.../ambari/server/stack/StackDirectory.java | 29 +-
.../ambari/server/stack/StackManager.java | 5 +
.../apache/ambari/server/stack/StackModule.java | 5 -
.../apache/ambari/server/state/StackInfo.java | 8 -
.../python/ambari_server/resourceFilesKeeper.py | 7 +-
.../python/ambari_server/serverConfiguration.py | 2 +-
.../main/python/ambari_server/setupMpacks.py | 2 +-
.../RANGER_KMS/1.0.0.3.0/service_advisor.py | 3 +-
.../main/resources/scripts/Ambaripreupload.py | 4 +-
.../scripts/post-user-creation-hook.sh | 2 +-
.../stack-hooks/after-INSTALL/scripts/hook.py | 37 ++
.../stack-hooks/after-INSTALL/scripts/params.py | 108 ++++++
.../scripts/shared_initialization.py | 132 +++++++
.../before-ANY/files/changeToSecureUid.sh | 64 ++++
.../stack-hooks/before-ANY/scripts/hook.py | 36 ++
.../stack-hooks/before-ANY/scripts/params.py | 254 +++++++++++++
.../before-ANY/scripts/shared_initialization.py | 273 +++++++++++++
.../stack-hooks/before-INSTALL/scripts/hook.py | 37 ++
.../before-INSTALL/scripts/params.py | 115 ++++++
.../scripts/repo_initialization.py | 75 ++++
.../scripts/shared_initialization.py | 37 ++
.../stack-hooks/before-RESTART/scripts/hook.py | 29 ++
.../before-START/files/checkForFormat.sh | 65 ++++
.../before-START/files/fast-hdfs-resource.jar | Bin 0 -> 28296600 bytes
.../before-START/files/task-log4j.properties | 134 +++++++
.../before-START/files/topology_script.py | 66 ++++
.../before-START/scripts/custom_extensions.py | 173 +++++++++
.../stack-hooks/before-START/scripts/hook.py | 43 +++
.../stack-hooks/before-START/scripts/params.py | 380 +++++++++++++++++++
.../before-START/scripts/rack_awareness.py | 48 +++
.../scripts/shared_initialization.py | 256 +++++++++++++
.../templates/commons-logging.properties.j2 | 43 +++
.../templates/exclude_hosts_list.j2 | 21 +
.../templates/hadoop-metrics2.properties.j2 | 107 ++++++
.../before-START/templates/health_check.j2 | 81 ++++
.../templates/include_hosts_list.j2 | 21 +
.../templates/topology_mappings.data.j2 | 24 ++
.../2.0.6/hooks/after-INSTALL/scripts/hook.py | 37 --
.../2.0.6/hooks/after-INSTALL/scripts/params.py | 108 ------
.../scripts/shared_initialization.py | 132 -------
.../hooks/before-ANY/files/changeToSecureUid.sh | 64 ----
.../HDP/2.0.6/hooks/before-ANY/scripts/hook.py | 36 --
.../2.0.6/hooks/before-ANY/scripts/params.py | 254 -------------
.../before-ANY/scripts/shared_initialization.py | 273 -------------
.../2.0.6/hooks/before-INSTALL/scripts/hook.py | 37 --
.../hooks/before-INSTALL/scripts/params.py | 115 ------
.../scripts/repo_initialization.py | 75 ----
.../scripts/shared_initialization.py | 37 --
.../2.0.6/hooks/before-RESTART/scripts/hook.py | 29 --
.../hooks/before-START/files/checkForFormat.sh | 65 ----
.../before-START/files/fast-hdfs-resource.jar | Bin 28296600 -> 0 bytes
.../before-START/files/task-log4j.properties | 134 -------
.../hooks/before-START/files/topology_script.py | 66 ----
.../before-START/scripts/custom_extensions.py | 173 ---------
.../2.0.6/hooks/before-START/scripts/hook.py | 43 ---
.../2.0.6/hooks/before-START/scripts/params.py | 380 -------------------
.../before-START/scripts/rack_awareness.py | 48 ---
.../scripts/shared_initialization.py | 256 -------------
.../templates/commons-logging.properties.j2 | 43 ---
.../templates/exclude_hosts_list.j2 | 21 -
.../templates/hadoop-metrics2.properties.j2 | 107 ------
.../before-START/templates/health_check.j2 | 81 ----
.../templates/include_hosts_list.j2 | 21 -
.../templates/topology_mappings.data.j2 | 24 --
.../services/ECS/package/scripts/ecs_client.py | 2 +-
.../stacks/HDP/2.5/services/stack_advisor.py | 3 +-
.../HDP/3.0/hooks/after-INSTALL/scripts/hook.py | 37 --
.../3.0/hooks/after-INSTALL/scripts/params.py | 109 ------
.../scripts/shared_initialization.py | 140 -------
.../hooks/before-ANY/files/changeToSecureUid.sh | 53 ---
.../HDP/3.0/hooks/before-ANY/scripts/hook.py | 36 --
.../HDP/3.0/hooks/before-ANY/scripts/params.py | 254 -------------
.../before-ANY/scripts/shared_initialization.py | 239 ------------
.../3.0/hooks/before-INSTALL/scripts/hook.py | 37 --
.../3.0/hooks/before-INSTALL/scripts/params.py | 115 ------
.../scripts/repo_initialization.py | 76 ----
.../scripts/shared_initialization.py | 37 --
.../3.0/hooks/before-RESTART/scripts/hook.py | 29 --
.../hooks/before-START/files/checkForFormat.sh | 65 ----
.../before-START/files/fast-hdfs-resource.jar | Bin 28296600 -> 0 bytes
.../before-START/files/task-log4j.properties | 134 -------
.../hooks/before-START/files/topology_script.py | 66 ----
.../HDP/3.0/hooks/before-START/scripts/hook.py | 40 --
.../3.0/hooks/before-START/scripts/params.py | 364 ------------------
.../before-START/scripts/rack_awareness.py | 47 ---
.../scripts/shared_initialization.py | 249 ------------
.../templates/commons-logging.properties.j2 | 43 ---
.../templates/exclude_hosts_list.j2 | 21 -
.../templates/hadoop-metrics2.properties.j2 | 107 ------
.../before-START/templates/health_check.j2 | 81 ----
.../templates/include_hosts_list.j2 | 21 -
.../templates/topology_mappings.data.j2 | 24 --
.../server/api/services/AmbariMetaInfoTest.java | 19 -
.../FixCapacitySchedulerOrderingPolicyTest.java | 2 +-
.../upgrades/FixOozieAdminUsersTest.java | 2 +-
.../upgrades/FixYarnWebServiceUrlTest.java | 2 +-
.../HBaseEnvMaxDirectMemorySizeActionTest.java | 2 +-
.../upgrades/HiveEnvClasspathActionTest.java | 2 +-
.../upgrades/HiveZKQuorumConfigActionTest.java | 2 +-
.../upgrades/KerberosKeytabsActionTest.java | 17 +
.../upgrades/RangerConfigCalculationTest.java | 2 +-
.../RangerKerberosConfigCalculationTest.java | 2 +-
.../upgrades/RangerKmsProxyConfigTest.java | 2 +-
.../RangerUsersyncConfigCalculationTest.java | 2 +-
.../RangerWebAlertConfigActionTest.java | 6 +-
.../SparkShufflePropertyConfigTest.java | 2 +-
.../UpgradeUserKerberosDescriptorTest.java | 4 +-
.../src/test/python/TestResourceFilesKeeper.py | 1 +
.../src/test/python/TestUpgradeSummary.py | 6 +-
.../HIVE/test_jdbc_driver_config.py | 18 +-
.../RANGER/test_db_flavor_config.py | 17 +-
.../RANGER_KMS/test_db_flavor_config.py | 17 +-
.../SQOOP/test_jdbc_driver_config.py | 16 +-
.../hooks/after-INSTALL/test_after_install.py | 26 +-
.../2.0.6/hooks/before-ANY/test_before_any.py | 5 +-
.../hooks/before-INSTALL/test_before_install.py | 14 +-
.../hooks/before-START/test_before_start.py | 21 +-
.../stacks/2.3/common/test_stack_advisor.py | 2 +-
.../src/test/python/stacks/utils/RMFTestCase.py | 42 +-
.../controllers/main/service/info/summary.js | 1 +
ambari-web/app/styles/alerts.less | 6 +-
ambari-web/app/styles/application.less | 5 +
ambari-web/app/styles/bootstrap_overrides.less | 4 +
ambari-web/app/styles/modal_popups.less | 2 +-
.../app/styles/theme/bootstrap-ambari.css | 17 +-
ambari-web/app/styles/top-nav.less | 5 +-
ambari-web/app/styles/wizard.less | 9 +
ambari-web/app/templates/common/breadcrumbs.hbs | 4 +-
.../stack_upgrade/stack_upgrade_wizard.hbs | 2 +-
.../main/service/info/service_alert_popup.hbs | 6 +-
ambari-web/app/templates/wizard/step6.hbs | 2 +-
ambari-web/app/templates/wizard/step9.hbs | 12 +-
.../stack_upgrade/upgrade_version_box_view.js | 7 +-
.../admin/stack_upgrade/upgrade_wizard_view.js | 12 +
.../upgrade_version_box_view_test.js | 24 +-
.../stack_upgrade/upgrade_wizard_view_test.js | 22 ++
.../src/main/assemblies/hdf-ambari-mpack.xml | 1 +
192 files changed, 3287 insertions(+), 6134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/45ca79b3/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
index 58347f3,dc97871..6027519
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
@@@ -73,8 -74,7 +74,9 @@@ import org.apache.ambari.server.control
import org.apache.ambari.server.controller.internal.RepositoryVersionResourceProvider;
import org.apache.ambari.server.controller.internal.ServiceResourceProvider;
import org.apache.ambari.server.controller.internal.UpgradeResourceProvider;
+import org.apache.ambari.server.controller.internal.UserAuthenticationSourceResourceProvider;
+import org.apache.ambari.server.controller.internal.UserResourceProvider;
+ import org.apache.ambari.server.controller.internal.ViewInstanceResourceProvider;
import org.apache.ambari.server.controller.logging.LoggingRequestHelperFactory;
import org.apache.ambari.server.controller.logging.LoggingRequestHelperFactoryImpl;
import org.apache.ambari.server.controller.metrics.MetricPropertyProviderFactory;
http://git-wip-us.apache.org/repos/asf/ambari/blob/45ca79b3/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/45ca79b3/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java
----------------------------------------------------------------------