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 2016/10/07 19:14:29 UTC
[32/32] 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/96480827
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/96480827
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/96480827
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 964808275c3e792ca7927888b2b9bf84371716d8
Parents: e6d8cd1 f6124a0
Author: Nate Cole <nc...@hortonworks.com>
Authored: Fri Oct 7 15:13:42 2016 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Fri Oct 7 15:13:42 2016 -0400
----------------------------------------------------------------------
ambari-agent/conf/unix/ambari-agent | 17 +
.../src/main/python/ambari_agent/HostCleanup.py | 32 +-
.../python/ambari_agent/alerts/web_alert.py | 12 +-
.../TestDataStructureUtils.py | 47 +++
.../main/python/ambari_commons/inet_utils.py | 21 ++
.../libraries/functions/data_structure_utils.py | 57 ++++
.../libraries/providers/hdfs_resource.py | 2 +-
ambari-logsearch/pom.xml | 13 +
.../timeline/AbstractTimelineMetricsSink.java | 75 ++--
.../availability/MetricCollectorHAHelper.java | 19 +-
.../availability/MetricCollectorHATest.java | 34 +-
.../src/main/python/core/blacklisted_set.py | 14 +
.../src/main/python/core/config_reader.py | 3 +-
.../src/main/python/core/emitter.py | 74 ++--
.../ambari-metrics-timelineservice/pom.xml | 9 +
ambari-metrics/pom.xml | 30 +-
ambari-server/pom.xml | 11 +
.../ambari/server/api/services/UserService.java | 2 +-
.../server/controller/KerberosHelperImpl.java | 243 +++++++++----
.../server/controller/StackServiceResponse.java | 16 +-
.../internal/StackServiceResourceProvider.java | 6 +
.../internal/UserResourceProvider.java | 25 +-
.../predicate/ComparisonPredicate.java | 16 +-
.../controller/predicate/EqualsPredicate.java | 15 +
.../server/security/authorization/User.java | 2 +-
.../server/security/authorization/Users.java | 8 +-
.../ConfigureAmbariIdentitiesServerAction.java | 190 ++++++++---
.../kerberos/FinalizeKerberosServerAction.java | 118 ++++++-
.../kerberos/KerberosOperationHandler.java | 2 +-
.../RangerKerberosConfigCalculation.java | 32 +-
.../ambari/server/stack/ServiceModule.java | 6 +-
.../server/state/DependencyConditionInfo.java | 102 ++++++
.../ambari/server/state/DependencyInfo.java | 36 +-
.../apache/ambari/server/state/ServiceInfo.java | 27 ++
.../server/topology/BlueprintValidatorImpl.java | 13 +
.../server/upgrade/UpgradeCatalog250.java | 30 +-
.../ambari/server/utils/ShellCommandUtil.java | 121 +++++++
.../src/main/python/ambari_server/utils.py | 42 ++-
.../src/main/python/ambari_server_main.py | 12 +-
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 12 +-
.../common-services/HDFS/2.1.0.2.0/metainfo.xml | 44 +++
.../HDFS/2.1.0.2.0/package/scripts/utils.py | 15 +-
.../4.0.0.2.0/package/scripts/oozie_service.py | 5 +
.../src/main/resources/properties.json | 1 +
.../resources/stacks/HDP/2.0.6/kerberos.json | 14 +-
.../stacks/HDP/2.0.6/services/stack_advisor.py | 269 +++++++++------
.../stacks/HDP/2.3/services/stack_advisor.py | 13 +-
.../HIVE/configuration/hive-interactive-env.xml | 11 +
.../stacks/HDP/2.5/services/stack_advisor.py | 23 +-
.../resources/stacks/HDP/2.6/repos/repoinfo.xml | 18 +-
.../server/api/services/UserServiceTest.java | 71 ----
.../server/controller/KerberosHelperTest.java | 195 +++++++++--
.../server/security/SecurityHelperImplTest.java | 4 +-
.../AmbariUserAuthenticationFilterTest.java | 2 +-
...nfigureAmbariIdentitiesServerActionTest.java | 204 +++++++++++
.../RangerKerberosConfigCalculationTest.java | 6 +-
.../ambari/server/stack/ServiceModuleTest.java | 19 ++
.../ambari/server/state/ServiceInfoTest.java | 30 ++
.../alerts/AggregateAlertListenerTest.java | 2 +
.../alerts/AlertDefinitionEqualityTest.java | 2 +
.../state/alerts/AlertDefinitionHashTest.java | 2 +
.../state/alerts/AlertEventPublisherTest.java | 2 +
.../state/alerts/AlertReceivedListenerTest.java | 2 +
.../alerts/AlertStateChangedEventTest.java | 2 +
.../state/alerts/InitialAlertEventTest.java | 2 +
.../state/cluster/ClustersDeadlockTest.java | 137 +++++---
.../KerberosComponentDescriptorTest.java | 2 +
.../KerberosConfigurationDescriptorTest.java | 2 +
.../state/kerberos/KerberosDescriptorTest.java | 2 +
.../KerberosDescriptorUpdateHelperTest.java | 2 +
.../KerberosIdentityDescriptorTest.java | 2 +
.../kerberos/KerberosKeytabDescriptorTest.java | 2 +
.../KerberosPrincipalDescriptorTest.java | 2 +
.../kerberos/KerberosServiceDescriptorTest.java | 2 +
.../kerberos/VariableReplacementHelperTest.java | 2 +
.../state/stack/ConfigUpgradePackTest.java | 2 +
.../state/stack/ConfigUpgradeValidityTest.java | 2 +
.../ambari/server/state/stack/OSFamilyTest.java | 3 +
.../server/state/stack/UpgradePackTest.java | 2 +
.../topology/BlueprintValidatorImplTest.java | 75 +++-
.../server/upgrade/UpgradeCatalog240Test.java | 6 +-
.../server/upgrade/UpgradeCatalog250Test.java | 61 ++++
ambari-server/src/test/python/TestUtils.py | 12 +-
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 8 +
.../stacks/2.0.6/common/test_stack_advisor.py | 215 ++++++++++++
ambari-web/app/assets/test/tests.js | 1 +
.../nameNode/step2_controller.js | 32 +-
.../main/admin/stack_and_upgrade_controller.js | 45 ++-
ambari-web/app/controllers/wizard.js | 14 +-
.../app/controllers/wizard/step7_controller.js | 20 +-
.../app/mappers/repository_version_mapper.js | 28 +-
ambari-web/app/messages.js | 1 +
.../models/stack_version/repository_version.js | 6 +
.../admin/highAvailability/nameNode/step3.hbs | 10 +-
.../admin/stack_upgrade/upgrade_version_box.hbs | 2 +-
.../stack_upgrade/upgrade_version_column.hbs | 2 +-
ambari-web/app/utils/ajax/ajax.js | 5 +
ambari-web/app/utils/config.js | 20 ++
.../stack_upgrade/upgrade_version_box_view.js | 6 +
.../upgrade_version_column_view.js | 6 +-
.../admin/stack_and_upgrade_controller_test.js | 74 +++-
ambari-web/test/controllers/wizard_test.js | 97 +-----
.../mappers/repository_version_mapper_test.js | 46 +++
.../upgrade_version_box_view_test.js | 23 +-
.../MICROSOFT_R/8.0.0/kerberos.json | 15 -
.../MICROSOFT_R/8.0.0/metainfo.xml | 53 ---
.../package/files/microsoft_r_serviceCheck.r | 28 --
.../8.0.0/package/scripts/microsoft_r.py | 47 ---
.../MICROSOFT_R/8.0.0/package/scripts/params.py | 31 --
.../8.0.0/package/scripts/params_linux.py | 79 -----
.../8.0.0/package/scripts/params_windows.py | 26 --
.../8.0.0/package/scripts/service_check.py | 89 -----
.../MICROSOFT_R/8.0.0/role_command_order.json | 6 -
.../MICROSOFT_R/8.0.0/service_advisor.py | 73 ----
.../MICROSOFT_R/8.0.5/kerberos.json | 15 +
.../MICROSOFT_R/8.0.5/metainfo.xml | 53 +++
.../package/files/microsoft_r_serviceCheck.r | 28 ++
.../8.0.5/package/scripts/microsoft_r.py | 47 +++
.../MICROSOFT_R/8.0.5/package/scripts/params.py | 31 ++
.../8.0.5/package/scripts/params_linux.py | 79 +++++
.../8.0.5/package/scripts/params_windows.py | 26 ++
.../8.0.5/package/scripts/service_check.py | 89 +++++
.../MICROSOFT_R/8.0.5/role_command_order.json | 6 +
.../MICROSOFT_R/8.0.5/service_advisor.py | 73 ++++
.../MICROSOFT_R/8.0.0/metainfo.xml | 28 --
.../MICROSOFT_R/8.0.0/repos/repoinfo.xml | 33 --
.../MICROSOFT_R/8.0.5/metainfo.xml | 28 ++
.../MICROSOFT_R/8.0.5/repos/repoinfo.xml | 33 ++
.../src/main/resources/mpack.json | 2 +-
.../src/main/resources/ui/app/components.js | 2 +
.../ui/app/components/labelCapacityBar.js | 12 +-
.../resources/ui/app/components/queueBadge.js | 6 +-
.../ui/app/components/queueHierarchy.js | 11 +
.../resources/ui/app/components/queueMapping.js | 25 +-
.../resources/ui/app/components/queueSummary.js | 23 +-
.../ui/app/components/sunburstChart.js | 339 +++++++++++++++++++
.../ui/app/components/xmldiffViewer.js | 101 ++++++
.../resources/ui/app/controllers/advanced.js | 21 +-
.../resources/ui/app/controllers/capsched.js | 39 ++-
.../resources/ui/app/controllers/editqueue.js | 66 +++-
.../resources/ui/app/controllers/queuesconf.js | 106 +++++-
.../resources/ui/app/controllers/scheduler.js | 21 +-
.../src/main/resources/ui/app/models/queue.js | 9 +-
.../src/main/resources/ui/app/router.js | 49 ++-
.../resources/ui/app/styles/application.less | 59 ++++
.../src/main/resources/ui/app/templates.js | 2 +
.../resources/ui/app/templates/capsched.hbs | 6 +
.../ui/app/templates/capsched/advanced.hbs | 13 +-
.../capsched/partials/accessControlList.hbs | 4 +-
.../capsched/partials/labelCapacity.hbs | 4 +-
.../templates/capsched/partials/preemption.hbs | 4 +-
.../capsched/partials/queueCapacity.hbs | 34 +-
.../capsched/partials/queueResources.hbs | 4 +-
.../ui/app/templates/capsched/queuesconf.hbs | 15 +-
.../ui/app/templates/capsched/scheduler.hbs | 6 +-
.../app/templates/components/queueHierarchy.hbs | 8 +-
.../app/templates/components/queueMapping.hbs | 14 +-
.../app/templates/components/queueSummary.hbs | 13 -
.../app/templates/components/sunburstChart.hbs | 44 +++
.../app/templates/components/xmldiffViewer.hbs | 41 +++
.../src/main/resources/ui/bower.json | 13 +-
.../ui/hueambarimigration-view/package.json | 2 +-
.../src/main/resources/ui/package.json | 2 +-
pom.xml | 86 ++++-
utility/pom.xml | 49 +++
utility/src/main/java/category/AlertTest.java | 27 ++
.../main/java/category/AmbariUpgradeTest.java | 27 ++
.../src/main/java/category/BlueprintTest.java | 27 ++
utility/src/main/java/category/FastTest.java | 27 ++
.../src/main/java/category/KerberosTest.java | 27 ++
utility/src/main/java/category/MetricsTest.java | 27 ++
utility/src/main/java/category/SlowTest.java | 27 ++
.../main/java/category/StackUpgradeTest.java | 27 ++
173 files changed, 4687 insertions(+), 1283 deletions(-)
----------------------------------------------------------------------