----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/11992/ -----------------------------------------------------------
(Updated June 28, 2013, 9:18 a.m.) Review request for cloudstack, Alex Huang, edison su, Ram Ganesh, and Sateesh Chodapuneedi. Changes ------- incorporated review comments. This patch will resolve only issues with "Enable Maintenance" of ZWPS. Regarding issues with cancelling maintenance, I had created one more review request. Bugs: CLOUDSTACK-2571 Repository: cloudstack-git Description ------- Issue : NPE's are happening when ZWPS is put in maintenance, removed from maintenance. Fixed: 1. Added ZONE scope storage handling in StorageManagerImpl and StoragePoolAutomationImpl 2. Modified PrimaryDataStoreDao, listBy method to take poolid to Wrapper class of long instead of primitive. Modified associated DaoImpl. 3. StoragePoolAutomationImpl, when storage is setting to Maintenance mode, handled the case for ZONE wide scope of storage. if the storage is zone wide, get all the hosts(kvm, vmware) in zone and send the ModifyStoragePool command (with false) 4. When users, cancels maintenance mode, the handled the ZONE wide scope of storage pool. 5. Once the Storage is in maintenance, Deletion of the Storage will remove the mount points from all the hosts. This patch will solve all the issues pertaining to keeping/cancelling the ZONE wide primary storage. Diffs (updated) ----- engine/api/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java 99b7b9c engine/api/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java 8f7826f server/src/com/cloud/storage/StorageManagerImpl.java b3e8b96 server/src/com/cloud/storage/StoragePoolAutomationImpl.java 4001775 Diff: https://reviews.apache.org/r/11992/diff/ Testing ------- Manual Testing ============= 1. Enable maintenance mode of Zone wide storage , There were no NPE's happening and successfully kept the storage in maintenance mode. Verified DB status. 2. Cancel maintenance mode of Zone wide storage, There were no NPE's happening and successfully kept the storage in UP state. 3. Enable maintenance mode of zone wide, once successful then Delete the storage, Storage got deleted successfuly. Verify the hosts, Storage got unmounted and verified the DB status. Addition Tests (As the common code path is modified): 1. Add the Cluster scope of primary storage (kvm , xenserver). Adding the storage in both clusters is successful. kvm specific: ============ 2. Enable Maintenance Mode of cluster scope kvm storage. Successfully enabled the storage in maintenance state. 3. Cancel the Maintenance Mode of cluster scope kvm storage. Successfully enabled the storage in UP state. 4. Enable Maintenance Mode of cluster scope kvm storage. Delete the storage. Storage got successfully deleted, unmounted from hosts and from db. Xenserver specific: =================== 5. Enable Maintenance Mode of cluster scope Xenserver storage. Successfully enabled the storage in maintenance state. 6. Cancel the Maintenance Mode of cluster scope Xenserver storage. Successfully enabled the storage in UP state. 7. Enable Maintenance Mode of cluster scope Xenserver storage. Delete the storage. Storage got successfully deleted, unmounted from hosts and from db. ZWPS is supported in KVM and VMware, the common code is modified. It should work of VMWare as well without any issues Thanks, Rajesh Battala