You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2023/10/26 07:37:56 UTC

[cloudstack] branch main updated (4ff592ac2c1 -> 587d1d7dba1)

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


    from 4ff592ac2c1 Use UserVmDao for listVirtualMachines API to increase performance (#8012)
     add 6ae3b73ca2d Create snapshot from VM snapshot without memory for NFS/Local storage (#8117)
     new 587d1d7dba1 Merge remote-tracking branch 'apache/4.18' into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 api/src/main/java/com/cloud/storage/Snapshot.java  |  2 +-
 .../storage/motion/AncientDataMotionStrategy.java  | 18 ++++++++--
 .../kvm/storage/KVMStorageProcessor.java           | 40 ++++++++++++++--------
 .../storage/snapshot/SnapshotManagerImpl.java      | 40 +++++++++++++++++++---
 4 files changed, 78 insertions(+), 22 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'apache/4.18' into main

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 587d1d7dba1940dd1d879644333a365c303d930c
Merge: 4ff592ac2c1 6ae3b73ca2d
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Thu Oct 26 09:37:38 2023 +0200

    Merge remote-tracking branch 'apache/4.18' into main

 api/src/main/java/com/cloud/storage/Snapshot.java  |  2 +-
 .../storage/motion/AncientDataMotionStrategy.java  | 18 ++++++++--
 .../kvm/storage/KVMStorageProcessor.java           | 40 ++++++++++++++--------
 .../storage/snapshot/SnapshotManagerImpl.java      | 40 +++++++++++++++++++---
 4 files changed, 78 insertions(+), 22 deletions(-)

diff --cc server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index 922ebd52918,aeb095b6ecf..7116359f9e4
--- a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@@ -123,9 -109,9 +123,10 @@@ import com.cloud.storage.SnapshotSchedu
  import com.cloud.storage.SnapshotVO;
  import com.cloud.storage.Storage;
  import com.cloud.storage.Storage.ImageFormat;
+ import com.cloud.storage.Storage.StoragePoolType;
  import com.cloud.storage.StorageManager;
  import com.cloud.storage.StoragePool;
 +import com.cloud.storage.VMTemplateStorageResourceAssoc;
  import com.cloud.storage.VMTemplateVO;
  import com.cloud.storage.Volume;
  import com.cloud.storage.VolumeVO;
@@@ -240,7 -225,9 +243,11 @@@ public class SnapshotManagerImpl extend
      @Inject
      DataCenterDao dataCenterDao;
      @Inject
 +    SnapshotZoneDao snapshotZoneDao;
++    @Inject
+     VMSnapshotDetailsDao vmSnapshotDetailsDao;
+     @Inject
+     SnapshotDataFactory snapshotDataFactory;
  
      private int _totalRetries;
      private int _pauseInterval;