----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/33247/#review80324 -----------------------------------------------------------
Ship it! Wow... that might be a record. :) Looks good. One minor comment... ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java <https://reviews.apache.org/r/33247/#comment130169> It looks you got rid of all the usages of gson. You can remove the member and import. - Tom Beerbower On April 16, 2015, 5:02 a.m., Jonathan Hurley wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/33247/ > ----------------------------------------------------------- > > (Updated April 16, 2015, 5:02 a.m.) > > > Review request for Ambari, Alejandro Fernandez, Nate Cole, and Tom Beerbower. > > > Bugs: AMBARI-10511 > https://issues.apache.org/jira/browse/AMBARI-10511 > > > Repository: ambari > > > Description > ------- > > Normally, I'd apologize for this massive commit. But I'm not the one that > decided it was a good idea to use JSON and pass around silly strings for the > stack version everywhere :) > > The following tables reference the desired/current stack using a JSON string. > These will need to be replaced by using the {{stack.stack_id}} reference > column: > > - clusters.desired_stack_version > - clusterstate.current_stack_version > - hostcomponentdesiredstate.desired_stack_version > - hostcomponentstate.current_stack_version > - servicecomponentdesiredstate.desired_stack_version > - blueprint.stack_name, blueprint.stack_version > - repo_version.stack > > In addition to the above changes, new fields will need to be added to the > following tables in order to associate the service configuration version and > the individual configuration types with the stack that they belong to. > > - serviceconfig > - clusterconfig > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheck.java > e4170a3 > > ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java > a4ddf14 > > ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java > a24eb60 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseBlueprintProcessor.java > c2ddad8 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java > 4a1f596 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java > e872fe9 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java > ec8d495 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java > 044f03f > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java > 9a80ad8 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/Stack.java > 6da2b54 > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java > 9733eff > > ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java > 3bc4fa0 > > ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java > 85e92af > > ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterVersionDAO.java > b7e0d1c > > ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostVersionDAO.java > d816102 > > ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java > 7099c5c > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintEntity.java > 36a0f26 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java > cb36923 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java > 3577dc4 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterStateEntity.java > 49afa84 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterVersionEntity.java > 01b9c03 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentDesiredStateEntity.java > 7f0b19d > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentStateEntity.java > 4463366 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostEntity.java > a811c16 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java > 363e6be > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java > e536f02 > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentDesiredStateEntity.java > 780f8ba > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java > ec6bd9f > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java > 2d2c386 > > ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java > fc9774b > ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java > b10157a > ambari-server/src/main/java/org/apache/ambari/server/state/Clusters.java > 8676521 > ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java > 0211b68 > > ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java > 73ed25e > ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java > c8018a0 > ambari-server/src/main/java/org/apache/ambari/server/state/StackId.java > 0be39c1 > > ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java > 1a8bf43 > > ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java > c7a8ddb > > ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java > 9ec0370 > > ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java > 370cd48 > > ambari-server/src/main/java/org/apache/ambari/server/upgrade/StackUpgradeUtil.java > 388bea9 > > ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java > d80909b > > ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java > 2259c92 > ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql c3488f2 > ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql 0455e9e > ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql 2c381b2 > ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql > 24762eb > ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql adf5828 > > ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java > d498c97 > > ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionDBAccessorImpl.java > 112e1e5 > > ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java > 6c5a8a0 > > ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java > c6e2788 > > ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java > 6bb053b > > ambari-server/src/test/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheckTest.java > f70d9fc > > ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java > 3e310ff > > ambari-server/src/test/java/org/apache/ambari/server/controller/ClusterRequestTest.java > 30cd6ba > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BaseBlueprintProcessorTest.java > 84225ac > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java > 11a2b22 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java > c72ddc5 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java > 1cc75c7 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java > 1ee282a > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java > aa391ca > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java > 6e50df6 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java > b8c761a > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java > 27a99dd > > ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java > b6af863 > ambari-server/src/test/java/org/apache/ambari/server/events/EventsTest.java > 6073677 > > ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java > 8cb705f > ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java > 6041066 > ambari-server/src/test/java/org/apache/ambari/server/orm/TestOrmImpl.java > b56c060 > > ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ClusterVersionDAOTest.java > 4837764 > > ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ConfigGroupDAOTest.java > 304f5b6 > > ambari-server/src/test/java/org/apache/ambari/server/orm/dao/CrudDAOTest.java > 7568150 > > ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostVersionDAOTest.java > 7cf59e9 > > ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java > 09c8453 > > ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java > 8ca53f7 > > ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestScheduleDAOTest.java > b3a3ef2 > > ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java > 5118156 > > ambari-server/src/test/java/org/apache/ambari/server/orm/entities/BlueprintEntityTest.java > b965554 > > ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java > 41050c6 > > ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java > 87dd18b > > ambari-server/src/test/java/org/apache/ambari/server/state/ConfigGroupTest.java > 4d4d674 > > ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java > 751583e > > ambari-server/src/test/java/org/apache/ambari/server/state/RequestExecutionTest.java > abbee45 > > ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java > 00894f1 > ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java > 552edec > > ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java > e05d16e > > ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java > 1c4567f > > ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java > 73bf6c4 > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java > ff039a9 > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java > 66a4ade > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersDeadlockTest.java > d771eba > > ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java > 20eafe0 > > ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java > 27b2a0e > > ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java > 137575e > > ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog150Test.java > 37328e8 > > ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java > 2bf6d96 > > ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java > 96d5134 > > ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogHelper.java > aa9d26b > > ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java > c411985 > > Diff: https://reviews.apache.org/r/33247/diff/ > > > Testing > ------- > > mvn clean test passes > > > Thanks, > > Jonathan Hurley > >
