Skip to content

fix: resolve account for SNAPSHOT data objects in DownloadListener (fixes #13900) #13929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waterWang wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −1
Open

fix: resolve account for SNAPSHOT data objects in DownloadListener (fixes #13900) #13929

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion server/src/main/java/com/cloud/storage/download/DownloadListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@
import com.cloud.resourcelimit.CheckedReservation;
import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.SnapshotVO;
import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.storage.dao.SnapshotDao;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.ResourceLimitService;
Expand Down Expand Up @@ -163,6 +165,8 @@ protected void runInContext() {
@Inject
ReservationDao _reservationDao;

@Inject
private SnapshotDao _snapshotDao;
private LazyCache<Long, List<Hypervisor.HypervisorType>> zoneHypervisorsCache;

private List<Hypervisor.HypervisorType> listAvailHypervisorInZone(long zoneId) {
Expand Down Expand Up @@ -275,7 +279,9 @@ private Long getAccountIdForDataObject() {
} else if (DataObjectType.VOLUME.equals(object.getType())) {
VolumeVO v = _volumeDao.findById(object.getId());
return v != null ? v.getAccountId() : null;
}
} else if (DataObjectType.SNAPSHOT.equals(object.getType())) {
SnapshotVO s = _snapshotDao.findById(object.getId());
return s != null ? s.getAccountId() : null;
return null;
}

Expand Down
Loading