ambari-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Alejandro Fernandez" <afernan...@hortonworks.com>
Subject Re: Review Request 39177: Stop-and-Start Upgrade: Merge feature branch to 2.1 (so it makes 2.1.3) and trunk.
Date Sun, 11 Oct 2015 19:27:31 GMT

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/39177/#review102191
-----------------------------------------------------------

Ship it!


Ship it, send an announcement that trunk may be broken for the next 1-2 days, and fix the
issues right after.


ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java (line
1001)
<https://reviews.apache.org/r/39177/#comment159755>

    Is >>>> intended here?



ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml (line 502)
<https://reviews.apache.org/r/39177/#comment159756>

    In branch-2.1, it also tried to delete yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity



ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml (line 617)
<https://reviews.apache.org/r/39177/#comment159757>

    In branch-2.1, templeton.libjars is replaced with
    /usr/hdp/${hdp.version}/zookeeper,/usr/hdp/${hdp.version}/hive/lib/hive-common.jar



ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml (line 730)
<https://reviews.apache.org/r/39177/#comment159758>

    In branch-2.1,  nimbus.monitor.freq.secs is set to 120


There are a couple of minor changes to the config-upgrade.xml file that you can do after merging.
In the feature branch, I started working on UpgradeCatalog212 because it did not exist at
the time.
Now, there's already UpgradeCatalog212 and UpgradeCatalog213, so my changes need to be added
to UpgradeCatalog213 and the test for it.

I'm ok with pushing those on another commit in order to not delay the merge.

- Alejandro Fernandez


On Oct. 9, 2015, 5 p.m., Dmytro Grinenko wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/39177/
> -----------------------------------------------------------
> 
> (Updated Oct. 9, 2015, 5 p.m.)
> 
> 
> Review request for Ambari, Alejandro Fernandez, Dmitro Lisnichenko, Jonathan Hurley,
and Nate Cole.
> 
> 
> Bugs: AMBARI-13378
>     https://issues.apache.org/jira/browse/AMBARI-13378
> 
> 
> Repository: ambari
> 
> 
> Description
> -------
> 
> Merge feature branch branch-dev-stop-all-upgrade
> to branch-2.1 and trunk
> 
> 
> Diffs
> -----
> 
>   ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
561b3f4 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
2f0bc94 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/ClientRetryPropertyCheck.java
52fca40 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/ConfigurationMergeCheck.java
b81ca11 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/HiveDynamicServiceDiscoveryCheck.java
4ea5484 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheck.java
c387a4b 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/HostsHeartbeatCheck.java
a8600c4 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheck.java
ef93337 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheck.java
eaa0096 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/MapReduce2JobHistoryStatePreservingCheck.java
5f02c4f 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java
493042f 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesMaintenanceModeCheck.java
5108afd 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheck.java
be5d11a 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesNamenodeHighAvailabilityCheck.java
d92f12d 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheck.java
51369c9 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheck.java
68a7103 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesUpCheck.java 70b8884

>   ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesYarnWorkPreservingCheck.java
a0b2b59 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheck.java 9fa8916

>   ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java
8be572c 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/YarnRMHighAvailabilityCheck.java
bf25f9f 
>   ambari-server/src/main/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheck.java
eca0967 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
d80b497 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
de0ae28 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/PrereqCheckRequest.java
f8c5316 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
4868ca7 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java
6344aa2 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
ce58e1e 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
06291dd 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
e9ac429 
>   ambari-server/src/main/java/org/apache/ambari/server/metadata/ActionMetadata.java e821827

>   ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterVersionDAO.java
d3326b1 
>   ambari-server/src/main/java/org/apache/ambari/server/orm/dao/CrudDAO.java 4382f59 
>   ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostVersionDAO.java a2ff211

>   ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
4ac1314 
>   ambari-server/src/main/java/org/apache/ambari/server/orm/dao/UpgradeDAO.java bc0652c

>   ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
dafd4b2 
>   ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
802ea03 
>   ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java
c717582 
>   ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredStackAction.java
PRE-CREATION 
>   ambari-server/src/main/java/org/apache/ambari/server/stack/ModuleFileUnmarshaller.java
aa8e17b 
>   ambari-server/src/main/java/org/apache/ambari/server/stack/StackDefinitionDirectory.java
8f81b5a 
>   ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java b849e88

>   ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java 4fe7ed7

>   ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java 8e9d092 
>   ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java b10db9e

>   ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java 75c04da

>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/ConfigUpgradePack.java
PRE-CREATION 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java 5b65732

>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
eff1b13 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigUpgradeChangeDefinition.java
PRE-CREATION 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java
8a9e2e5 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java
a0afdfb 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Grouping.java
cd27722 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ManualTask.java
2b1ba56 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java
2e17cf4 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RestartGrouping.java
PRE-CREATION 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RestartTask.java
1b69b5b 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerActionTask.java
74144b7 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java
97981ae 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java
6061895 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckTask.java
5893edf 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StageWrapper.java
eac5ce5 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilder.java
57cd41f 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StartGrouping.java
PRE-CREATION 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StartTask.java
PRE-CREATION 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StopGrouping.java
PRE-CREATION 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StopTask.java
PRE-CREATION 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Task.java
6416b57 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/UpdateStackGrouping.java
PRE-CREATION 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/UpgradeFunction.java
PRE-CREATION 
>   ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/UpgradeType.java
PRE-CREATION 
>   ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
71d0581 
>   ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql 1511385 
>   ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql a3c1625 
>   ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql 2636eef 
>   ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql d515fa6 
>   ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql 1f95f0f 
>   ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_upgrade.py
610f527 
>   ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
1dfb280 
>   ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
PRE-CREATION 
>   ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml PRE-CREATION

>   ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
PRE-CREATION 
>   ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml 5920b72 
>   ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml 8ca800e 
>   ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml PRE-CREATION

>   ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml 65ae2ed 
>   ambari-server/src/test/java/org/apache/ambari/server/checks/ConfigurationMergeCheckTest.java
44bf164 
>   ambari-server/src/test/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheckTest.java
961c28d 
>   ambari-server/src/test/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheckTest.java
b54b633 
>   ambari-server/src/test/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheckTest.java
5d32f4d 
>   ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java
fea82f3 
>   ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeHighAvailabilityCheckTest.java
947121a 
>   ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java
07d17d8 
>   ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java
d732302 
>   ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesYarnWorkPreservingCheckTest.java
135c9c9 
>   ambari-server/src/test/java/org/apache/ambari/server/checks/UpgradeCheckStackVersionTest.java
8d8b08f 
>   ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
824a9d1 
>   ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java
ea6e56e 
>   ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java
41d0175 
>   ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
3cefab1 
>   ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
61f65fa 
>   ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java b36480f

>   ambari-server/src/test/java/org/apache/ambari/server/orm/dao/CrudDAOTest.java 8777d33

>   ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java
adda018 
>   ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java 0b12e97

>   ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java
93e29b5 
>   ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java
91a2788 
>   ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java 7077f4c

>   ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java
PRE-CREATION 
>   ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
9ae78c4 
>   ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilderTest.java
e2a3995 
>   ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py 4ca74a8 
>   ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/config-upgrade.xml PRE-CREATION

>   ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_bucket_test.xml
92e8c6a 
>   ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml 89a9e4f

>   ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml b7a62f5

>   ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_checks.xml
7590c5b 
>   ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml
PRE-CREATION 
>   ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml
02b0ebf 
>   ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/config-upgrade.xml PRE-CREATION

>   ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test.xml 5271ae6

>   ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml
892b9b4 
> 
> Diff: https://reviews.apache.org/r/39177/diff/
> 
> 
> Testing
> -------
> 
> mvn clean test
> 
> 
> Thanks,
> 
> Dmytro Grinenko
> 
>


Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message