apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix infrastructure leak on exception while attaching/detaching volumes in VMware (#10860)

Browse Source 
* Handled exception separately to prevent infrastructure data leak
This commit is contained in:
Erik Böck 2025-08-04 11:05:54 -03:00 committed by GitHub
parent 15740136dc
commit d7b7bd53ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
View File

@ -149,6 +149,7 @@ import com.cloud.domain.dao.DomainDao;
import com.cloud.event.ActionEvent;
import com.cloud.event.EventTypes;
import com.cloud.event.UsageEventUtils;
import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
@ -3206,6 +3207,8 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
try {
answer = _agentMgr.send(hostId, cmd);
} catch (AgentUnavailableException e) {
throw new CloudRuntimeException(String.format("%s. Please contact your system administrator.", errorMsg));
} catch (Exception e) {
throw new CloudRuntimeException(errorMsg + " due to: " + e.getMessage());
}
@ -4769,6 +4772,11 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
try {
answer = (AttachAnswer)_agentMgr.send(hostId, cmd);
} catch (AgentUnavailableException e) {
if (host != null) {
volService.revokeAccess(volFactory.getVolume(volumeToAttach.getId()), host, dataStore);
}
throw new CloudRuntimeException(String.format("%s. Please contact your system administrator.", errorMsg));
} catch (Exception e) {
if (host != null) {
volService.revokeAccess(volFactory.getVolume(volumeToAttach.getId()), host, dataStore);