You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ad...@apache.org on 2018/11/08 12:11:16 UTC
[ambari] branch branch-feature-jdk11 updated (bc3b720 -> d4d112b)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a change to branch branch-feature-jdk11
in repository https://gitbox.apache.org/repos/asf/ambari.git.
omit bc3b720 AMBARI-24752. Upgrade ambari-utility, ambari-server-spi deps for JDK11 (#2434)
omit b6309a8 AMBARI-24730. Support Java 9+ in Ambari Server setup (#2427)
omit 67d8a64 AMBARI-24729. Ambari Server stops with Java 9 due to Guice error (#2418)
add ce9cdfa [AMBARI-24728] Orchestration Should Save Upgrade Pack for source or target (#2417)
add 27d3aba AMBARI-24727 - Autoscaling based on metric alerts (#2416)
add af3f9ff AMBARI-24714. Avoid multi-threading and caching issues when aborting requests and processing agent reports at the same time (#2411)
add d1e7241 [AMBARI-24726] Remove outdated functions.list_ambari_managed_repos module (dgrinenko) (#2413)
add 62476c0 BUG-111390 - Infra Solr: manage autoscaling properties in Ambari (#2414)
add ade6c79 AMBARI-24734. Cover pluralize_view
add 7177f04 Merge pull request #2425 from hiveww/AMBARI-24734-trunk
add d4b97b0 AMBARI-24487 repoVersion entity should show resolved full stack version when available (dgrinenko) (#2412)
add 9204bb5 AMBARI-23058. yum installation fails if there is any transaction files (aonishuk)
add e175b93 AMBARI-24722. Failed to force_non_member_install a stack version on hosts. (#2415)
add e02749c AMBARI-24712. Backport Execution Command Library from branch 'branch-feature-AMBARI-14714' to Ambari 2.8.0
add 21b0549 AMBARI-24712. Updated cluster_settings.py fns if-else structure.
add afabe00 AMBARI-24712. Backport Execution Command Library from branch 'branch-feature-AMBARI-14714' to Ambari 2.8.0
add 25f6e0c [AMBARI-24737] - Expose Upgrade Check Classes via an Ambari Client Library (#2429)
add cf74bb1 AMBARI-24742. Implementing a new service to be used in case we want to encrypt/decrypt sensitive information using custom/environment master key (also injected into Guice) (#2430)
add d3e45e9 AMBARI-21150: Mpack API and DB Schema changes (mradhakrishnan)
add cf2b52a AMBARI-21231: Download and extract mpacks. Add unit tests (mradhakrishnan)
add 9106dcc AMBARI-21231: Mpack to Stack Linkage and Parsing mpacks at bootstrap (mradhakrishnan)
add f9d7051 AMBARI-21077: Fix build issues after reverting patch for AMBARI-21077 and merging latest trunk (jluniya)
add ab5721c AMBARI-21523: DELETE Api for Mpacks (mradhakrishnan)
add 32023fb AMBARI-21796 : Clear versionDefinition map during new mpack registration and mpack deletion (mradhakrishnan)
add 4ae9222 AMBARI-21849 : Clean up repo_version table during mpack delete, add create validation for mpacks (mradhakrishnan)
add 4cfd7a9 AMBARI-21849 : Addendum to fix checkstyle issues and null check (mradhakrishnan)
add a82e169 AMBARI-22082: Create missing parent directory when expanding mpack tarball (jluniya)
add 3959182 AMBARI-22283 : Add stack name and version to mpack API (mradhakrishnan)
add aaa56f2 AMBARI-22283 : Add stack name and version to mpack API (mradhakrishnan)
add 562e52b AMBARI-22283 : Add stack name and version to mpack API (mradhakrishnan)
add 10bf7ba [AMBARI-22904] Revised mpack APIs (#252)
add 29aa64d AMBARI-22971: Remove current_mpack_id to mpack_id in stacks table (jluniya)
add 27f19ad [AMBARI-22992] Update error handling during mpack installation (#363)
add a77b2f9 AMBARI-22979: Update software registry API to support new mpack schema (jluniya) (#433)
add ffe161f [AMBARI-23223] Stack Mpack link broken in stacks api
add 9360b63 [AMBARI-23254] Mpack should have both displayName and description
add fab74c2 [AMBARI-23223] Review comments
add a6536f3 Modifications to choose only necessary changes from Ambari3.0 to Ambari2.8 (mradhakrishnan)
add 2b89b14 Merge branch 'trunk' into AMBARI-24711
add a019793 Fix unit tests due to mpack backport (mradhakrishnan)
add 6adc889 Merge pull request #2401 from apache/AMBARI-24711
add 2415a03 AMBARI-24757. Grafana start failing on U14 fails with error "AttributeError: 'module' object has no attribute 'PROTOCOL_TLSv1_2'" (aonishuk)
add 09c3720 AMBARI-24751. Cover helpers views
add 87d652f Merge pull request #2433 from hiveww/AMBARI-24751-trunk
add 9103295 AMBARI-24758. Ambari-agent takes up too many cpu of perf (aonishuk)
add 39aedf6 Update AmbariAgent.py
add cd9d442 Update ams_alert.py
add 8b3af69 AMBARI-24291. Start All Services on 100-nodes cluster timed out after 1 hour. (#1850)
add c629c63 AMBARI-24767. Error while starting Timeline v2 Reader during Move operation (amagyar) (#2447)
add 4fde749 [AMBARI-24733] Rolling Restarts: Option to pause, resume and abort re… (#2424)
add 343ccdb [AMBARI-24779] Move Namenode operation fails as it tries to install and start ZKFailoverController on non-HA cluster.
add 3b50cb6 AMBARI-24778. Removed CVE issues from ambari-server (#2459)
add 3adfe2e AMBARI-24677. Directory resource cannot work with symlinks if link target is a relative path (aonishuk)
add ecaba72 AMBARI-24782. Introduce support for Ubuntu 18 LTS (aonishuk)
add f4a520f Delete repository.py.rej
add 6f2622c [AMBARI-24768] - Load Upgrade Checks Dynamically From Stacks (#2451)
add 345da1a AMBARI-24784. Ambari-agent cannot register sometimes (aonishuk)
add 26bb2eb [AMBARI-24780] Add Hotfix to VDF Release Element (#2469)
add 42c8385 AMBARI-24785. Removed double 'sudo' invocation (#2470)
add b2bbc85 [AMBARI-24790] Restart Masters for Service Restart.
add 7110d4d [AMBARI-24791] Node Managers fail to start after RM is moved to a different host as 'resource-tracker.address' config is not updated.
add 2fa4bf3 AMBARI-24781 - Ambari setup-ldap: change group member default for IPA (#2478)
add 78bd9cc AMBARI-24775 - Configuration warning: insert a space char between label value and unit-name (#2456)
add bf9b58a AMBARI-24741. Update simplejson to newest with speedup bindings to python2.7 and PyUnicodeUCS4/PyUnicodeUCS2 variations (dgrinenko) (#2479)
add 5a8af96 AMBARI-24774. Wrong settings in exported blueprint (#2475)
add e138e0e AMBARI-24787. Cover with unit tests wizard step7 views (akovalenko)
add a8200b9 AMBARI-24795. Allow skipping Python unit tests (#2482)
add 76401ba AMBARI-24783 : Cleanup dependencies in Capacity Scheduler (nitirajrathore) (#2467)
add 6ea9747 [AMBARI-24803] Separating Restart All, Masters and Slaves.
add 9124745 [AMBARI-24800] service adviser changes for cluster specific configs.(vbrodetskyi) (#2484)
add 246e960 AMBARI-24762. Ambari server continues to send request updates after all commands were completed. (#2441)
add 1db69d3 AMBARI-24794 Adding Ranger Password configs in Admin Settings section under Advanced config (mugdha) (#2481)
add 9ba5622 Fix format string errors in ambari_common.inet_utils (#2487)
add 5b012a7 [AMBARI-24804] - Unify Ambari Versioning Across Modules (#2488)
add 1ac3444 AMBARI-24806. Upgrading swagger maven plugin version (#2491)
add 9c61584 AMBARI-24742. Encrypting/decrypting PASSWORD type properties when inserting them into the DB/using them (#2458)
add a153e5e AMBARI-24783 : removed dependencies which are having security issues (nitirajrathore) (#2493)
add 18f6d37 AMBARI-24811. Remove unused files from ambari-agent (aonishuk)
add 5fcb0ca [AMBARI-24798] Add "maintainer" field to StackService API (mradhakrishnan)
add 5b99d0c Merge pull request #2490 from apache/AMBARI-24798
add 88af062 AMBARI-21157. Fix unintended newline in license (#2496)
add 72a6079 AMBARI-24801. Cover alert definition views
add 470f80a Merge pull request #2485 from hiveww/AMBARI-24801-trunk
add c6f36e1 AMBARI-24786. Cover common configs views
add b66008c Merge pull request #2471 from hiveww/AMBARI-24786-trunk
add 22f6a50 AMBARI-24815 Add column to show which service recommended changes during upgrade refer to
add 464a5e8 [AMBARI-23355] Add Hive Service wizard shows incorrect path for mysql driver in ambari-server setup command. (#779)
add aac386e [AMBARI-24817] Update incorrect instructions for updating alert groups with API (#1766)
add c540bb2 [AMBARI-24296] Yarn Queue manager is allowing to Create a Child Queue for queue-mappings enabled Queue and Save it (#1776)
add cd39737 [AMBARI-24812] - Implement New Upgrade Check Which Warns About Missing Plugin Checks (#2497)
add e602c70 Updating KEYS file. (#2508)
add 29450c4 AMBARI-24819 do not allow creation of new hive actions in WFM (#2506)
add d681b9f AMBARI-24816. Cover dashboard widgets views
add f9d0d13 Merge pull request #2502 from hiveww/AMBARI-24816-trunk
add 18eefee AMBARI-24559. Diff in Downloaded client config: Host file has Stack info where as downloaded file has 'None' in "user.agent.prefix" properties (aonishuk)
add 1a8b193 AMBARI-24709. Implement support for Minimal Blueprint Export (#2489)
add 816e24c AMBARI-24822. TrimmingStrategy implementations should be singletons (#2512)
add 1e5a6ca AMBARI-24824.Make cluster name inputs validation in Ambari UI consistent
add c2680d4 AMBARI-24824.Make cluster name inputs validation in Ambari UI consistent. Additional fix
add 9183c07 [AMBARI-24828] Correct Javadoc Errors in the SPI (#2515)
add 5311ecb AMBARI-24835. Fix javadoc errors in ambari-utility (#2523)
add 2f81272 [AMBARI-24827] LDAP users fail to authenticate using LDAPS due to 'No subject alternative DNS name' exception
add 06c6c20 Merge pull request #2521 from rlevas/AMBARI-24827_trunk
add e6c7522 AMBARI-24829 blueprint install for HDFS_CLIENT and YARN timeline service components without the rest of HDFS/YARN (benyoka) (#2516)
add 2dea9fb AMBARI-24461. Python 2/3 compatible topology_script.py (#2038)
add 89de44a AMBARI-24840. Change Hostname does not honor uppercase hosts (dlisnic… (#2553)
add 99e14e9 [AMBARI-24834] UI: Configure Rolling Restart Batch Options for service rolling restart.
add d7ce1ef [AMBARI-24849] Add Information to the SPI to Support Upgrade Checks (#2564)
add 0f0bc6b AMBARI-24846. Ambari-agent stop hangs if ambari-server is stopped. (aonishuk)
add a2c6fd9 [AMBARI-24814] Add a rolling_restart_supported flag at the stack service endpoint (dsen) (#2500)
add 3287fe2 [AMBARI-24841] Pause after first batch (dsen) (#2554)
add cce16fb AMBARI-24843. Make Ambaripreupload.py more configurable (#2566)
add ffaeaed AMBARI-24732. Datanode and Nodemanagers need to check in to the respective Masters to mark successful restart (aonishuk)
add 4160fed AMBARI-24853 Cluster user can't modify shared widgets
add ac89512 [AMBARI-24854] VersionUtils JavaDoc Changes For Signing the SPI (#2569)
add 4945cd0 AMBARI-24845. Sometimes host status still in heartbeat lost after agent become heartbeating. (mpapirkovskyy) (#2562)
add 2574ed4 AMBARI-24852. NPE in default host group replacement (#2571)
add 7e39765 [AMBARI-24857] UI Changes for supporting Ozone deployment. (#2570)
add 7eee67d AMBARI-24843. Make Ambaripreupload.py more configurable - fallback to default driver (#2575)
add 6a2ddb7 AMBARI-24839. Ambari is trying to create hbase.rootdir using s3 url (aonishuk)
add 2487f92 AMBARI-24830. Add datatype option to the SwaggerUi client being used for api-docs. (jaimin) (#2576)
add bec3828 [AMBARI-24859] Admin View: Apache Ambari logo and favicon does not show when using Knox Gateway (#2577)
add 66a3bf9 AMBARI-24861. New wrapper class on Python side for LDAP-related data for use in service advisors (#2579)
add 42a6363 AMBARI-24839. Ambari is trying to create hbase.rootdir using s3 url (aonishuk)
add 6972507 AMBARI-24865. Build error at Findbugs with Maven 3.6. (#2581)
add ad36582 [AMBARI-24836] Service Auto start is enabled after page refresh
new f6ca8bc AMBARI-24729. Ambari Server stops with Java 9 due to Guice error (#2418)
new 62cdb4a AMBARI-24730. Support Java 9+ in Ambari Server setup (#2427)
new d4d112b AMBARI-24752. Upgrade ambari-utility, ambari-server-spi deps for JDK11 (#2434)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (bc3b720)
\
N -- N -- N refs/heads/branch-feature-jdk11 (d4d112b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
KEYS | 59 +
ambari-admin/pom.xml | 3 +-
.../resources/ui/admin-web/app/images/logo.png | Bin
.../src/main/resources/ui/admin-web/app/index.html | 2 +-
.../ui/admin-web/app/scripts/i18n.config.js | 3 +-
.../admin-web/app/styles/cluster-information.css | 6 +-
.../app/styles/theme/bootstrap-ambari.css | 4 +-
.../app/views/clusters/clusterInformation.html | 36 +-
.../ui/admin-web/app/views/modals/AboutModal.html | 2 +-
.../resources/ui/admin-web/app/views/sideNav.html | 2 +-
ambari-agent/conf/unix/ambari-agent | 234 +-
ambari-agent/pom.xml | 7 +-
.../src/main/package/dependencies.properties | 2 +-
.../src/main/python/ambari_agent/AmbariAgent.py | 65 +-
.../src/main/python/ambari_agent/AmbariConfig.py | 5 +-
.../python/ambari_agent/ConfigurationBuilder.py | 6 +-
.../src/main/python/ambari_agent/Controller.py | 673 ----
.../ambari_agent/CustomServiceOrchestrator.py | 6 +-
.../src/main/python/ambari_agent/Facter.py | 30 +-
.../src/main/python/ambari_agent/Heartbeat.py | 125 -
.../ambari_agent/HostCheckReportFileHandler.py | 5 +-
.../src/main/python/ambari_agent/HostCleanup.py | 3 +-
.../src/main/python/ambari_agent/HostInfo.py | 5 +-
.../ambari_agent/PythonReflectiveExecutor.py | 113 -
.../python/ambari_agent/StatusCommandsExecutor.py | 88 -
.../main/python/ambari_agent/alerts/ams_alert.py | 4 +-
.../main/python/ambari_agent/alerts/base_alert.py | 3 +-
.../python/ambari_agent/alerts/metric_alert.py | 4 +-
.../python/ambari_agent/alerts/script_alert.py | 3 +-
.../src/main/python/ambari_agent/client_example.py | 69 -
ambari-agent/src/main/python/ambari_agent/main.py | 5 +-
.../src/main/python/ambari_agent/test.json | 69 -
.../src/test/python/ambari_agent/TestAlerts.py | 4 +-
.../test/python/ambari_agent/TestAmbariAgent.py | 1 -
.../src/test/python/ambari_agent/TestController.py | 764 -----
.../src/test/python/ambari_agent/TestHeartbeat.py | 254 --
.../src/test/python/ambari_agent/TestMain.py | 11 +-
.../src/test/python/ambari_agent/TestSecurity.py | 1 -
.../TestListAmbariManagedRepos.py | 127 -
.../resource_management/TestRepositoryResource.py | 16 +-
.../python/ambari_commons/ambari_metrics_helper.py | 163 +-
.../src/main/python/ambari_commons/inet_utils.py | 6 +-
.../src/main/python/ambari_commons/os_check.py | 8 +-
.../ambari_commons/repo_manager/yum_manager.py | 3 +
.../python/ambari_commons/resources/os_family.json | 3 +-
.../src/main/python/ambari_simplejson/README.txt | 46 +-
.../src/main/python/ambari_simplejson/__init__.py | 467 ++-
.../src/main/python/ambari_simplejson/_speedups.c | 3384 ++++++++++++++++++++
.../src/main/python/ambari_simplejson/_speedups.so | Bin 34096 -> 0 bytes
.../_speedups}/__init__.py | 0
.../_speedups/posix}/__init__.py | 0
.../_speedups/posix/usc2}/__init__.py | 0
.../_speedups/posix/usc2/_speedups.so | Bin 0 -> 203231 bytes
.../_speedups/posix/usc4}/__init__.py | 0
.../_speedups/posix/usc4/_speedups.so | Bin 0 -> 167144 bytes
.../_speedups/ppc}/__init__.py | 0
.../ambari_simplejson/_speedups/ppc/_speedups.so | Bin 0 -> 220224 bytes
.../_speedups/win}/__init__.py | 0
.../ambari_simplejson/_speedups/win/_speedups.pyd | Bin 0 -> 43008 bytes
.../main/python/ambari_simplejson/c_extension.py | 58 +
.../src/main/python/ambari_simplejson/compat.py | 34 +
.../src/main/python/ambari_simplejson/decoder.py | 284 +-
.../src/main/python/ambari_simplejson/encoder.py | 521 ++-
.../src/main/python/ambari_simplejson/errors.py | 53 +
.../main/python/ambari_simplejson/ordered_dict.py | 103 +
.../src/main/python/ambari_simplejson/raw_json.py | 9 +
.../src/main/python/ambari_simplejson/scanner.py | 48 +-
.../resource_management/core/providers/system.py | 4 +
.../core/resources/jcepolicyinfo.py | 19 +-
.../main/python/resource_management/core/sudo.py | 2 +-
.../resource_management/libraries/__init__.py | 1 +
.../libraries/execution_command}/__init__.py | 0
.../execution_command/cluster_settings.py | 158 +
.../execution_command/execution_command.py | 462 +++
.../libraries/execution_command/module_configs.py | 80 +
.../libraries/execution_command/stack_settings.py | 110 +
.../libraries/functions/expect.py | 40 +-
.../functions/list_ambari_managed_repos.py | 57 -
.../libraries/functions/repository_util.py | 39 +-
.../libraries/functions/solr_cloud_util.py | 20 +-
.../libraries/functions/version.py | 28 +-
.../libraries/providers/hdfs_resource.py | 7 +
.../libraries/providers/repository.py | 29 +-
.../resource_management/libraries/script/script.py | 95 +-
ambari-funtest/pom.xml | 7 +-
ambari-project/pom.xml | 28 +-
ambari-server-spi/pom.xml | 15 +-
.../{UpgradeCheck.java => UpgradeCheckInfo.java} | 17 +-
.../apache/ambari/server/utils/VersionUtils.java | 43 +-
.../org/apache/ambari/spi/ClusterInformation.java | 169 +
.../org/apache/ambari/spi/RepositoryVersion.java | 115 +
.../apache/ambari/spi/stack/StackReleaseInfo.java | 47 +-
.../ambari/spi/stack/StackReleaseVersion.java | 35 +-
.../ambari/spi/upgrade/CheckQualification.java | 8 +-
...ification.java => PriorCheckQualification.java} | 32 +-
.../apache/ambari/spi/upgrade/UpgradeCheck.java | 36 +-
...scription.java => UpgradeCheckDescription.java} | 70 +-
.../ambari/spi/upgrade/UpgradeCheckGroup.java | 2 +-
.../ambari/spi/upgrade/UpgradeCheckRequest.java | 105 +-
.../ambari/spi/upgrade/UpgradeCheckResult.java | 54 +-
.../ambari/spi/upgrade/UpgradeCheckType.java | 13 +
ambari-server/conf/unix/ambari.properties | 1 +
ambari-server/conf/windows/ambari.properties | 1 +
ambari-server/docs/api/v1/alert-dispatching.md | 4 +-
ambari-server/docs/configuration/index.md | 1 +
ambari-server/pom.xml | 43 +-
ambari-server/src/main/assemblies/server.xml | 8 +
.../ambari/server/AmbariRuntimeException.java | 4 +
.../server/actionmanager/ActionDBAccessorImpl.java | 171 +-
.../server/actionmanager/ActionScheduler.java | 5 +-
.../actionmanager/ExecutionCommandWrapper.java | 75 +-
.../apache/ambari/server/actionmanager/Stage.java | 16 +-
.../ambari/server/agent/CommandRepository.java | 7 +-
.../ambari/server/agent/ExecutionCommand.java | 59 +-
.../ambari/server/agent/HeartbeatProcessor.java | 2 +-
.../server/agent/stomp/HostLevelParamsHolder.java | 38 +-
.../agent/stomp/dto/HostLevelParamsCluster.java | 11 +-
.../server/agent/stomp/dto/HostRepositories.java | 50 -
.../api/query/render/ClusterBlueprintRenderer.java | 234 +-
.../api/query/render/MetricsPaddingRenderer.java | 3 +-
.../api/resources/ClusterResourceDefinition.java | 11 +-
.../api/resources/MpackResourceDefinition.java | 112 +
.../api/resources/ResourceInstanceFactoryImpl.java | 4 +
.../resources/StackVersionResourceDefinition.java | 56 +-
.../ambari/server/api/services/AmbariMetaInfo.java | 112 +-
.../services/MpackRequestSwagger.java} | 19 +-
.../ambari/server/api/services/MpacksService.java | 186 ++
.../api/services/RequestScheduleService.java | 34 +
...igurationDependenciesRecommendationCommand.java | 5 +-
.../ConfigurationRecommendationCommand.java | 5 +-
.../ambari/server/bootstrap/BootStrapImpl.java | 36 +-
...MetricsHadoopSinkVersionCompatibilityCheck.java | 59 +-
.../server/checks/AtlasMigrationPropertyCheck.java | 73 -
.../server/checks/AutoStartDisabledCheck.java | 50 +-
.../ambari/server/checks/CheckDescription.java | 451 ---
.../server/checks/ClientRetryPropertyCheck.java | 148 -
...tractCheckDescriptor.java => ClusterCheck.java} | 299 +-
.../server/checks/ComponentsExistInRepoCheck.java | 67 +-
.../server/checks/ComponentsInstallationCheck.java | 42 +-
.../server/checks/ConfigurationMergeCheck.java | 57 +-
.../server/checks/DruidHighAvailabilityCheck.java | 121 -
.../HardcodedStackVersionPropertiesCheck.java | 40 +-
.../apache/ambari/server/checks/HealthCheck.java | 41 +-
.../checks/HiveDynamicServiceDiscoveryCheck.java | 128 -
.../server/checks/HiveMultipleMetastoreCheck.java | 83 -
.../server/checks/HiveNotRollingWarning.java | 71 -
.../server/checks/HostMaintenanceModeCheck.java | 54 +-
.../ambari/server/checks/HostsHeartbeatCheck.java | 45 +-
.../server/checks/HostsMasterMaintenanceCheck.java | 72 +-
.../server/checks/HostsRepositoryVersionCheck.java | 49 +-
.../ambari/server/checks/InstallPackagesCheck.java | 66 +-
.../ambari/server/checks/KafkaKerberosCheck.java | 70 -
.../KerberosAdminPersistedCredentialCheck.java | 65 +-
.../org/apache/ambari/server/checks/LZOCheck.java | 47 +-
.../MapReduce2JobHistoryStatePreservingCheck.java | 101 -
.../server/checks/MissingOsInRepoVersionCheck.java | 66 +-
.../server/checks/OrchestrationQualification.java | 70 +
.../server/checks/PluginChecksLoadedCheck.java | 172 +
.../server/checks/PreviousUpgradeCompleted.java | 38 +-
.../ambari/server/checks/RangerAuditDbCheck.java | 65 -
.../ambari/server/checks/RangerPasswordCheck.java | 378 ---
.../ambari/server/checks/RangerSSLConfigCheck.java | 81 -
.../checks/RequiredServicesInRepositoryCheck.java | 52 +-
.../checks/SecondaryNamenodeDeletedCheck.java | 114 -
.../server/checks/ServiceCheckValidityCheck.java | 41 +-
.../ambari/server/checks/ServicePresenceCheck.java | 68 +-
.../checks/ServicesMaintenanceModeCheck.java | 43 +-
.../ServicesMapReduceDistributedCacheCheck.java | 124 -
.../ServicesNamenodeHighAvailabilityCheck.java | 71 -
.../checks/ServicesNamenodeTruncateCheck.java | 80 -
.../checks/ServicesTezDistributedCacheCheck.java | 138 -
.../ambari/server/checks/ServicesUpCheck.java | 41 +-
.../checks/ServicesYarnWorkPreservingCheck.java | 67 -
.../ambari/server/checks/StormShutdownWarning.java | 69 -
.../apache/ambari/server/checks/UpgradeCheck.java | 83 -
.../ambari/server/checks/UpgradeCheckGroup.java | 114 -
.../ambari/server/checks/UpgradeCheckRegistry.java | 280 +-
.../checks/UpgradeCheckRegistryProvider.java | 109 +
.../server/checks/UpgradeTypeQualification.java | 65 +
.../ambari/server/checks/VersionMismatchCheck.java | 62 +-
.../server/checks/YarnRMHighAvailabilityCheck.java | 68 -
.../YarnTimelineServerStatePreservingCheck.java | 136 -
.../server/cleanup/ClasspathScannerUtils.java | 32 +-
.../ambari/server/configuration/Configuration.java | 28 +
.../controller/AmbariActionExecutionHelper.java | 25 +-
.../AmbariCustomCommandExecutionHelper.java | 41 +-
.../controller/AmbariManagementController.java | 62 +-
.../controller/AmbariManagementControllerImpl.java | 143 +-
.../ambari/server/controller/ControllerModule.java | 71 +-
.../ambari/server/controller/MpackRequest.java | 142 +
.../ambari/server/controller/MpackResponse.java | 149 +
.../server/controller/PrereqCheckRequest.java | 153 -
.../server/controller/StackServiceResponse.java | 22 +
.../server/controller/StackVersionResponse.java | 27 +-
.../server/controller/ViewInstanceRequest.java | 1 -
.../AbstractControllerResourceProvider.java | 4 +
.../internal/AbstractResourceProvider.java | 4 +-
.../internal/BlueprintConfigurationProcessor.java | 201 +-
.../controller/internal/BlueprintExportType.java | 164 +
.../internal/ClientConfigResourceProvider.java | 9 +
.../ClusterStackVersionResourceProvider.java | 10 +-
.../internal/CompatibleRepositoryVersion.java | 2 +-
.../internal/ConfigurationTopologyException.java | 3 +-
.../controller/internal/DefaultProviderModule.java | 8 +-
.../internal/DirectoriesTrimmingStrategy.java | 32 -
.../internal/ExportBlueprintRequest.java | 64 +-
.../controller/internal/HostResourceProvider.java | 58 +-
.../internal/HostStackVersionResourceProvider.java | 8 +-
.../controller/internal/MpackResourceProvider.java | 363 +++
.../internal/PasswordTrimmingStrategy.java | 31 -
.../internal/PreUpgradeCheckResourceProvider.java | 139 +-
.../PropertyValueTrimmingStrategyDefiner.java | 24 +-
.../internal/RequestScheduleResourceProvider.java | 32 +-
.../internal/ServiceResourceProvider.java | 2 +-
.../internal/StackServiceResourceProvider.java | 17 +-
.../internal/StackVersionResourceProvider.java | 137 +-
.../controller/internal/TrimmingStrategy.java | 41 +-
.../server/controller/internal/UnitUpdater.java | 18 +-
.../internal/UpgradeResourceProvider.java | 3 +-
.../VersionDefinitionResourceProvider.java | 19 +-
.../controller/metrics/MetricHostProvider.java | 3 +-
.../metrics/MetricsPropertyProviderProxy.java | 4 +-
.../MetricsReportPropertyProviderProxy.java | 2 +-
.../cache/TimelineMetricCacheProvider.java | 3 +-
.../ambari/server/controller/spi/Resource.java | 2 +
.../ambari/server/events/ServiceUpdateEvent.java | 16 +-
.../ambari/server/events/UpgradeUpdateEvent.java | 2 +-
.../HostComponentsUpdateListener.java | 1 -
.../listeners/requests/STOMPUpdateListener.java | 3 +-
.../listeners/services/ServiceUpdateListener.java | 24 +-
.../listeners/upgrade/StackVersionListener.java | 19 +-
.../listeners/upgrade/UpgradeUpdateListener.java | 2 +-
.../publishers/BufferedUpdateEventPublisher.java | 51 +-
.../HostComponentUpdateEventPublisher.java | 30 +-
.../publishers/RequestUpdateEventPublisher.java | 70 +-
.../events/publishers/STOMPUpdatePublisher.java | 52 +-
.../publishers/ServiceUpdateEventPublisher.java | 72 +-
.../ldap/domain/AmbariLdapConfiguration.java | 4 +
.../metrics/system/impl/AmbariMetricSinkImpl.java | 2 -
.../metrics/system/impl/MetricsServiceImpl.java | 3 +-
.../apache/ambari/server/mpack/MpackManager.java | 588 ++++
.../MpackManagerFactory.java} | 43 +-
.../org/apache/ambari/server/orm/dao/MpackDAO.java | 104 +
.../server/orm/dao/RepositoryVersionDAO.java | 19 +-
.../org/apache/ambari/server/orm/dao/StackDAO.java | 25 +
.../apache/ambari/server/orm/dao/UpgradeDAO.java | 2 +-
.../ambari/server/orm/entities/MpackEntity.java | 162 +
.../orm/entities/RepositoryVersionEntity.java | 15 +-
.../server/orm/entities/RequestScheduleEntity.java | 11 +
.../ambari/server/orm/entities/StackEntity.java | 14 +
.../ambari/server/orm/entities/UpgradeEntity.java | 23 +-
.../scheduler/AbstractLinearExecutionJob.java | 25 +
.../server/scheduler/ExecutionScheduleManager.java | 217 +-
.../AmbariLdapAuthenticationProvider.java | 11 +-
.../security/encryption/AESEncryptionService.java | 125 +
.../encryption/ConfigPropertiesEncryptor.java | 127 +
.../security/encryption/EncryptionService.java | 153 +
.../encryption/Encryptor.java} | 39 +-
.../security/encryption/MasterKeyServiceImpl.java | 53 +-
.../upgrades/FinalizeUpgradeAction.java | 2 +-
.../upgrades/UpdateDesiredRepositoryAction.java | 4 +-
.../apache/ambari/server/stack/ServiceModule.java | 4 +
.../apache/ambari/server/stack/StackDirectory.java | 114 +-
.../apache/ambari/server/stack/StackManager.java | 7 +-
.../apache/ambari/server/stack/StackModule.java | 16 +-
.../ambari/server/stack/upgrade/HostOrderItem.java | 1 +
.../stack/upgrade/RepositoryVersionHelper.java | 29 +-
.../server/stack/upgrade/ServiceCheckGrouping.java | 1 +
.../server/stack/upgrade/UpdateStackGrouping.java | 2 +
.../ambari/server/stack/upgrade/UpgradePack.java | 79 +
.../stack/upgrade/orchestrate/UpgradeContext.java | 94 +-
.../stack/upgrade/orchestrate/UpgradeHelper.java | 116 +-
.../stack/upgrade/orchestrate/UpgradeSummary.java | 4 +-
.../apache/ambari/server/state/CheckHelper.java | 238 +-
.../org/apache/ambari/server/state/Cluster.java | 10 +-
.../org/apache/ambari/server/state/Config.java | 5 +
.../org/apache/ambari/server/state/ConfigImpl.java | 30 +-
.../org/apache/ambari/server/state/Module.java | 188 ++
.../ambari/server/state/ModuleComponent.java | 120 +
.../ambari/server/state/ModuleDependency.java | 88 +
.../java/org/apache/ambari/server/state/Mpack.java | 276 ++
.../apache/ambari/server/state/PropertyInfo.java | 7 +
.../apache/ambari/server/state/RepositoryType.java | 93 -
.../apache/ambari/server/state/ServiceInfo.java | 27 +
.../org/apache/ambari/server/state/StackInfo.java | 121 +-
.../org/apache/ambari/server/state/UriInfo.java | 1 +
.../ambari/server/state/cluster/ClusterImpl.java | 16 +-
.../apache/ambari/server/state/host/HostImpl.java | 2 +
.../state/repository/DefaultStackVersion.java | 74 +
.../ambari/server/state/repository/Release.java | 27 +-
.../state/repository/VersionDefinitionXml.java | 33 +-
.../server/state/scheduler/BatchRequest.java | 10 +
.../server/state/scheduler/BatchSettings.java | 11 +
.../server/state/scheduler/RequestExecution.java | 10 +-
.../state/scheduler/RequestExecutionImpl.java | 41 +
.../server/state/stack/MetricDefinition.java | 3 +-
.../server/state/stack/PrerequisiteCheck.java | 87 -
.../server/state/stack/StackMetainfoXml.java | 55 +-
.../svccomphost/ServiceComponentHostImpl.java | 20 +-
.../ambari/server/topology/AmbariContext.java | 2 +-
.../ambari/server/topology/BlueprintFactory.java | 3 +-
.../ambari/server/topology/BlueprintImpl.java | 3 +-
.../ambari/server/topology/BlueprintValidator.java | 3 +-
.../server/topology/ClusterTopologyImpl.java | 3 +-
.../ambari/server/topology/Configuration.java | 19 +-
.../server/topology/ConfigurationFactory.java | 3 +-
.../apache/ambari/server/topology/Credential.java | 3 +-
.../ambari/server/topology/HostGroupImpl.java | 3 +-
.../ambari/server/topology/HostOfferResponse.java | 3 +-
.../server/topology/NoSuchBlueprintException.java | 3 +-
.../server/topology/NoSuchHostGroupException.java | 3 +-
.../server/topology/SecurityConfiguration.java | 3 +-
.../topology/SecurityConfigurationFactory.java | 3 +-
.../server/topology/TopologyRequestFactory.java | 3 +-
.../topology/TopologyRequestFactoryImpl.java | 3 +-
.../ambari/server/topology/tasks/TopologyTask.java | 3 +-
.../server/topology/validators/UnitValidator.java | 3 +-
.../ambari/server/update/HostUpdateHelper.java | 5 +-
.../ambari/server/upgrade/UpgradeCatalog270.java | 3 +
.../ambari/server/upgrade/UpgradeCatalog280.java | 20 +-
.../apache/ambari/server/utils/MpackVersion.java | 82 +-
.../org/apache/ambari/server/utils/StageUtils.java | 1 -
.../TextEncoding.java} | 19 +-
ambari-server/src/main/python/ambari-server.py | 2 +-
.../src/main/python/ambari_server/setupSecurity.py | 10 +-
.../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 23 +
.../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 21 +
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 22 +
.../main/resources/Ambari-DDL-Postgres-CREATE.sql | 22 +
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 22 +
.../main/resources/Ambari-DDL-SQLServer-CREATE.sql | 22 +
.../src/main/resources/META-INF/persistence.xml | 1 +
.../src/main/resources/mpacks-v2/README.txt | 1 +
.../src/main/resources/scripts/Ambaripreupload.py | 132 +-
.../before-START/files/topology_script.py | 13 +-
.../main/resources/stacks/ambari_configuration.py | 225 ++
.../src/main/resources/stacks/stack_advisor.py | 5 +-
.../src/main/resources/version_definition.xsd | 6 +-
.../actionmanager/ExecutionCommandWrapperTest.java | 44 -
.../ambari/server/agent/AgentResourceTest.java | 9 +
.../agent/stomp/HostLevelParamsHolderTest.java | 25 +-
.../ambari/server/api/query/QueryImplTest.java | 2 +-
.../query/render/ClusterBlueprintRendererTest.java | 364 ++-
.../resources/MpackResourceDefinitionTest.java} | 30 +-
.../StackVersionResourceDefinitionTest.java | 2 +-
.../server/api/services/AmbariMetaInfoTest.java | 23 +-
.../server/api/services/MpacksServiceTest.java | 92 +
.../ambari/server/bootstrap/BootStrapTest.java | 3 +
.../AmbariMetricsHadoopSinkVersionCheckTest.java | 132 +-
.../checks/AtlasMigrationPropertyCheckTest.java | 140 -
.../server/checks/AutoStartDisabledCheckTest.java | 73 +-
.../checks/ClientRetryPropertyCheckTest.java | 193 --
...ckDescriptorTest.java => ClusterCheckTest.java} | 202 +-
.../checks/ComponentExistsInRepoCheckTest.java | 52 +-
.../checks/ComponentsInstallationCheckTest.java | 102 +-
.../server/checks/ConfigurationMergeCheckTest.java | 56 +-
.../checks/DruidHighAvailabilityCheckTest.java | 178 -
.../ambari/server/checks/HealthCheckTest.java | 29 +-
.../HiveDynamicServiceDiscoveryCheckTest.java | 139 -
.../checks/HiveMultipleMetastoreCheckTest.java | 199 --
.../server/checks/HiveNotRollingWarningTest.java | 128 -
.../checks/HostMaintenanceModeCheckTest.java | 37 +-
.../server/checks/HostsHeartbeatCheckTest.java | 43 +-
.../checks/HostsMasterMaintenanceCheckTest.java | 77 +-
.../checks/HostsRepositoryVersionCheckTest.java | 107 +-
.../server/checks/InstallPackagesCheckTest.java | 51 +-
.../server/checks/KafkaKerberosCheckTest.java | 122 -
.../KerberosAdminPersistedCredentialCheckTest.java | 72 +-
.../apache/ambari/server/checks/LZOCheckTest.java | 108 +-
...pReduce2JobHistoryStatePreservingCheckTest.java | 193 --
.../checks/MissingOsInRepoVersionCheckTest.java | 59 +-
.../ambari/server/checks/MockCheckHelper.java | 59 +
.../server/checks/PluginChecksLoadedCheckTest.java | 101 +
.../checks/PreviousUpgradeCompletedTest.java | 38 +-
.../server/checks/RangerAuditDbCheckTest.java | 138 -
.../server/checks/RangerPasswordCheckTest.java | 542 ----
.../server/checks/RangerSSLConfigCheckTest.java | 177 -
.../RequiredServicesInRepositoryCheckTest.java | 68 +-
.../checks/SecondaryNamenodeDeletedCheckTest.java | 150 -
.../checks/ServiceCheckValidityCheckTest.java | 48 +-
.../server/checks/ServicePresenceCheckTest.java | 114 +-
.../checks/ServicesMaintenanceModeCheckTest.java | 76 +-
...ServicesMapReduceDistributedCacheCheckTest.java | 286 --
.../ServicesNamenodeHighAvailabilityCheckTest.java | 131 -
.../checks/ServicesNamenodeTruncateCheckTest.java | 164 -
.../ServicesTezDistributedCacheCheckTest.java | 325 --
.../ambari/server/checks/ServicesUpCheckTest.java | 120 +-
.../ServicesYarnWorkPreservingCheckTest.java | 129 -
.../server/checks/StormShutdownWarningTest.java | 127 -
.../server/checks/UpgradeCheckOrderTest.java | 20 +-
.../checks/UpgradeTypeQualificationTest.java | 110 +
.../server/checks/VersionMismatchCheckTest.java | 26 +-
...YarnTimelineServerStatePreservingCheckTest.java | 214 --
.../server/configuration/ConfigurationTest.java | 10 +
.../AmbariCustomCommandExecutionHelperTest.java | 3 +-
.../AmbariManagementControllerImplTest.java | 54 +-
.../controller/AmbariManagementControllerTest.java | 33 +-
.../ambari/server/controller/AmbariServerTest.java | 2 +
.../server/controller/KerberosHelperTest.java | 4 +-
.../server/controller/MpackRequestTest.java} | 28 +-
.../server/controller/MpackResponseTest.java | 57 +
.../internal/AbstractResourceProviderTest.java | 2 +-
.../BlueprintConfigurationProcessorTest.java | 145 +-
.../internal/ClusterControllerImplTest.java | 2 +-
.../ClusterStackVersionResourceProviderTest.java | 2 +-
...tibleRepositoryVersionResourceProviderTest.java | 2 +-
.../internal/CredentialResourceProviderTest.java | 2 +-
.../internal/ExportBlueprintRequestTest.java | 42 +-
.../internal/HostResourceProviderTest.java | 6 +-
.../HostStackVersionResourceProviderTest.java | 15 +
.../internal/MpackResourceProviderTest.java | 290 ++
.../PreUpgradeCheckResourceProviderTest.java | 247 +-
.../internal/RequestOperationLevelTest.java | 4 +-
.../internal/ServiceResourceProviderTest.java | 2 +-
.../StackUpgradeConfigurationMergeTest.java | 7 +-
.../internal/UpgradeResourceProviderTest.java | 5 +-
.../UpgradeSummaryResourceProviderTest.java | 3 +-
...erAuthenticationSourceResourceProviderTest.java | 2 +
.../UserAuthorizationResourceProviderTest.java | 2 +
.../internal/UserResourceProviderTest.java | 2 +
.../internal/ValidationResourceProviderTest.java | 4 +-
.../ganglia/GangliaPropertyProviderTest.java | 2 +-
.../ganglia/GangliaReportPropertyProviderTest.java | 3 +-
.../timeline/AMSReportPropertyProviderTest.java | 2 +-
.../system/impl/TestAmbariMetricsSinkImpl.java | 2 -
.../ambari/server/mpack/MpackManagerMock.java | 590 ++++
.../dispatchers/SNMPDispatcherTest.java | 4 +-
.../server/orm/InMemoryDefaultTestModule.java | 20 +-
.../apache/ambari/server/orm/dao/MpackDAOTest.java | 80 +
.../server/orm/dao/RepositoryVersionDAOTest.java | 2 +-
.../ambari/server/orm/dao/UpgradeDAOTest.java | 16 +-
.../org/apache/ambari/server/orm/db/DDLTests.java | 2 +-
.../server/orm/entities/MpackEntityTest.java | 68 +
.../server/sample/checks/SampleServiceCheck.java | 29 +-
.../scheduler/ExecutionScheduleManagerTest.java | 159 +-
.../AbstractAuthenticationProviderTest.java | 2 +-
.../encryption/CredentialProviderTest.java | 2 +-
.../encryption/CredentialStoreServiceImplTest.java | 2 +-
.../security/encryption/CredentialStoreTest.java | 2 +-
.../security/encryption/EncryptionServiceTest.java | 100 +
.../security/encryption/MasterKeyServiceTest.java | 10 +-
.../AbstractPrepareKerberosServerActionTest.java | 2 +
.../kerberos/FinalizeKerberosServerActionTest.java | 2 -
.../kerberos/KerberosServerActionTest.java | 1 -
.../UpdateKerberosConfigsServerActionTest.java | 2 +
.../AtlasProxyUserConfigCalculationTest.java | 2 -
.../upgrades/ComponentVersionCheckActionTest.java | 4 +-
.../serveraction/upgrades/ConfigureActionTest.java | 3 +-
.../upgrades/CreateAndConfigureActionTest.java | 3 +-
.../upgrades/KerberosKeytabsActionTest.java | 3 +
.../upgrades/PreconfigureKerberosActionTest.java | 2 +
.../serveraction/upgrades/UpgradeActionTest.java | 6 +-
.../PostUserCreationHookServerActionTest.java | 2 -
.../upgrade/orchestrate/UpgradeContextTest.java | 75 +-
.../upgrade/orchestrate/UpgradeHelperTest.java | 23 +-
.../ambari/server/state/CheckHelperTest.java | 127 +-
.../ambari/server/state/ConfigHelperTest.java | 3 +
.../ambari/server/state/ConfigMergeHelperTest.java | 2 +-
.../org/apache/ambari/server/state/MpackTest.java | 128 +
.../ambari/server/state/RequestExecutionTest.java | 3 +-
.../ambari/server/state/ServiceInfoTest.java | 47 +
.../state/repository/VersionDefinitionTest.java | 31 +-
.../services/RetryUpgradeActionServiceTest.java | 3 +-
.../server/state/stack/ConfigUpgradePackTest.java | 4 +-
.../state/stack/ConfigUpgradeValidityTest.java | 2 -
.../ambari/server/state/stack/UpgradePackTest.java | 2 +-
.../stack/upgrade/StageWrapperBuilderTest.java | 2 +-
.../server/testing/DBInconsistencyTests.java | 3 +
.../server/testutils/PartialNiceMockBinder.java | 15 +
.../ambari/server/topology/AmbariContextTest.java | 2 +-
.../ambari/server/update/HostUpdateHelperTest.java | 12 +-
.../server/upgrade/UpgradeCatalog251Test.java | 5 +-
.../server/upgrade/UpgradeCatalog252Test.java | 5 +-
.../server/upgrade/UpgradeCatalog260Test.java | 8 +-
.../server/upgrade/UpgradeCatalog270Test.java | 4 +-
.../server/upgrade/UpgradeCatalog280Test.java | 30 +-
.../apache/ambari/server/utils/StageUtilsTest.java | 5 -
.../ambari/server/utils/TestVersionUtils.java | 47 +-
...configuration.py => TestAmbariConfiguration.py} | 126 +-
ambari-server/src/test/python/TestAmbariServer.py | 1 +
.../src/test/python/TestExecutionCommand.py | 292 ++
.../test/python/TestExecutionCommand_command.json | 497 +++
ambari-server/src/test/python/TestVersion.py | 44 +-
.../python/custom_actions/TestInstallPackages.py | 55 +-
.../custom_actions/TestRemoveStackVersion.py | 14 +-
.../src/test/python/stacks/utils/RMFTestCase.py | 2 +-
ambari-server/src/test/python/unitTests.py | 4 +-
ambari-server/src/test/resources/README.txt | 1 +
.../src/test/resources/abc.tar.gz | 0
.../src/test/resources/mpacks-v2/README.txt | 1 +
.../src/test/resources/mpacks-v2/abc.tar.gz | 0
.../mpacks-v2/upgrade-packs/upgrade-basic.xml | 1140 +++++++
.../stacks/HDP/2.2.0/upgrades/upgrade_from_211.xml | 220 ++
.../test/resources/upgrade-packs/upgrade-basic.xml | 1140 +++++++
ambari-utility/pom.xml | 3 +-
.../annotations/SwaggerOverwriteNestedAPI.java | 16 +-
.../ambari/annotations/SwaggerPreferredParent.java | 5 +-
ambari-views/examples/auto-cluster-view/pom.xml | 2 +-
ambari-views/examples/calculator-view/pom.xml | 4 +-
ambari-views/examples/cluster-view/pom.xml | 5 +-
ambari-views/examples/favorite-view/pom.xml | 4 +-
ambari-views/examples/hello-servlet-view/pom.xml | 5 +-
ambari-views/examples/hello-spring-view/pom.xml | 5 +-
ambari-views/examples/helloworld-view/pom.xml | 5 +-
.../examples/phone-list-upgrade-view/pom.xml | 7 +-
ambari-views/examples/phone-list-view/pom.xml | 4 +-
ambari-views/examples/pom.xml | 3 +-
.../examples/property-validator-view/pom.xml | 5 +-
ambari-views/examples/property-view/pom.xml | 5 +-
ambari-views/examples/restricted-view/pom.xml | 4 +-
ambari-views/examples/simple-view/pom.xml | 5 +-
ambari-views/pom.xml | 3 +-
ambari-web/api-docs/index.html | 3 +-
ambari-web/api-docs/lib/jquery-1.8.3.min.js | 2 -
ambari-web/api-docs/lib/jquery-1.9.0.min.js | 5 +
ambari-web/app/assets/test/tests.js | 17 +
.../resourceManager/step3_controller.js | 2 +
.../controllers/main/admin/service_auto_start.js | 17 +-
.../main/admin/stack_and_upgrade_controller.js | 8 +-
ambari-web/app/controllers/main/service/item.js | 106 +-
.../main/service/reassign/step3_controller.js | 9 +
.../main/service/reassign/step4_controller.js | 3 +-
.../main/service/reassign_controller.js | 3 +-
.../app/controllers/wizard/step0_controller.js | 4 +-
.../app/controllers/wizard/step4_controller.js | 41 +-
.../app/controllers/wizard/step6_controller.js | 5 +-
.../app/data/configs/services/ranger_properties.js | 18 +-
.../app/data/configs/wizards/rm_ha_properties.js | 23 +-
ambari-web/app/messages.js | 3 +-
.../app/mixins/common/widgets/widget_mixin.js | 5 +-
ambari-web/app/models/host_component.js | 6 +-
ambari-web/app/models/stack_service.js | 17 +-
.../app/templates/common/service_restart.hbs | 60 +-
ambari-web/app/utils/batch_scheduled_requests.js | 164 +-
.../utils/configs/move_rm_config_initializer.js | 1 +
.../app/utils/configs/rm_ha_config_initializer.js | 2 +
.../configs/widgets/combo_config_widget_view.js | 3 +-
.../configs/widgets/slider_config_widget_view.js | 11 +-
.../app/views/common/service_restart_view.js | 18 +-
ambari-web/app/views/main/host/summary.js | 3 +
ambari-web/pom.xml | 3 +-
.../main/admin/service_auto_start_test.js | 4 +
.../admin/stack_and_upgrade_controller_test.js | 17 +-
ambari-web/test/controllers/wizard/step0_test.js | 16 +-
.../configs/config_category_container_view_test.js | 65 +
.../service_config_layout_tab_compare_view_test.js | 54 +
.../configs/service_config_layout_tab_view_test.js | 78 +
.../widgets/slider_config_widget_view_test.js | 14 +-
.../views/common/helpers/format_null_view_test.js | 64 +
.../views/common/helpers/pluralize_view_test.js | 108 +
.../views/common/helpers/status_icon_view_test.js | 50 +
.../alert_definition_summary_test.js | 122 +
.../dashboard/widgets/flume_agent_live_test.js | 70 +
.../main/dashboard/widgets/hbase_links_test.js | 53 +
.../dashboard/widgets/hbase_master_heap_test.js | 59 +
.../main/dashboard/widgets/namenode_heap_test.js | 43 +-
.../widgets/resource_manager_heap_test.js | 59 +
.../main/dashboard/widgets/supervisor_live_test.js | 57 +
.../views/wizard/step7/accounts_tab_view_test.js | 87 +
.../wizard/step7/credentials_tab_view_test.js | 129 +
.../views/wizard/step7/databases_tab_view_test.js | 143 +
.../wizard/step7/directories_tab_view_test.js | 152 +
.../ambari/msi/AbstractResourceProviderTest.java | 7 +-
contrib/management-packs/hdf-ambari-mpack/pom.xml | 2 +-
.../hooks/before-START/files/topology_script.py | 13 +-
.../management-packs/isilon-onefs-mpack/pom.xml | 2 +-
contrib/management-packs/microsoft-r_mpack/pom.xml | 2 +-
.../hooks/before-START/files/topology_script.py | 13 +-
contrib/management-packs/pom.xml | 5 +-
contrib/views/ambari-views-package/pom.xml | 3 +-
contrib/views/capacity-scheduler/pom.xml | 9 +-
.../main/resources/ui/app/controllers/queues.js | 5 +-
contrib/views/commons/pom.xml | 17 +-
contrib/views/files/pom.xml | 19 +-
contrib/views/pig/pom.xml | 45 +-
contrib/views/pom.xml | 7 +-
contrib/views/utils/pom.xml | 28 +-
contrib/views/wfmanager/pom.xml | 23 +-
.../app/templates/components/workflow-actions.hbs | 2 +-
pom.xml | 110 +-
setup.py | 4 +-
581 files changed, 24143 insertions(+), 14214 deletions(-)
copy logo.png => ambari-admin/src/main/resources/ui/admin-web/app/images/logo.png (100%)
delete mode 100644 ambari-agent/src/main/python/ambari_agent/Controller.py
delete mode 100644 ambari-agent/src/main/python/ambari_agent/Heartbeat.py
delete mode 100644 ambari-agent/src/main/python/ambari_agent/PythonReflectiveExecutor.py
delete mode 100644 ambari-agent/src/main/python/ambari_agent/StatusCommandsExecutor.py
delete mode 100644 ambari-agent/src/main/python/ambari_agent/client_example.py
delete mode 100644 ambari-agent/src/main/python/ambari_agent/test.json
delete mode 100644 ambari-agent/src/test/python/ambari_agent/TestController.py
delete mode 100644 ambari-agent/src/test/python/ambari_agent/TestHeartbeat.py
delete mode 100644 ambari-agent/src/test/python/resource_management/TestListAmbariManagedRepos.py
create mode 100644 ambari-common/src/main/python/ambari_simplejson/_speedups.c
delete mode 100755 ambari-common/src/main/python/ambari_simplejson/_speedups.so
copy ambari-common/src/main/python/{ambari_ws4py/server => ambari_simplejson/_speedups}/__init__.py (100%)
copy ambari-common/src/main/python/{ambari_ws4py/server => ambari_simplejson/_speedups/posix}/__init__.py (100%)
copy ambari-common/src/main/python/{ambari_ws4py/server => ambari_simplejson/_speedups/posix/usc2}/__init__.py (100%)
create mode 100644 ambari-common/src/main/python/ambari_simplejson/_speedups/posix/usc2/_speedups.so
copy ambari-common/src/main/python/{ambari_ws4py/server => ambari_simplejson/_speedups/posix/usc4}/__init__.py (100%)
create mode 100644 ambari-common/src/main/python/ambari_simplejson/_speedups/posix/usc4/_speedups.so
copy ambari-common/src/main/python/{ambari_ws4py/server => ambari_simplejson/_speedups/ppc}/__init__.py (100%)
create mode 100644 ambari-common/src/main/python/ambari_simplejson/_speedups/ppc/_speedups.so
copy ambari-common/src/main/python/{ambari_ws4py/server => ambari_simplejson/_speedups/win}/__init__.py (100%)
create mode 100644 ambari-common/src/main/python/ambari_simplejson/_speedups/win/_speedups.pyd
create mode 100644 ambari-common/src/main/python/ambari_simplejson/c_extension.py
create mode 100644 ambari-common/src/main/python/ambari_simplejson/compat.py
create mode 100644 ambari-common/src/main/python/ambari_simplejson/errors.py
create mode 100644 ambari-common/src/main/python/ambari_simplejson/ordered_dict.py
create mode 100644 ambari-common/src/main/python/ambari_simplejson/raw_json.py
copy {contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/package/scripts => ambari-common/src/main/python/resource_management/libraries/execution_command}/__init__.py (100%)
mode change 100755 => 100644
create mode 100644 ambari-common/src/main/python/resource_management/libraries/execution_command/cluster_settings.py
create mode 100644 ambari-common/src/main/python/resource_management/libraries/execution_command/execution_command.py
create mode 100644 ambari-common/src/main/python/resource_management/libraries/execution_command/module_configs.py
create mode 100644 ambari-common/src/main/python/resource_management/libraries/execution_command/stack_settings.py
delete mode 100644 ambari-common/src/main/python/resource_management/libraries/functions/list_ambari_managed_repos.py
rename ambari-server-spi/src/main/java/org/apache/ambari/annotations/{UpgradeCheck.java => UpgradeCheckInfo.java} (91%)
rename {ambari-server => ambari-server-spi}/src/main/java/org/apache/ambari/server/utils/VersionUtils.java (85%)
create mode 100644 ambari-server-spi/src/main/java/org/apache/ambari/spi/ClusterInformation.java
create mode 100644 ambari-server-spi/src/main/java/org/apache/ambari/spi/RepositoryVersion.java
copy ambari-server/src/main/java/org/apache/ambari/server/state/stack/PrereqCheckStatus.java => ambari-server-spi/src/main/java/org/apache/ambari/spi/stack/StackReleaseInfo.java (51%)
copy ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/UpgradeType.java => ambari-server-spi/src/main/java/org/apache/ambari/spi/stack/StackReleaseVersion.java (57%)
copy ambari-server-spi/src/main/java/org/apache/ambari/spi/upgrade/{CheckQualification.java => PriorCheckQualification.java} (57%)
rename ambari-server-spi/src/main/java/org/apache/ambari/spi/upgrade/{CheckDescription.java => UpgradeCheckDescription.java} (55%)
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/HostRepositories.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/resources/MpackResourceDefinition.java
rename ambari-server/src/main/java/org/apache/ambari/server/{controller/internal/DefaultTrimmingStrategy.java => api/services/MpackRequestSwagger.java} (63%)
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/MpacksService.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/AtlasMigrationPropertyCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/ClientRetryPropertyCheck.java
rename ambari-server/src/main/java/org/apache/ambari/server/checks/{AbstractCheckDescriptor.java => ClusterCheck.java} (52%)
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/DruidHighAvailabilityCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/HiveDynamicServiceDiscoveryCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/HiveNotRollingWarning.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/KafkaKerberosCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/MapReduce2JobHistoryStatePreservingCheck.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/OrchestrationQualification.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/PluginChecksLoadedCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/RangerAuditDbCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/RangerPasswordCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/RangerSSLConfigCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesNamenodeHighAvailabilityCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesYarnWorkPreservingCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/StormShutdownWarning.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckGroup.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistryProvider.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeTypeQualification.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/YarnRMHighAvailabilityCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheck.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/MpackRequest.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/MpackResponse.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/PrereqCheckRequest.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintExportType.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/DirectoriesTrimmingStrategy.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PasswordTrimmingStrategy.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackManager.java
rename ambari-server/src/main/java/org/apache/ambari/server/{stack/upgrade/UpgradeType.java => mpack/MpackManagerFactory.java} (53%)
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/dao/MpackDAO.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/entities/MpackEntity.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/security/encryption/AESEncryptionService.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/security/encryption/ConfigPropertiesEncryptor.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/security/encryption/EncryptionService.java
rename ambari-server/src/main/java/org/apache/ambari/server/{state/stack/PrereqCheckStatus.java => security/encryption/Encryptor.java} (57%)
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/Module.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/ModuleComponent.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/ModuleDependency.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/Mpack.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryType.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/repository/DefaultStackVersion.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/stack/PrerequisiteCheck.java
rename ambari-server/src/main/java/org/apache/ambari/server/{state/stack/PrereqCheckType.java => utils/TextEncoding.java} (79%)
create mode 100644 ambari-server/src/main/resources/mpacks-v2/README.txt
rename ambari-server/src/{main/java/org/apache/ambari/server/controller/internal/DeleteSpacesAtTheEndTrimmingStrategy.java => test/java/org/apache/ambari/server/api/resources/MpackResourceDefinitionTest.java} (64%)
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/api/services/MpacksServiceTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/AtlasMigrationPropertyCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
rename ambari-server/src/test/java/org/apache/ambari/server/checks/{AbstractCheckDescriptorTest.java => ClusterCheckTest.java} (52%)
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/DruidHighAvailabilityCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/HiveDynamicServiceDiscoveryCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/HiveNotRollingWarningTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/KafkaKerberosCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/MapReduce2JobHistoryStatePreservingCheckTest.java
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/MockCheckHelper.java
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/PluginChecksLoadedCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/RangerAuditDbCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/RangerPasswordCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/RangerSSLConfigCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeHighAvailabilityCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesYarnWorkPreservingCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/StormShutdownWarningTest.java
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/UpgradeTypeQualificationTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheckTest.java
copy ambari-server/src/{main/java/org/apache/ambari/server/AmbariRuntimeException.java => test/java/org/apache/ambari/server/controller/MpackRequestTest.java} (51%)
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/controller/MpackResponseTest.java
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MpackResourceProviderTest.java
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/mpack/MpackManagerMock.java
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/orm/dao/MpackDAOTest.java
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/orm/entities/MpackEntityTest.java
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/security/encryption/EncryptionServiceTest.java
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/state/MpackTest.java
rename ambari-server/src/test/python/{stacks/test_ambari_configuration.py => TestAmbariConfiguration.py} (61%)
create mode 100644 ambari-server/src/test/python/TestExecutionCommand.py
create mode 100644 ambari-server/src/test/python/TestExecutionCommand_command.json
create mode 100644 ambari-server/src/test/resources/README.txt
copy contrib/views/wfmanager/src/main/resources/ui/tests/unit/.gitkeep => ambari-server/src/test/resources/abc.tar.gz (100%)
create mode 100644 ambari-server/src/test/resources/mpacks-v2/README.txt
copy contrib/views/wfmanager/src/main/resources/ui/tests/unit/.gitkeep => ambari-server/src/test/resources/mpacks-v2/abc.tar.gz (100%)
create mode 100644 ambari-server/src/test/resources/mpacks-v2/upgrade-packs/upgrade-basic.xml
create mode 100644 ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_from_211.xml
create mode 100644 ambari-server/src/test/resources/upgrade-packs/upgrade-basic.xml
delete mode 100644 ambari-web/api-docs/lib/jquery-1.8.3.min.js
create mode 100644 ambari-web/api-docs/lib/jquery-1.9.0.min.js
create mode 100644 ambari-web/test/views/common/configs/config_category_container_view_test.js
create mode 100644 ambari-web/test/views/common/configs/service_config_layout_tab_compare_view_test.js
create mode 100644 ambari-web/test/views/common/configs/service_config_layout_tab_view_test.js
create mode 100644 ambari-web/test/views/common/helpers/format_null_view_test.js
create mode 100644 ambari-web/test/views/common/helpers/pluralize_view_test.js
create mode 100644 ambari-web/test/views/common/helpers/status_icon_view_test.js
create mode 100644 ambari-web/test/views/main/alerts/alert_definition/alert_definition_summary_test.js
create mode 100644 ambari-web/test/views/main/dashboard/widgets/flume_agent_live_test.js
create mode 100644 ambari-web/test/views/main/dashboard/widgets/hbase_links_test.js
create mode 100644 ambari-web/test/views/main/dashboard/widgets/hbase_master_heap_test.js
copy ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/UpdateStackGrouping.java => ambari-web/test/views/main/dashboard/widgets/namenode_heap_test.js (52%)
create mode 100644 ambari-web/test/views/main/dashboard/widgets/resource_manager_heap_test.js
create mode 100644 ambari-web/test/views/main/dashboard/widgets/supervisor_live_test.js
create mode 100644 ambari-web/test/views/wizard/step7/accounts_tab_view_test.js
create mode 100644 ambari-web/test/views/wizard/step7/credentials_tab_view_test.js
create mode 100644 ambari-web/test/views/wizard/step7/databases_tab_view_test.js
create mode 100644 ambari-web/test/views/wizard/step7/directories_tab_view_test.js
[ambari] 01/03: AMBARI-24729. Ambari Server stops with Java 9 due
to Guice error (#2418)
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch branch-feature-jdk11
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit f6ca8bc9734eb4d60a1cccaabb3ec57ebd7ee9ee
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Fri Oct 5 17:39:28 2018 +0200
AMBARI-24729. Ambari Server stops with Java 9 due to Guice error (#2418)
---
ambari-agent/pom.xml | 1 +
ambari-project/pom.xml | 6 +++---
ambari-server/pom.xml | 2 +-
.../apache/ambari/server/orm/entities/ClusterConfigEntity.java | 2 +-
.../server/orm/entities/HostComponentDesiredStateEntity.java | 3 ++-
.../ambari/server/orm/entities/HostComponentStateEntity.java | 4 ++--
.../apache/ambari/server/orm/entities/UpgradeHistoryEntity.java | 8 +++++---
.../server/serveraction/upgrades/FinalizeUpgradeAction.java | 2 +-
.../ambari/server/stack/upgrade/ConfigurationCondition.java | 4 ++--
.../java/org/apache/ambari/server/stack/upgrade/Grouping.java | 4 ++--
.../org/apache/ambari/server/stack/upgrade/HostOrderItem.java | 4 ++--
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java | 2 +-
pom.xml | 2 +-
13 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index da0f3b1..8d08587 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -88,6 +88,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <version>20.0</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 3c57f54..b20140a 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -36,7 +36,7 @@
<swagger.version>1.5.19</swagger.version>
<swagger.maven.plugin.version>3.1.5</swagger.maven.plugin.version>
<slf4j.version>1.7.20</slf4j.version>
- <guice.version>4.1.0</guice.version>
+ <guice.version>4.2.1</guice.version>
<spring.version>4.3.18.RELEASE</spring.version>
<spring.security.version>4.2.7.RELEASE</spring.security.version>
<fasterxml.jackson.version>2.9.5</fasterxml.jackson.version>
@@ -230,7 +230,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>eclipselink</artifactId>
+ <artifactId>org.eclipse.persistence.jpa</artifactId>
<version>${eclipselink.version}</version>
</dependency>
<dependency>
@@ -241,7 +241,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>26.0-jre</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 53ca716..bc7cdcf 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1238,7 +1238,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>eclipselink</artifactId>
+ <artifactId>org.eclipse.persistence.jpa</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
index 287ee89..f6de06d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
@@ -303,7 +303,7 @@ public class ClusterConfigEntity {
*/
@Override
public String toString() {
- return com.google.common.base.Objects.toStringHelper(this)
+ return com.google.common.base.MoreObjects.toStringHelper(this)
.add("clusterId", clusterId)
.add("type", type)
.add("version", version)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentDesiredStateEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentDesiredStateEntity.java
index 3a2506d..eba273f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentDesiredStateEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentDesiredStateEntity.java
@@ -41,6 +41,7 @@ import org.apache.ambari.server.state.HostComponentAdminState;
import org.apache.ambari.server.state.MaintenanceState;
import org.apache.ambari.server.state.State;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
@@ -278,7 +279,7 @@ public class HostComponentDesiredStateEntity {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).add("serviceName", serviceName).add("componentName",
+ return MoreObjects.toStringHelper(this).add("serviceName", serviceName).add("componentName",
componentName).add("hostId", hostId).add("desiredState", desiredState).toString();
}
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentStateEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentStateEntity.java
index 0d295a4..dacaa55 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentStateEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentStateEntity.java
@@ -36,7 +36,7 @@ import javax.persistence.TableGenerator;
import org.apache.ambari.server.state.State;
import org.apache.ambari.server.state.UpgradeState;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
@Entity
@Table(name = "hostcomponentstate")
@@ -260,7 +260,7 @@ public class HostComponentStateEntity {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).add("serviceName", serviceName).add("componentName",
+ return MoreObjects.toStringHelper(this).add("serviceName", serviceName).add("componentName",
componentName).add("hostId", hostId).add("state", currentState).toString();
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java
index 0f7ac72..5fe2ef0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java
@@ -17,6 +17,8 @@
*/
package org.apache.ambari.server.orm.entities;
+import java.util.Objects;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -32,7 +34,7 @@ import javax.persistence.UniqueConstraint;
import org.apache.commons.lang.builder.EqualsBuilder;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
/**
* The {@link UpgradeHistoryEntity} represents the version history of components
@@ -214,7 +216,7 @@ public class UpgradeHistoryEntity {
*/
@Override
public int hashCode() {
- return Objects.hashCode(id, upgradeId, serviceName, componentName);
+ return Objects.hash(id, upgradeId, serviceName, componentName);
}
/**
@@ -222,7 +224,7 @@ public class UpgradeHistoryEntity {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("upgradeId", upgradeId)
.add("serviceName", serviceName)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index 67c0be9..46c1709 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -552,7 +552,7 @@ public class FinalizeUpgradeAction extends AbstractUpgradeServerAction {
*/
@Override
public String toString() {
- return com.google.common.base.Objects.toStringHelper(this)
+ return com.google.common.base.MoreObjects.toStringHelper(this)
.add("host", hostName)
.add("component", componentName)
.add("current", currentVersion)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ConfigurationCondition.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ConfigurationCondition.java
index 4e59100..fafd5e7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ConfigurationCondition.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ConfigurationCondition.java
@@ -31,7 +31,7 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Config;
import org.apache.commons.lang.StringUtils;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
/**
* The {@link ConfigurationCondition} class is used to represent a condition on
@@ -119,7 +119,7 @@ public final class ConfigurationCondition extends Condition {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).add("type", type).add("property", property).add("value",
+ return MoreObjects.toStringHelper(this).add("type", type).add("property", property).add("value",
value).add("comparison", comparisonType).omitNullValues().toString();
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/Grouping.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/Grouping.java
index 19e826e..aab70a3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/Grouping.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/Grouping.java
@@ -42,7 +42,7 @@ import org.apache.ambari.server.stack.upgrade.orchestrate.UpgradeContext;
import org.apache.ambari.server.utils.SetUtils;
import org.apache.commons.lang.StringUtils;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
/**
*
@@ -424,6 +424,6 @@ public class Grouping {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).add("name", name).toString();
+ return MoreObjects.toStringHelper(this).add("name", name).toString();
}
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/HostOrderItem.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/HostOrderItem.java
index 8fe361f..87557e7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/HostOrderItem.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/HostOrderItem.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.ambari.spi.upgrade.UpgradeType;
import org.apache.commons.lang.StringUtils;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
/**
* The {@link HostOrderItem} class represents the orchestration order of hosts
@@ -96,7 +96,7 @@ public class HostOrderItem {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).add("type", m_type).add("items",
+ return MoreObjects.toStringHelper(this).add("type", m_type).add("items",
StringUtils.join(m_actionItems, ", ")).omitNullValues().toString();
}
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
index 43a3d5f..63e0e74 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
@@ -1662,7 +1662,7 @@ public class UpgradeCatalog270 extends AbstractUpgradeCatalog {
final HostAndPort hostAndPort = HostAndPort.fromString(propertyValue);
AmbariServerConfigurationKey keyToBesaved = AmbariServerConfigurationKey.SERVER_HOST == key ? AmbariServerConfigurationKey.SERVER_HOST
: AmbariServerConfigurationKey.SECONDARY_SERVER_HOST;
- populateConfigurationToBeMoved(propertiesToBeMoved, oldPropertyName, keyToBesaved, hostAndPort.getHostText());
+ populateConfigurationToBeMoved(propertiesToBeMoved, oldPropertyName, keyToBesaved, hostAndPort.getHost());
keyToBesaved = AmbariServerConfigurationKey.SERVER_HOST == key ? AmbariServerConfigurationKey.SERVER_PORT : AmbariServerConfigurationKey.SECONDARY_SERVER_PORT;
populateConfigurationToBeMoved(propertiesToBeMoved, oldPropertyName, keyToBesaved, String.valueOf(hostAndPort.getPort()));
diff --git a/pom.xml b/pom.xml
index a43f7c5..a96e9bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
<distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
<assemblyPhase>package</assemblyPhase> <!-- use -DassemblyPhase=none to skip building tarball, useful when you want purely compile jar -->
- <eclipselink.version>2.6.2</eclipselink.version>
+ <eclipselink.version>2.7.3</eclipselink.version>
</properties>
<pluginRepositories>
<pluginRepository>
[ambari] 02/03: AMBARI-24730. Support Java 9+ in Ambari Server
setup (#2427)
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch branch-feature-jdk11
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 62cdb4a7a591872053aa6702325c7b0c0b4c55d1
Author: Gabor Boros <63...@users.noreply.github.com>
AuthorDate: Sat Oct 6 07:36:54 2018 +0200
AMBARI-24730. Support Java 9+ in Ambari Server setup (#2427)
---
.../src/main/python/ambari_server/serverSetup.py | 18 +++++++++++++++---
ambari-server/src/test/python/TestAmbariServer.py | 4 ++--
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py b/ambari-server/src/main/python/ambari_server/serverSetup.py
index a32ac38..b91d8eb 100644
--- a/ambari-server/src/main/python/ambari_server/serverSetup.py
+++ b/ambari-server/src/main/python/ambari_server/serverSetup.py
@@ -80,7 +80,7 @@ UNTAR_JDK_ARCHIVE = "tar --no-same-owner -xvf {0}"
JDK_PROMPT = "[{0}] {1}\n"
JDK_VALID_CHOICES = "^[{0}{1:d}]$"
-JDK_VERSION_CHECK_CMD = """{0} -version 2>&1 | grep -i version | sed 's/.*version ".*\.\(.*\)\..*"/\\1/; 1q' 2>&1"""
+JDK_VERSION_CHECK_CMD = """{0} -version 2>&1 | grep -i version 2>&1"""
def get_supported_jdbc_drivers():
factory = DBMSConfigFactory()
@@ -1272,6 +1272,17 @@ def setup_jce_policy(args):
print 'NOTE: Restart Ambari Server to apply changes' + \
' ("ambari-server restart|stop|start")'
+def get_java_major_version(cmd_out):
+ version_short = re.split("[java|openjdk|.*] version", cmd_out)[1].split(" ")[1][1:-1]
+ if re.match("^1\.[0-9].*", version_short): # 1.8.0_112
+ return version_short.split(".")[1]
+ elif re.match("^[1-9][0-9]*\.[0-9].*", version_short): # 10.0.2
+ return version_short.split(".")[0]
+ elif re.match("^[1-9][0-9]*$", version_short): # 11
+ return version_short
+ elif re.match("^[1-9][0-9]*-.*$", version_short): # 12-ea
+ return version_short.split("-")[0]
+
def check_ambari_java_version_is_valid(java_home, java_bin, min_version, properties):
"""
Check that ambari uses the proper (minimum) JDK with a shell command.
@@ -1292,11 +1303,12 @@ def check_ambari_java_version_is_valid(java_home, java_bin, min_version, propert
err = "Checking JDK version command returned with exit code %s" % process.returncode
raise FatalException(process.returncode, err)
else:
- actual_jdk_version = int(out)
+ java_major_version = get_java_major_version(out)
+ actual_jdk_version = int(java_major_version)
print 'JDK version found: {0}'.format(actual_jdk_version)
if actual_jdk_version < min_version:
print 'Minimum JDK version is {0} for Ambari. Setup JDK again only for Ambari Server.'.format(min_version)
- properties.process_pair(STACK_JAVA_VERSION, out)
+ properties.process_pair(STACK_JAVA_VERSION, java_major_version)
result = False
else:
print 'Minimum JDK version is {0} for Ambari. Skipping to setup different JDK for Ambari Server.'.format(min_version)
diff --git a/ambari-server/src/test/python/TestAmbariServer.py b/ambari-server/src/test/python/TestAmbariServer.py
index 14f3387..0402494 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py
@@ -3150,7 +3150,7 @@ class TestAmbariServer(TestCase):
# case 1: jdk7 is picked for stacks
properties = Properties()
p = MagicMock()
- p.communicate.return_value = ('7', None)
+ p.communicate.return_value = ('java version "1.7.0_80"', None)
p.returncode = 0
popenMock.return_value = p
result = check_ambari_java_version_is_valid('/usr/jdk64/jdk_1.7.0/', 'java', 8, properties)
@@ -3159,7 +3159,7 @@ class TestAmbariServer(TestCase):
# case 2: jdk8 is picked for stacks
properties = Properties()
- p.communicate.return_value = ('8', None)
+ p.communicate.return_value = ('java version "1.8.0_112"', None)
p.returncode = 0
result = check_ambari_java_version_is_valid('/usr/jdk64/jdk_1.8.0/', 'java', 8, properties)
self.assertFalse(properties.get_property(STACK_JAVA_VERSION))
[ambari] 03/03: AMBARI-24752. Upgrade ambari-utility,
ambari-server-spi deps for JDK11 (#2434)
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch branch-feature-jdk11
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit d4d112b2efeda1614d8bacb79bf1100a30b3ae65
Author: Gabor Boros <63...@users.noreply.github.com>
AuthorDate: Wed Oct 10 20:48:49 2018 +0200
AMBARI-24752. Upgrade ambari-utility, ambari-server-spi deps for JDK11 (#2434)
---
ambari-agent/pom.xml | 2 +-
ambari-project/pom.xml | 5 +++++
ambari-server-spi/pom.xml | 4 ++++
ambari-utility/pom.xml | 4 ++++
4 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 8d08587..52b532b 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -411,7 +411,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
+ <version>3.2.0</version>
<executions>
<execution>
<id>shade-zkmigrator</id>
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index b20140a..88e849f 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -376,6 +376,11 @@
<version>3.1.0</version>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>1.19</version>
diff --git a/ambari-server-spi/pom.xml b/ambari-server-spi/pom.xml
index 9c177f0..34f1335 100644
--- a/ambari-server-spi/pom.xml
+++ b/ambari-server-spi/pom.xml
@@ -184,5 +184,9 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/ambari-utility/pom.xml b/ambari-utility/pom.xml
index 35b5bd9..bb86e5e 100644
--- a/ambari-utility/pom.xml
+++ b/ambari-utility/pom.xml
@@ -52,6 +52,10 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<scope>provided</scope>