Merge pull request #1516 from sudhansu7/CLOUDSTACK-9366 CLOUDSTACK-9366: Capacity of one zone-wide primary storage ignoredDisable and Remove Host operation disables the primary storage capacity.
Steps to replicate: Base Condition: There exists a host and storage pool with same id Steps: 1. Find a host and storage pool having same id 2. Disable the host 3. CPU(1) and MEMORY(0) capacity in op_host_capacity for above host is disabled 4. STORAGE(3) capacity in op_host_capacity for storage pool with id same as above host is also disabled RCA: 'host_id' column in 'op_host_capacity' table used for storing both storage pool id (for STORAGE capacity) and host id (MEMORY and CPU). While disabling a HOST we also disable the capacity associated with host. Ideally while disabling capacity we should only disable MEMORY and CPU capacity, but we are not doing so. Code Path: ResourceManagerImpl.doDeleteHost() -> ResourceManagerImpl.resourceStateTransitTo() -> CapacityDaoImpl.updateCapacityState(null, null, null, host.getId(), capacityState.toString()) updateCapacityState is updating disabling all entries which matches the host_id. This will also disable a entry having storage pool id same as that of host id. Changes: introduced new capacityType parameter in updateCapacityState method and necessary changes to add capacity_type clause in sql also fixed incorrect sql builder logic (unused code path for which it is never surfaced ) Added marvin test to check host and storagepool capacity when host is disabled Test Result: ``` Before Fix: mysql> select ohc.host_id, ohc.`capacity_state`, case capacity_type when 0 then 'MEMORY' when 1 then 'CPU' ELSE 'STORAGE' END as 'capacity_type' , total_capacity, case capacity_type when 0 then 'HOST' when 1 then 'HOST' ELSE 'STORAGE POOL' END as 'HOST/STORAGE POOL' from op_host_capacity ohc where host_id=3; +---------+----------------+---------------+----------------+-------------------+ | host_id | capacity_state | capacity_type | total_capacity | HOST/STORAGE POOL | +---------+----------------+---------------+----------------+-------------------+ | 3 | Enabled | MEMORY | 8589934592 | HOST | | 3 | Enabled | CPU | 32000 | HOST | | 3 | Enabled | STORAGE | 2199023255552 | STORAGE POOL | +---------+----------------+---------------+----------------+-------------------+ 9 rows in set (0.00 sec) Disable Host 3 from UI. mysql> select ohc.host_id, ohc.`capacity_state`, case capacity_type when 0 then 'MEMORY' when 1 then 'CPU' ELSE 'STORAGE' END as 'capacity_type' , total_capacity, case capacity_type when 0 then 'HOST' when 1 then 'HOST' ELSE 'STORAGE POOL' END as 'HOST/STORAGE POOL' from op_host_capacity ohc where host_id=3; +---------+----------------+---------------+----------------+-------------------+ | host_id | capacity_state | capacity_type | total_capacity | HOST/STORAGE POOL | +---------+----------------+---------------+----------------+-------------------+ | 3 | Disabled | MEMORY | 8589934592 | HOST | | 3 | Disabled | CPU | 32000 | HOST | | 3 | Disabled | STORAGE | 2199023255552 | STORAGE POOL | +---------+----------------+---------------+----------------+-------------------+ After Fix: mysql> select ohc.host_id, ohc.`capacity_state`, case capacity_type when 0 then 'MEMORY' when 1 then 'CPU' ELSE 'STORAGE' END as 'capacity_type' , total_capacity, case capacity_type when 0 then 'HOST' when 1 then 'HOST' ELSE 'STORAGE POOL' END as 'HOST/STORAGE POOL' from op_host_capacity ohc where host_id=3; +---------+----------------+---------------+----------------+-------------------+ | host_id | capacity_state | capacity_type | total_capacity | HOST/STORAGE POOL | +---------+----------------+---------------+----------------+-------------------+ | 3 | Enabled | MEMORY | 8589934592 | HOST | | 3 | Enabled | CPU | 32000 | HOST | | 3 | Enabled | STORAGE | 2199023255552 | STORAGE POOL | +---------+----------------+---------------+----------------+-------------------+ 3 rows in set (0.01 sec) Disable Host 3 from UI. mysql> select ohc.host_id, ohc.`capacity_state`, case capacity_type when 0 then 'MEMORY' when 1 then 'CPU' ELSE 'STORAGE' END as 'capacity_type' , total_capacity, case capacity_type when 0 then 'HOST' when 1 then 'HOST' ELSE 'STORAGE POOL' END as 'HOST/STORAGE POOL' from op_host_capacity ohc where host_id=3; +---------+----------------+---------------+----------------+-------------------+ | host_id | capacity_state | capacity_type | total_capacity | HOST/STORAGE POOL | +---------+----------------+---------------+----------------+-------------------+ | 3 | Disabled | MEMORY | 8589934592 | HOST | | 3 | Disabled | CPU | 32000 | HOST | | 3 | Enabled | STORAGE | 2199023255552 | STORAGE POOL | +---------+----------------+---------------+----------------+-------------------+ 3 rows in set (0.00 sec) Sudhansus-MAC:cloudstack sudhansu$ nosetests-2.7 --with-marvin --marvin-config=setup/dev/advanced.cfg test/integration/component/maint/test_capacity_host_delete.py ==== Marvin Init Started ==== === Marvin Parse Config Successful === === Marvin Setting TestData Successful=== ==== Log Folder Path: /tmp//MarvinLogs//Apr_22_2016_22_42_27_X4VBWD. All logs will be available here ==== === Marvin Init Logging Successful=== ==== Marvin Init Successful ==== ===final results are now copied to: /tmp//MarvinLogs/test_capacity_host_delete_9RHSNB=== Sudhansus-MAC:cloudstack sudhansu$ cat /tmp//MarvinLogs/test_capacity_host_delete_9RHSNB/results.txt test_01_op_host_capacity_disable_host (integration.component.maint.test_capacity_host_delete.TestHosts) ... === TestName: test_01_op_host_capacity_disable_host | Status : SUCCESS === ok ---------------------------------------------------------------------- Ran 1 test in 0.168s OK ``` * pr/1516: CLOUDSTACK-9366: Capacity of one zone-wide primary storage ignored Signed-off-by: Will Stevens <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3f5b3a16 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3f5b3a16 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3f5b3a16 Branch: refs/heads/master Commit: 3f5b3a16dd37518e0962d7040a4ed16c7ff4604e Parents: 34111df 18a6aa8 Author: Will Stevens <[email protected]> Authored: Fri May 20 08:31:45 2016 -0400 Committer: Will Stevens <[email protected]> Committed: Fri May 20 08:31:46 2016 -0400 ---------------------------------------------------------------------- .../src/com/cloud/capacity/dao/CapacityDao.java | 3 +- .../com/cloud/capacity/dao/CapacityDaoImpl.java | 40 +++- .../com/cloud/resource/ResourceManagerImpl.java | 3 +- .../maint/test_capacity_host_delete.py | 210 +++++++++++++++++++ 4 files changed, 245 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
