Skip to content

<fix>[vm_local_volume_cache]: Set CacheTO in extension point #3578

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
zstack-robot-1 wants to merge 1 commit into
base: feature-5.5.6-local-cache
Choose a base branch
from
Open

<fix>[vm_local_volume_cache]: Set CacheTO in extension point #3578

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
14 changes: 1 addition & 13 deletions plugin/kvm/src/main/java/org/zstack/kvm/VolumeTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
import org.zstack.core.db.Q;
import org.zstack.header.host.HostInventory;
import org.zstack.header.image.ImagePlatform;
import org.zstack.header.localVolumeCache.VmLocalVolumeCacheInventory;
import org.zstack.header.localVolumeCache.VmLocalVolumeCacheVO;
import org.zstack.header.localVolumeCache.VmLocalVolumeCacheVO_;
import org.zstack.header.storage.primary.PrimaryStorageVO;
import org.zstack.header.storage.primary.PrimaryStorageVO_;
import org.zstack.header.vm.VmInstanceVO;
Expand Down Expand Up @@ -158,16 +155,7 @@ public static VolumeTO valueOf(VolumeInventory vol, KVMHostInventory host, Strin
for (KVMConvertVolumeExtensionPoint ext : exts) {
to = ext.convertVolumeIfNeed(host, vol, to);
}
VmLocalVolumeCacheVO cacheVO = Q.New(VmLocalVolumeCacheVO.class)
.eq(VmLocalVolumeCacheVO_.volumeUuid, vol.getUuid())
.find();
if (cacheVO == null) {
return to;
}
VmLocalVolumeCacheInventory cacheInv = VmLocalVolumeCacheInventory.valueOf(cacheVO);
CacheTO cacheTO = CacheTO.valueOf(cacheInv);
to.setCache(cacheTO);
return to;
return to;
}

private synchronized static void prepareExts() {
Expand Down