You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ambari.apache.org by Nate Cole <nc...@hortonworks.com> on 2014/02/21 22:13:03 UTC

Review Request 18375: Rename MAINTENANCE and PassiveState

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

Review request for Ambari, Mahadev Konar, Sid Wagle, and Tom Beerbower.


Bugs: AMBARI-4752
    https://issues.apache.org/jira/browse/AMBARI-4752


Repository: ambari


Description
-------

This is a big transaction that does two things:
* Rename State.MAINTENANCE to State.DISABLED
* Renamve PassiveState to MaintenanceState


Diffs
-----

  ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java 7754025 
  ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java a339784 
  ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java 2552aa6 
  ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java 0d83e88 
  ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java 2063f88 
  ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java 6ab0ca9 
  ambari-server/src/main/java/org/apache/ambari/server/controller/HostRequest.java 398b3a7 
  ambari-server/src/main/java/org/apache/ambari/server/controller/HostResponse.java 97bc7b7 
  ambari-server/src/main/java/org/apache/ambari/server/controller/MaintenanceStateHelper.java PRE-CREATION 
  ambari-server/src/main/java/org/apache/ambari/server/controller/PassiveStateHelper.java 1709fb0 
  ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java 0891560 
  ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostResponse.java 2777f3f 
  ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java d98e7a1 
  ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java 99cb100 
  ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java 600691d 
  ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java c2ca857 
  ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java 5a0c2a9 
  ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java 608d8e5 
  ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentDesiredStateEntity.java ed9da4b 
  ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostStateEntity.java a535222 
  ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java 3457934 
  ambari-server/src/main/java/org/apache/ambari/server/state/Host.java 491356f 
  ambari-server/src/main/java/org/apache/ambari/server/state/MaintenanceState.java PRE-CREATION 
  ambari-server/src/main/java/org/apache/ambari/server/state/PassiveState.java e7f2d2a 
  ambari-server/src/main/java/org/apache/ambari/server/state/Service.java d3d8fd2 
  ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHost.java cff1861 
  ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHostEvent.java 64dfe08 
  ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHostEventType.java 77ed810 
  ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java f8b3785 
  ambari-server/src/main/java/org/apache/ambari/server/state/State.java 91d2a85 
  ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java 4ffb369 
  ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostDisableEvent.java PRE-CREATION 
  ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java c041843 
  ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostMaintenanceEvent.java f503593 
  ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java 86bbef3 
  ambari-server/src/main/python/UpgradeHelper_HDP2.py 3253b98 
  ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql ae6888a 
  ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql 1bf4305 
  ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql 22e9630 
  ambari-server/src/main/resources/Ambari-DDL-Postgres-REMOTE-CREATE.sql 3cbfe3b 
  ambari-server/src/main/resources/properties.json 254edc1 
  ambari-server/src/main/resources/scripts/relocate_host_components.py f9b71a0 
  ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java 12aab4f 
  ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java 260baf2 
  ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java 272b510 
  ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java 775928b 
  ambari-server/src/test/java/org/apache/ambari/server/controller/MaintenanceStateHelperTest.java PRE-CREATION 
  ambari-server/src/test/java/org/apache/ambari/server/controller/PassiveStateHelperTest.java 6a86182 
  ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java be5d4cb 
  ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java 5082dce 
  ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java 066f4c4 
  ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java 50ef1ad 
  ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java 6046bb8 
  ambari-server/src/test/python/TestUpgradeScript_HDP2.py 262ccb0 

Diff: https://reviews.apache.org/r/18375/diff/


Testing
-------

Unit tests passed, the below failures were _before_ this patch.  A local ignore passes

============ NOT DUE TO THIS BUG =============
Results :

Failed tests:   testColumnExists(org.apache.ambari.server.orm.DBAccessorImplTest)

Tests in error:
  testUpgradePath(org.apache.ambari.server.upgrade.UpgradeCatalogTest): Guice creation errors:(..)
  testUpgradePath(org.apache.ambari.server.upgrade.UpgradeCatalogTest)

Tests run: 1416, Failures: 1, Errors: 2, Skipped: 9

============ END NOT DUE TO THIS BUG =============


Thanks,

Nate Cole


Re: Review Request 18375: Rename MAINTENANCE and PassiveState

Posted by Tom Beerbower <tb...@hortonworks.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/18375/#review35265
-----------------------------------------------------------

Ship it!


Minor stuff :

HostComponentResourceProvider
    Unused import : org.apache.ambari.server.state.MaintenanceState; 

HostResponse
    incomplete docs for setMaintenanceState & getMaintenanceState 

HostStateEntity
    Unused imports : org.apache.ambari.server.state.MaintenanceState;
                     org.apache.commons.lang.StringUtils;

MaintenanceStateHelper :
    incomplete docs for getMaintenanceHostCompoments

MaintenanceStateHelperTest
    inused import : org.easymock.EasyMock;

ServiceResponse
    Unused import : org.apache.ambari.server.state.MaintenanceState; 

TestHeartbeatMonitor
    Unused import : static org.junit.Assert.assertFalse;




- Tom Beerbower


On Feb. 21, 2014, 9:12 p.m., Nate Cole wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/18375/
> -----------------------------------------------------------
> 
> (Updated Feb. 21, 2014, 9:12 p.m.)
> 
> 
> Review request for Ambari, Mahadev Konar, Sid Wagle, and Tom Beerbower.
> 
> 
> Bugs: AMBARI-4752
>     https://issues.apache.org/jira/browse/AMBARI-4752
> 
> 
> Repository: ambari
> 
> 
> Description
> -------
> 
> This is a big transaction that does two things:
> * Rename State.MAINTENANCE to State.DISABLED
> * Renamve PassiveState to MaintenanceState
> 
> 
> Diffs
> -----
> 
>   ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java 7754025 
>   ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java a339784 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java 2552aa6 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java 0d83e88 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java 2063f88 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java 6ab0ca9 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/HostRequest.java 398b3a7 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/HostResponse.java 97bc7b7 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/MaintenanceStateHelper.java PRE-CREATION 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/PassiveStateHelper.java 1709fb0 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java 0891560 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostResponse.java 2777f3f 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java d98e7a1 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java 99cb100 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java 600691d 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java c2ca857 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java 5a0c2a9 
>   ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java 608d8e5 
>   ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentDesiredStateEntity.java ed9da4b 
>   ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostStateEntity.java a535222 
>   ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java 3457934 
>   ambari-server/src/main/java/org/apache/ambari/server/state/Host.java 491356f 
>   ambari-server/src/main/java/org/apache/ambari/server/state/MaintenanceState.java PRE-CREATION 
>   ambari-server/src/main/java/org/apache/ambari/server/state/PassiveState.java e7f2d2a 
>   ambari-server/src/main/java/org/apache/ambari/server/state/Service.java d3d8fd2 
>   ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHost.java cff1861 
>   ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHostEvent.java 64dfe08 
>   ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHostEventType.java 77ed810 
>   ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java f8b3785 
>   ambari-server/src/main/java/org/apache/ambari/server/state/State.java 91d2a85 
>   ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java 4ffb369 
>   ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostDisableEvent.java PRE-CREATION 
>   ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java c041843 
>   ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostMaintenanceEvent.java f503593 
>   ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java 86bbef3 
>   ambari-server/src/main/python/UpgradeHelper_HDP2.py 3253b98 
>   ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql ae6888a 
>   ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql 1bf4305 
>   ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql 22e9630 
>   ambari-server/src/main/resources/Ambari-DDL-Postgres-REMOTE-CREATE.sql 3cbfe3b 
>   ambari-server/src/main/resources/properties.json 254edc1 
>   ambari-server/src/main/resources/scripts/relocate_host_components.py f9b71a0 
>   ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java 12aab4f 
>   ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java 260baf2 
>   ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java 272b510 
>   ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java 775928b 
>   ambari-server/src/test/java/org/apache/ambari/server/controller/MaintenanceStateHelperTest.java PRE-CREATION 
>   ambari-server/src/test/java/org/apache/ambari/server/controller/PassiveStateHelperTest.java 6a86182 
>   ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java be5d4cb 
>   ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java 5082dce 
>   ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java 066f4c4 
>   ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java 50ef1ad 
>   ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java 6046bb8 
>   ambari-server/src/test/python/TestUpgradeScript_HDP2.py 262ccb0 
> 
> Diff: https://reviews.apache.org/r/18375/diff/
> 
> 
> Testing
> -------
> 
> Unit tests passed, the below failures were _before_ this patch.  A local ignore passes
> 
> ============ NOT DUE TO THIS BUG =============
> Results :
> 
> Failed tests:   testColumnExists(org.apache.ambari.server.orm.DBAccessorImplTest)
> 
> Tests in error:
>   testUpgradePath(org.apache.ambari.server.upgrade.UpgradeCatalogTest): Guice creation errors:(..)
>   testUpgradePath(org.apache.ambari.server.upgrade.UpgradeCatalogTest)
> 
> Tests run: 1416, Failures: 1, Errors: 2, Skipped: 9
> 
> ============ END NOT DUE TO THIS BUG =============
> 
> 
> Thanks,
> 
> Nate Cole
> 
>


Re: Review Request 18375: Rename MAINTENANCE and PassiveState

Posted by Nate Cole <nc...@hortonworks.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/18375/
-----------------------------------------------------------

(Updated Feb. 24, 2014, 10:04 a.m.)


Review request for Ambari, Mahadev Konar, Sid Wagle, and Tom Beerbower.


Changes
-------

Updated patch for
a) git pull had conflicts
b) fix upgrade script default value
c) Tom's points

All tests passed.


Bugs: AMBARI-4752
    https://issues.apache.org/jira/browse/AMBARI-4752


Repository: ambari


Description
-------

This is a big transaction that does two things:
* Rename State.MAINTENANCE to State.DISABLED
* Renamve PassiveState to MaintenanceState


Diffs (updated)
-----

  ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java 7754025 
  ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java a339784 
  ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java 2552aa6 
  ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java 7da9a9f 
  ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java 2063f88 
  ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java 6ab0ca9 
  ambari-server/src/main/java/org/apache/ambari/server/controller/HostRequest.java 398b3a7 
  ambari-server/src/main/java/org/apache/ambari/server/controller/HostResponse.java 97bc7b7 
  ambari-server/src/main/java/org/apache/ambari/server/controller/MaintenanceStateHelper.java PRE-CREATION 
  ambari-server/src/main/java/org/apache/ambari/server/controller/PassiveStateHelper.java 1709fb0 
  ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java 0891560 
  ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostResponse.java 2777f3f 
  ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java d98e7a1 
  ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java 99cb100 
  ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java 600691d 
  ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java c2ca857 
  ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java 5a0c2a9 
  ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java 608d8e5 
  ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentDesiredStateEntity.java ed9da4b 
  ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostStateEntity.java a535222 
  ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java 3457934 
  ambari-server/src/main/java/org/apache/ambari/server/state/Host.java 491356f 
  ambari-server/src/main/java/org/apache/ambari/server/state/MaintenanceState.java PRE-CREATION 
  ambari-server/src/main/java/org/apache/ambari/server/state/PassiveState.java e7f2d2a 
  ambari-server/src/main/java/org/apache/ambari/server/state/Service.java d3d8fd2 
  ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHost.java cff1861 
  ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHostEvent.java 64dfe08 
  ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHostEventType.java 77ed810 
  ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java f8b3785 
  ambari-server/src/main/java/org/apache/ambari/server/state/State.java 91d2a85 
  ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java 4ffb369 
  ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostDisableEvent.java PRE-CREATION 
  ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java c041843 
  ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostMaintenanceEvent.java f503593 
  ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java 86bbef3 
  ambari-server/src/main/python/UpgradeHelper_HDP2.py 3253b98 
  ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql ae6888a 
  ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql 1bf4305 
  ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql 22e9630 
  ambari-server/src/main/resources/Ambari-DDL-Postgres-REMOTE-CREATE.sql 3cbfe3b 
  ambari-server/src/main/resources/properties.json 254edc1 
  ambari-server/src/main/resources/scripts/relocate_host_components.py f9b71a0 
  ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java 12aab4f 
  ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java 260baf2 
  ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java 272b510 
  ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java 5ee94c7 
  ambari-server/src/test/java/org/apache/ambari/server/controller/MaintenanceStateHelperTest.java PRE-CREATION 
  ambari-server/src/test/java/org/apache/ambari/server/controller/PassiveStateHelperTest.java 6a86182 
  ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java be5d4cb 
  ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java 5082dce 
  ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java 066f4c4 
  ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java 50ef1ad 
  ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java 6046bb8 
  ambari-server/src/test/python/TestUpgradeScript_HDP2.py 262ccb0 

Diff: https://reviews.apache.org/r/18375/diff/


Testing
-------

Unit tests passed, the below failures were _before_ this patch.  A local ignore passes

============ NOT DUE TO THIS BUG =============
Results :

Failed tests:   testColumnExists(org.apache.ambari.server.orm.DBAccessorImplTest)

Tests in error:
  testUpgradePath(org.apache.ambari.server.upgrade.UpgradeCatalogTest): Guice creation errors:(..)
  testUpgradePath(org.apache.ambari.server.upgrade.UpgradeCatalogTest)

Tests run: 1416, Failures: 1, Errors: 2, Skipped: 9

============ END NOT DUE TO THIS BUG =============


Thanks,

Nate Cole