You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2018/02/22 20:15:58 UTC

[ambari] branch branch-feature-AMBARI-14714 updated (133febc -> 6912c65)

This is an automated email from the ASF dual-hosted git repository.

jluniya pushed a change to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git.


    from 133febc  [AMBARI-23053] Rename NON-ROLLING to EXPRESS
     add e97eb29  AMBARI-22878: Update Service Group API to take list of mpack name associated with the service group
     add dcb871b  AMBARI-22878: Update Service Group API to take list of mpack name associated with the service group
     add 158cd85  Merge branch 'AMBARI-22878-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-22878-branch-feature-AMBARI-14714
     add da41ca0  Merge branch 'AMBARI-22878-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-22878-branch-feature-AMBARI-14714
     add decbf54  Merge branch 'AMBARI-22878-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-22878-branch-feature-AMBARI-14714
     add a2340a6  Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' into AMBARI-22878-branch-feature-AMBARI-14714
     add 68c1f04  Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' into AMBARI-22878-branch-feature-AMBARI-14714
     add 04345f8  Merge branch 'AMBARI-22878-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-22878-branch-feature-AMBARI-14714
     add a331735  Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' into AMBARI-22878-branch-feature-AMBARI-14714
     add 90f354f  Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' into AMBARI-22878-branch-feature-AMBARI-14714
     add f74af11  Merge branch 'AMBARI-22878-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-22878-branch-feature-AMBARI-14714
     add 3de0e93  Merge branch 'AMBARI-22878-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-22878-branch-feature-AMBARI-14714
     add fb3e005  Merge branch 'AMBARI-22878-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-22878-branch-feature-AMBARI-14714
     add afc6a3b  Merge branch 'AMBARI-22878-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-22878-branch-feature-AMBARI-14714
     add cfe5295  Merge branch 'AMBARI-22878-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-22878-branch-feature-AMBARI-14714
     add 7bcd6fe  Merge branch 'AMBARI-22878-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-22878-branch-feature-AMBARI-14714
     add d370602  Merge branch 'AMBARI-22878-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-22878-branch-feature-AMBARI-14714
     new 59998a8  Merge branch 'AMBARI-22878-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into scottduan-AMBARI-22878-branch-feature-AMBARI-14714
     new 6912c65  Merge branch 'scottduan-AMBARI-22878-branch-feature-AMBARI-14714' into branch-feature-AMBARI-14714

The 2 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:
 .../server/controller/ServiceGroupRequest.java     |   27 +-
 .../server/controller/ServiceGroupResponse.java    |   40 +-
 .../AbstractAuthorizedResourceProvider.java        |    2 +-
 .../internal/ServiceGroupResourceProvider.java     |   36 +-
 .../server/orm/entities/ServiceGroupEntity.java    |   24 +-
 .../org/apache/ambari/server/state/Cluster.java    |    4 +-
 .../apache/ambari/server/state/ServiceGroup.java   |    2 +
 .../ambari/server/state/ServiceGroupFactory.java   |    1 +
 .../ambari/server/state/ServiceGroupImpl.java      |   34 +-
 .../ambari/server/state/cluster/ClusterImpl.java   |   12 +-
 .../ambari/server/topology/AmbariContext.java      |    2 +-
 .../src/main/resources/Ambari-DDL-Derby-CREATE.sql |    4 +-
 .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql |    4 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql    |    4 +-
 .../main/resources/Ambari-DDL-Postgres-CREATE.sql  |    4 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql    |    4 +-
 .../main/resources/Ambari-DDL-SQLServer-CREATE.sql |    3 +-
 .../actionmanager/ExecutionCommandWrapperTest.java |    2 +-
 .../TestActionSchedulerThreading.java              |    2 +-
 .../server/agent/HeartbeatProcessorTest.java       |    2 +-
 .../ambari/server/agent/TestHeartbeatHandler.java  |    2 +-
 .../ambari/server/agent/TestHeartbeatMonitor.java  |   10 +-
 .../server/api/services/AmbariMetaInfoTest.java    |    8 +-
 .../configuration/RecoveryConfigHelperTest.java    |   12 +-
 .../AmbariCustomCommandExecutionHelperTest.java    |    2 +-
 .../controller/AmbariManagementControllerTest.java |   40 +-
 .../ServiceDependencyResourceProviderTest.java     |    4 +-
 ...ServiceGroupDependencyResourceProviderTest.java |    4 +-
 .../internal/ServiceGroupResourceProviderTest.java |  102 +-
 .../internal/StackDefinedPropertyProviderTest.java |    2 +-
 .../internal/UpgradeResourceProviderTest.java      | 2085 ++++++++++++++
 .../UpgradeSummaryResourceProviderTest.java        |    2 +-
 .../VersionDefinitionResourceProviderTest.java     |    2 +-
 .../state/GeneralServiceCalculatedStateTest.java   |    2 +-
 .../apache/ambari/server/events/EventsTest.java    |    2 +-
 .../upgrade/HostVersionOutOfSyncListenerTest.java  |    4 +-
 .../apache/ambari/server/orm/OrmTestHelper.java    |    3 +-
 .../server/orm/dao/AlertDispatchDAOTest.java       |    2 +-
 .../ambari/server/orm/dao/AlertsDAOTest.java       |    2 +-
 .../upgrades/ComponentVersionCheckActionTest.java  |    4 +-
 .../serveraction/upgrades/ConfigureActionTest.java | 1854 +++++++++++++
 .../upgrades/CreateAndConfigureActionTest.java     |    2 +-
 .../serveraction/upgrades/UpgradeActionTest.java   |  696 +++++
 .../ambari/server/state/ConfigHelperTest.java      |    2 +-
 .../ambari/server/state/ServiceComponentTest.java  |    2 +-
 .../apache/ambari/server/state/ServiceTest.java    |   10 +-
 .../ambari/server/state/UpgradeHelperTest.java     | 2911 ++++++++++++++++++++
 .../state/alerts/AlertEventPublisherTest.java      |    2 +-
 .../server/state/alerts/InitialAlertEventTest.java |    2 +-
 .../server/state/cluster/ClusterDeadlockTest.java  |    2 +-
 .../server/state/cluster/ClusterImplTest.java      |    2 +-
 .../ambari/server/state/cluster/ClusterTest.java   |    6 +-
 .../server/state/cluster/ClustersDeadlockTest.java |    2 +-
 .../ambari/server/state/cluster/ClustersTest.java  |    2 +-
 .../ConcurrentServiceConfigVersionTest.java        |    2 +-
 ...ceComponentHostConcurrentWriteDeadlockTest.java |    2 +-
 .../svccomphost/ServiceComponentHostTest.java      |    8 +-
 .../server/testing/DBInconsistencyTests.java       |    2 +-
 .../ambari/server/topology/AmbariContextTest.java  |    2 +-
 59 files changed, 7882 insertions(+), 136 deletions(-)
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java

-- 
To stop receiving notification emails like this one, please contact
jluniya@apache.org.

[ambari] 01/02: Merge branch 'AMBARI-22878-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into scottduan-AMBARI-22878-branch-feature-AMBARI-14714

Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jluniya pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 59998a8897a1ebd73a162e9770a7ab4cfee892f4
Merge: 133febc d370602
Author: Jayush Luniya <jl...@hortonworks.com>
AuthorDate: Thu Feb 22 12:14:18 2018 -0800

    Merge branch 'AMBARI-22878-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into scottduan-AMBARI-22878-branch-feature-AMBARI-14714

 .../server/controller/ServiceGroupRequest.java     |   27 +-
 .../server/controller/ServiceGroupResponse.java    |   40 +-
 .../AbstractAuthorizedResourceProvider.java        |    2 +-
 .../internal/ServiceGroupResourceProvider.java     |   36 +-
 .../server/orm/entities/ServiceGroupEntity.java    |   24 +-
 .../org/apache/ambari/server/state/Cluster.java    |    4 +-
 .../apache/ambari/server/state/ServiceGroup.java   |    2 +
 .../ambari/server/state/ServiceGroupFactory.java   |    1 +
 .../ambari/server/state/ServiceGroupImpl.java      |   34 +-
 .../ambari/server/state/cluster/ClusterImpl.java   |   12 +-
 .../ambari/server/topology/AmbariContext.java      |    2 +-
 .../src/main/resources/Ambari-DDL-Derby-CREATE.sql |    4 +-
 .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql |    4 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql    |    4 +-
 .../main/resources/Ambari-DDL-Postgres-CREATE.sql  |    4 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql    |    4 +-
 .../main/resources/Ambari-DDL-SQLServer-CREATE.sql |    3 +-
 .../actionmanager/ExecutionCommandWrapperTest.java |    2 +-
 .../TestActionSchedulerThreading.java              |    2 +-
 .../server/agent/HeartbeatProcessorTest.java       |    2 +-
 .../ambari/server/agent/TestHeartbeatHandler.java  |    2 +-
 .../ambari/server/agent/TestHeartbeatMonitor.java  |   10 +-
 .../server/api/services/AmbariMetaInfoTest.java    |    8 +-
 .../configuration/RecoveryConfigHelperTest.java    |   12 +-
 .../AmbariCustomCommandExecutionHelperTest.java    |    2 +-
 .../controller/AmbariManagementControllerTest.java |   40 +-
 .../ServiceDependencyResourceProviderTest.java     |    4 +-
 ...ServiceGroupDependencyResourceProviderTest.java |    4 +-
 .../internal/ServiceGroupResourceProviderTest.java |  102 +-
 .../internal/StackDefinedPropertyProviderTest.java |    2 +-
 .../internal/UpgradeResourceProviderTest.java      | 2085 ++++++++++++++
 .../UpgradeSummaryResourceProviderTest.java        |    2 +-
 .../VersionDefinitionResourceProviderTest.java     |    2 +-
 .../state/GeneralServiceCalculatedStateTest.java   |    2 +-
 .../apache/ambari/server/events/EventsTest.java    |    2 +-
 .../upgrade/HostVersionOutOfSyncListenerTest.java  |    4 +-
 .../apache/ambari/server/orm/OrmTestHelper.java    |    3 +-
 .../server/orm/dao/AlertDispatchDAOTest.java       |    2 +-
 .../ambari/server/orm/dao/AlertsDAOTest.java       |    2 +-
 .../upgrades/ComponentVersionCheckActionTest.java  |    4 +-
 .../serveraction/upgrades/ConfigureActionTest.java | 1854 +++++++++++++
 .../upgrades/CreateAndConfigureActionTest.java     |    2 +-
 .../serveraction/upgrades/UpgradeActionTest.java   |  696 +++++
 .../ambari/server/state/ConfigHelperTest.java      |    2 +-
 .../ambari/server/state/ServiceComponentTest.java  |    2 +-
 .../apache/ambari/server/state/ServiceTest.java    |   10 +-
 .../ambari/server/state/UpgradeHelperTest.java     | 2911 ++++++++++++++++++++
 .../state/alerts/AlertEventPublisherTest.java      |    2 +-
 .../server/state/alerts/InitialAlertEventTest.java |    2 +-
 .../server/state/cluster/ClusterDeadlockTest.java  |    2 +-
 .../server/state/cluster/ClusterImplTest.java      |    2 +-
 .../ambari/server/state/cluster/ClusterTest.java   |    6 +-
 .../server/state/cluster/ClustersDeadlockTest.java |    2 +-
 .../ambari/server/state/cluster/ClustersTest.java  |    2 +-
 .../ConcurrentServiceConfigVersionTest.java        |    2 +-
 ...ceComponentHostConcurrentWriteDeadlockTest.java |    2 +-
 .../svccomphost/ServiceComponentHostTest.java      |    8 +-
 .../server/testing/DBInconsistencyTests.java       |    2 +-
 .../ambari/server/topology/AmbariContextTest.java  |    2 +-
 59 files changed, 7882 insertions(+), 136 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
jluniya@apache.org.

[ambari] 02/02: Merge branch 'scottduan-AMBARI-22878-branch-feature-AMBARI-14714' into branch-feature-AMBARI-14714

Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jluniya pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 6912c6534e6e503c976545aca4bd78ed9d3ee129
Merge: 133febc 59998a8
Author: Jayush Luniya <jl...@hortonworks.com>
AuthorDate: Thu Feb 22 12:15:37 2018 -0800

    Merge branch 'scottduan-AMBARI-22878-branch-feature-AMBARI-14714' into branch-feature-AMBARI-14714

 .../server/controller/ServiceGroupRequest.java     |   27 +-
 .../server/controller/ServiceGroupResponse.java    |   40 +-
 .../AbstractAuthorizedResourceProvider.java        |    2 +-
 .../internal/ServiceGroupResourceProvider.java     |   36 +-
 .../server/orm/entities/ServiceGroupEntity.java    |   24 +-
 .../org/apache/ambari/server/state/Cluster.java    |    4 +-
 .../apache/ambari/server/state/ServiceGroup.java   |    2 +
 .../ambari/server/state/ServiceGroupFactory.java   |    1 +
 .../ambari/server/state/ServiceGroupImpl.java      |   34 +-
 .../ambari/server/state/cluster/ClusterImpl.java   |   12 +-
 .../ambari/server/topology/AmbariContext.java      |    2 +-
 .../src/main/resources/Ambari-DDL-Derby-CREATE.sql |    4 +-
 .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql |    4 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql    |    4 +-
 .../main/resources/Ambari-DDL-Postgres-CREATE.sql  |    4 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql    |    4 +-
 .../main/resources/Ambari-DDL-SQLServer-CREATE.sql |    3 +-
 .../actionmanager/ExecutionCommandWrapperTest.java |    2 +-
 .../TestActionSchedulerThreading.java              |    2 +-
 .../server/agent/HeartbeatProcessorTest.java       |    2 +-
 .../ambari/server/agent/TestHeartbeatHandler.java  |    2 +-
 .../ambari/server/agent/TestHeartbeatMonitor.java  |   10 +-
 .../server/api/services/AmbariMetaInfoTest.java    |    8 +-
 .../configuration/RecoveryConfigHelperTest.java    |   12 +-
 .../AmbariCustomCommandExecutionHelperTest.java    |    2 +-
 .../controller/AmbariManagementControllerTest.java |   40 +-
 .../ServiceDependencyResourceProviderTest.java     |    4 +-
 ...ServiceGroupDependencyResourceProviderTest.java |    4 +-
 .../internal/ServiceGroupResourceProviderTest.java |  102 +-
 .../internal/StackDefinedPropertyProviderTest.java |    2 +-
 .../internal/UpgradeResourceProviderTest.java      | 2085 ++++++++++++++
 .../UpgradeSummaryResourceProviderTest.java        |    2 +-
 .../VersionDefinitionResourceProviderTest.java     |    2 +-
 .../state/GeneralServiceCalculatedStateTest.java   |    2 +-
 .../apache/ambari/server/events/EventsTest.java    |    2 +-
 .../upgrade/HostVersionOutOfSyncListenerTest.java  |    4 +-
 .../apache/ambari/server/orm/OrmTestHelper.java    |    3 +-
 .../server/orm/dao/AlertDispatchDAOTest.java       |    2 +-
 .../ambari/server/orm/dao/AlertsDAOTest.java       |    2 +-
 .../upgrades/ComponentVersionCheckActionTest.java  |    4 +-
 .../serveraction/upgrades/ConfigureActionTest.java | 1854 +++++++++++++
 .../upgrades/CreateAndConfigureActionTest.java     |    2 +-
 .../serveraction/upgrades/UpgradeActionTest.java   |  696 +++++
 .../ambari/server/state/ConfigHelperTest.java      |    2 +-
 .../ambari/server/state/ServiceComponentTest.java  |    2 +-
 .../apache/ambari/server/state/ServiceTest.java    |   10 +-
 .../ambari/server/state/UpgradeHelperTest.java     | 2911 ++++++++++++++++++++
 .../state/alerts/AlertEventPublisherTest.java      |    2 +-
 .../server/state/alerts/InitialAlertEventTest.java |    2 +-
 .../server/state/cluster/ClusterDeadlockTest.java  |    2 +-
 .../server/state/cluster/ClusterImplTest.java      |    2 +-
 .../ambari/server/state/cluster/ClusterTest.java   |    6 +-
 .../server/state/cluster/ClustersDeadlockTest.java |    2 +-
 .../ambari/server/state/cluster/ClustersTest.java  |    2 +-
 .../ConcurrentServiceConfigVersionTest.java        |    2 +-
 ...ceComponentHostConcurrentWriteDeadlockTest.java |    2 +-
 .../svccomphost/ServiceComponentHostTest.java      |    8 +-
 .../server/testing/DBInconsistencyTests.java       |    2 +-
 .../ambari/server/topology/AmbariContextTest.java  |    2 +-
 59 files changed, 7882 insertions(+), 136 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
jluniya@apache.org.