CLOUDSTACK-9701: When host is disabled/removed,

Sudhansu · Rohit Yadav · commit 8240bc4aa228 · 2017-08-01T20:40:25.000+02:00
capacity_type for local storage in op_host_capacity is still enabled (cherry picked from commit e06e3b7) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -1181,6 +1181,13 @@ public boolean resourceStateTransitTo(final Host host, final ResourceState.Event
             final CapacityState capacityState =  nextState == ResourceState.Enabled ? CapacityState.Enabled : CapacityState.Disabled;
             final short[] capacityTypes = {Capacity.CAPACITY_TYPE_CPU, Capacity.CAPACITY_TYPE_MEMORY};
             _capacityDao.updateCapacityState(null, null, null, host.getId(), capacityState.toString(), capacityTypes);
+
+            final StoragePoolVO storagePool = _storageMgr.findLocalStorageOnHost(host.getId());
+
+            if(storagePool != null){
+                final short[] capacityTypesLocalStorage = {Capacity.CAPACITY_TYPE_LOCAL_STORAGE};
+                _capacityDao.updateCapacityState(null, null, null, storagePool.getId(), capacityState.toString(), capacityTypesLocalStorage);
+            }
         }
         return _hostDao.updateResourceState(currentState, event, nextState, host);
     }
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -997,6 +997,19 @@ public void createCapacityEntry(StoragePoolVO storagePool, short capacityType, l
                 }
             }
         }
+
+        if (storagePool.getScope() == ScopeType.HOST) {
+            List<StoragePoolHostVO> stoargePoolHostVO = _storagePoolHostDao.listByPoolId(storagePool.getId());
+
+            if(stoargePoolHostVO != null && !stoargePoolHostVO.isEmpty()){
+                HostVO host = _hostDao.findById(stoargePoolHostVO.get(0).getHostId());
+
+                if(host != null){
+                    capacityState = (host.getResourceState() == ResourceState.Disabled) ? CapacityState.Disabled : CapacityState.Enabled;
+                }
+            }
+        }
+
         if (capacities.size() == 0) {
             CapacityVO capacity =
                     new CapacityVO(storagePool.getId(), storagePool.getDataCenterId(), storagePool.getPodId(), storagePool.getClusterId(), allocated, totalOverProvCapacity,

Original file line number	Diff line number	Diff line change
`@@ -1181,6 +1181,13 @@ public boolean resourceStateTransitTo(final Host host, final ResourceState.Event`
`1181`	`1181`	`final CapacityState capacityState = nextState == ResourceState.Enabled ? CapacityState.Enabled : CapacityState.Disabled;`
`1182`	`1182`	`final short[] capacityTypes = {Capacity.CAPACITY_TYPE_CPU, Capacity.CAPACITY_TYPE_MEMORY};`
`1183`	`1183`	`_capacityDao.updateCapacityState(null, null, null, host.getId(), capacityState.toString(), capacityTypes);`
	`1184`	`+`
	`1185`	`+ final StoragePoolVO storagePool = _storageMgr.findLocalStorageOnHost(host.getId());`
	`1186`	`+`
	`1187`	`+ if(storagePool != null){`
	`1188`	`+ final short[] capacityTypesLocalStorage = {Capacity.CAPACITY_TYPE_LOCAL_STORAGE};`
	`1189`	`+ _capacityDao.updateCapacityState(null, null, null, storagePool.getId(), capacityState.toString(), capacityTypesLocalStorage);`
	`1190`	`+ }`
`1184`	`1191`	`}`
`1185`	`1192`	`return _hostDao.updateResourceState(currentState, event, nextState, host);`
`1186`	`1193`	`}`