apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

returning serverapiexceptions for prepare and cancel pool maintenance; making it consistent with other pieces of code

Browse Source
This commit is contained in:
abhishek 2010-11-04 13:40:10 -07:00
parent 55e9378f9a
commit baa28d2022
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/storage/StorageManager.java
View File

@ -23,6 +23,7 @@ import java.util.List;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.manager.Commands;
import com.cloud.api.ServerApiException;
import com.cloud.api.commands.CancelPrimaryStorageMaintenanceCmd;
import com.cloud.api.commands.CreateStoragePoolCmd;
import com.cloud.api.commands.CreateVolumeCmd;
@ -311,17 +312,17 @@ public interface StorageManager extends Manager {
* Enable maintenance for primary storage
* @param cmd - the command specifying primaryStorageId
* @return the primary storage pool
* @throws InvalidParameterValueException
* @throws ServerApiException
*/
public StoragePoolVO preparePrimaryStorageForMaintenance(PreparePrimaryStorageForMaintenanceCmd cmd) throws InvalidParameterValueException;
public StoragePoolVO preparePrimaryStorageForMaintenance(PreparePrimaryStorageForMaintenanceCmd cmd) throws ServerApiException;
/**
* Complete maintenance for primary storage
* @param cmd - the command specifying primaryStorageId
* @return the primary storage pool
* @throws InvalidParameterValueException
* @throws ServerApiException
*/
public StoragePoolVO cancelPrimaryStorageForMaintenance(CancelPrimaryStorageMaintenanceCmd cmd) throws InvalidParameterValueException;
public StoragePoolVO cancelPrimaryStorageForMaintenance(CancelPrimaryStorageMaintenanceCmd cmd) throws ServerApiException;
public StoragePoolVO updateStoragePool(UpdateStoragePoolCmd cmd) throws IllegalArgumentException;

2
server/src/com/cloud/storage/StorageManagerImpl.java
View File

@ -2141,7 +2141,7 @@ public class StorageManagerImpl implements StorageManager {
}
@Override @DB
public synchronized StoragePoolVO preparePrimaryStorageForMaintenance(PreparePrimaryStorageForMaintenanceCmd cmd) {
public synchronized StoragePoolVO preparePrimaryStorageForMaintenance(PreparePrimaryStorageForMaintenanceCmd cmd) throws ServerApiException{
Long primaryStorageId = cmd.getId();
Long userId = UserContext.current().getUserId();
boolean restart = true;