> On May 9, 2017, 8:36 a.m., Jonathan Hurley wrote: > > ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java > > Line 72 (original), 70 (patched) > > <https://reviews.apache.org/r/59066/diff/1/?file=1710843#file1710843line73> > > > > I know that we have a parallel patch to this for host versions right > > now, but do we have to set soemething else here as well, like am > > INSTALLED_FAILED for the repository for the host version?
That is done in the for-loop above this one in same file > On May 9, 2017, 8:36 a.m., Jonathan Hurley wrote: > > ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java > > Lines 509 (patched) > > <https://reviews.apache.org/r/59066/diff/1/?file=1710844#file1710844line509> > > > > Should we call this desired_version instead? Something that I've been > > wondering about is if we need a current version for all > > services/components. So far we've gotten away without it. Perhaps - this was the name that is used in python, and that is not this patch. I only added this constant instead of hard-coded strings in multiple places. We have a jira already to send all versions of all services in the command json, so I'm hoping this will go away. > On May 9, 2017, 8:36 a.m., Jonathan Hurley wrote: > > ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java > > Lines 2913-2918 (patched) > > <https://reviews.apache.org/r/59066/diff/1/?file=1710851#file1710851line2948> > > > > I don't think these NULLs can ever happen since we have a non-NULL > > constraint in the DB. I see them in a bunch of spots. I'm not against it, > > but it does create more clutter. The component is nullable according to the code, but the service is NOT nullable. Will update the logic here. > On May 9, 2017, 8:36 a.m., Jonathan Hurley wrote: > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java > > Lines 198-200 (patched) > > <https://reviews.apache.org/r/59066/diff/1/?file=1710853#file1710853line220> > > > > You gotta use that nifty new "notes" field in the Experimental > > annotation for this too :) Done :) > On May 9, 2017, 8:36 a.m., Jonathan Hurley wrote: > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java > > Lines 528-531 (original), 528 (patched) > > <https://reviews.apache.org/r/59066/diff/1/?file=1710854#file1710854line528> > > > > This indirectly also did some stuff with host_versions. Just checking > > there's not something we need to do here still. That I'm not sure; I believe the calculation work you've started will address this. > On May 9, 2017, 8:36 a.m., Jonathan Hurley wrote: > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java > > Lines 401-417 (original) > > <https://reviews.apache.org/r/59066/diff/1/?file=1710856#file1710856line401> > > > > Should this instead be across host versions for the repo now? I was hoping the cascade on entities would solve this problem, but I see the point. Will update. - Nate ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/59066/#review174295 ----------------------------------------------------------- On May 8, 2017, 5:35 p.m., Nate Cole wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/59066/ > ----------------------------------------------------------- > > (Updated May 8, 2017, 5:35 p.m.) > > > Review request for Ambari, Alejandro Fernandez, Dmytro Grinenko, Dmitro > Lisnichenko, and Jonathan Hurley. > > > Bugs: AMBARI-20957 > https://issues.apache.org/jira/browse/AMBARI-20957 > > > Repository: ambari > > > Description > ------- > > Patch and Service upgrades no longer use cluster_version to track a > repository for upgrade purposes. > > > Diffs > ----- > > ambari-server/src/main/java/org/apache/ambari/annotations/Experimental.java > f51991c8c8 > > ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java > 26e5be8216 > > ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java > 63eb660e57 > > ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java > 707c75681a > > ambari-server/src/main/java/org/apache/ambari/server/checks/HardcodedStackVersionPropertiesCheck.java > 314d1a7341 > > ambari-server/src/main/java/org/apache/ambari/server/checks/InstallPackagesCheck.java > 2c20762194 > > ambari-server/src/main/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheck.java > 2200a45306 > > ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java > 835d607275 > > ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java > 1d43093de2 > > ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java > e2bd50f25a > > ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java > 6687942b3f > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java > fd52a3f8b8 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java > c24410788f > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java > 71b9b6bb9a > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java > d2f3f8d7e1 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java > c611037c40 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java > b49b66eea8 > > ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java > 3fda1603f7 > > ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java > b4ddf09027 > > ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java > 33c622f08b > > ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterVersionDAO.java > 1bcca60911 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java > 527fd7a009 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterVersionEntity.java > f1867b47e7 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java > f5d669e4f5 > > ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java > a4cc757346 > ambari-server/src/main/java/org/apache/ambari/server/stack/RepoUtil.java > 1380f933c7 > > ambari-server/src/main/java/org/apache/ambari/server/stack/UpdateActiveRepoVersionOnStartup.java > 29af6a8716 > ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java > 88c5a59955 > > ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java > 21c275b0b5 > > ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java > 99bc781b78 > > ambari-server/src/main/java/org/apache/ambari/server/state/services/RetryUpgradeActionService.java > 584ce9884f > > ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog220.java > 11e90ee386 > ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql c2a923973f > ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql 48d2c35692 > ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql 26201fc292 > ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql 156fc08f0b > ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql > 979ea44ed1 > ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql 08c71ff8f5 > ambari-server/src/main/resources/META-INF/persistence.xml 03756508ee > > ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java > c5be8f416b > > ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java > 5afeb77f9e > > ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatTestHelper.java > 6e1ebdd840 > > ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java > 83e7d56fb6 > > ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java > 4c536a9a96 > > ambari-server/src/test/java/org/apache/ambari/server/checks/InstallPackagesCheckTest.java > 86a682ce81 > > ambari-server/src/test/java/org/apache/ambari/server/checks/MapReduce2JobHistoryStatePreservingCheckTest.java > c899af61b0 > > ambari-server/src/test/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheckTest.java > 7486c71096 > > ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java > 00fc9621cb > > ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java > f5848f4668 > > ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java > 1899b3abce > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java > caf72101fd > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java > 528bd40a34 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java > d1a4a1afd8 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java > 21f938337f > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java > 91b00ab74d > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java > 74cf0bf026 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java > 30e5c4c844 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java > d30d9e05fa > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProviderTest.java > 094706efa9 > ambari-server/src/test/java/org/apache/ambari/server/events/EventsTest.java > 9907153e06 > > ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java > 6184d6d88f > > ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java > d5b2d468e9 > ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java > e84e0f628b > > ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ClusterVersionDAOTest.java > 81fa8e1394 > > ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostVersionDAOTest.java > eb0c49ec11 > > ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java > c7414bc50f > > ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java > 91d5f045b8 > > ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java > 860369b77d > > ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java > 18eef5672e > > ambari-server/src/test/java/org/apache/ambari/server/stack/UpdateActiveRepoVersionOnStartupTest.java > d67cdfcf2b > > ambari-server/src/test/java/org/apache/ambari/server/state/CheckHelperTest.java > 63eae6ab7d > > ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java > 8f2020d488 > > ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java > 364b92ce38 > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java > 9c17e0155e > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterEffectiveVersionTest.java > bba197f209 > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java > 6471988af4 > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersDeadlockTest.java > 801f3a786d > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java > 43e9737c98 > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java > 4d06f60b6d > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java > 8cd00ce095 > > ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java > 32e8daefef > > ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java > f52f007201 > > ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java > ed92db77aa > > ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java > 8b784792ba > > ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog242Test.java > af3ba73a4a > > > Diff: https://reviews.apache.org/r/59066/diff/1/ > > > Testing > ------- > > Manual. Automated pending. > > > Thanks, > > Nate Cole > >