----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/43425/#review119977 -----------------------------------------------------------
ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java (lines 932 - 937) <https://reviews.apache.org/r/43425/#comment181343> So, we have a problem here in that the RequestEntity doesn't exist yet. Yes, we're creating it first and then creating the UpgradeEntity. But the problem is that JPA is not honoring the order, so that when we go to flush this stuff out when the transaction is over, it tries to create the UpgradeEntity first. We can do the UpgradeEntity association outside of the transaction, but then we don't benefit from a full rollback. Instead, let's just flush from the UpgradeDAO _before_ upgrade. ``` @Transactional public void create(UpgradeEntity entity) { EntityManager entityManager = entityManagerProvider.get(); entityManager.flush(); entityManager.persist(entity); } ``` - Jonathan Hurley On Feb. 19, 2016, 12:36 p.m., Dmitro Lisnichenko wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/43425/ > ----------------------------------------------------------- > > (Updated Feb. 19, 2016, 12:36 p.m.) > > > Review request for Ambari, Jonathan Hurley and Nate Cole. > > > Bugs: AMBARI-14996 > https://issues.apache.org/jira/browse/AMBARI-14996 > > > Repository: ambari > > > Description > ------- > > When performing an upgrade, we need to specify that a component's desired > version is getting changed. Also upgrade status is tracked based on component > statuses (not host/cluster versions) > > > Diffs > ----- > > .gitignore a8c4aab > > ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java > 248ce4b > > ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java > b62f4d1 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java > 87731c4 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java > 33b496f > > ambari-server/src/main/java/org/apache/ambari/server/events/HostComponentVersionEvent.java > ee65d3d > > ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java > 74d4f4b > > ambari-server/src/main/java/org/apache/ambari/server/events/publishers/VersionEventPublisher.java > 3a11f38 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java > 2c4d695 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentStateEntity.java > f92f645 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentDesiredStateEntity.java > 65cc107 > > ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java > 03d407a > > ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java > 360f2b8 > ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java > b430525 > > ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryVersionState.java > 344f358 > > ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponent.java > 7803045 > > ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHost.java > f1e8d62 > > ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java > 4afc857 > > ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java > 5143bfa > > ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeState.java > ced1dd3 > > ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java > 8230fe3 > > ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java > 92828af > > ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostSummary.java > 1c36143 > ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql 2db745b > ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql 3ec982a > ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql 026efea > ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql fb9889d > ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql > 3cc7516 > ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql a5bfdc2 > ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql 8e5b2f8 > > ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java > 0e9b18d > > ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java > 2a4cec8 > > ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java > 9c59cde > > ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java > 7b26f23 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java > 9b27447 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java > b0e3467 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java > 035c61a > ambari-server/src/test/java/org/apache/ambari/server/events/EventsTest.java > ad53f70 > > ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java > 772d68a > > ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java > ae05a6b > > ambari-server/src/test/java/org/apache/ambari/server/events/publishers/VersionEventPublisherTest.java > 071c6f0 > ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java > 71b89c3 > > ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ClusterVersionDAOTest.java > b57db5b > > ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostVersionDAOTest.java > e8e5d20 > > ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java > 3ad2240 > > ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java > 89f0ba6 > > ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java > 14137cc > > ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java > 989eba2 > > ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java > 55e7a61 > > ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java > 62d5981 > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java > 847de7d > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java > 2ffcd5d > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersDeadlockTest.java > 7cb7679 > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java > daf8d12 > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java > 4845d6f > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java > 81399a1 > > ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java > 4248d13 > > ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java > 62f2cbf > > Diff: https://reviews.apache.org/r/43425/diff/ > > > Testing > ------- > > Pending E2E RU/EU upgrades/downgrades on live cluster > > Did not work on unit tests yet. > > > Thanks, > > Dmitro Lisnichenko > >
