Stars1233 · pull · May 14, 2025 · Apr 4, 2025 · Apr 4, 2025 · Apr 4, 2025
diff --git a/README.md b/README.md
@@ -31,9 +31,9 @@ You can quickly and easily try out OpenNebula’s functionality by installing [m
 
 ## Installation
 
-You can find more information about OpenNebula’s architecture, installation, configuration and references to configuration files in this [documentation section](https://docs.opennebula.io/stable/deployment/index.html).
+You can find more information about OpenNebula’s architecture, installation, configuration and references to configuration files in this [documentation section](https://docs.opennebula.io/stable/installation_and_configuration/index.html).
 
-It is very useful to learn where [log files of the main OpenNebula components are placed](http://docs.opennebula.io/5.12/deployment/references/log_debug.html). Also check the [reference about the main OpenNebula daemon configuration file](https://docs.opennebula.io/stable/installation_and_configuration/opennebula_services/oned.html).
+It is very useful to learn where [log files of the main OpenNebula components are placed](http://docs.opennebula.io/stable/installation_and_configuration/opennebula_services/troubleshooting.html). Also check the [reference about the main OpenNebula daemon configuration file](https://docs.opennebula.io/stable/installation_and_configuration/opennebula_services/oned.html).
 
 ### Front-end Installation
 

diff --git a/include/Backups.h b/include/Backups.h
@@ -131,11 +131,12 @@ class Backups
      *     - INCREMENTAL_BACKUP_ID
      * @param tmpl Template to parse, the root element must be BACKUP_CONFIG
      * @param can_increment VM disks support incremental backup
+     * @param can_keep_last_increment VM disks support KEEP_LAST for INCREMENT mode
      * @param append Only append new values from tmpl
      * @param error_str Returns the error reason, if any
      * @return 0 success, -1 error
      */
-    int parse(Template *tmpl, bool can_increment,
+    int parse(Template *tmpl, bool can_increment, bool can_keep_last_increment,
               bool append, std::string& error_str);
 
     /**

diff --git a/include/Host.h b/include/Host.h
@@ -239,25 +239,9 @@ class Host : public PoolObjectSQL, public ClusterableSingle
      *    @param sr the capacity request of the VM
      *    @return 0 on success
      */
-    void add_capacity(HostShareCapacity &sr)
-    {
-        if ( vm_collection.add(sr.vmid) == 0 )
-        {
-            host_share.add(sr);
-        }
-        else
-        {
-            std::ostringstream oss;
-            oss << "VM " << sr.vmid << " is already in host " << oid << ".";
+    void add_capacity(HostShareCapacity &sr);
 
-            NebulaLog::log("ONE", Log::ERROR, oss);
-        }
-    };
-
-    bool add_pci(HostShareCapacity &sr)
-    {
-        return host_share.add_pci(sr);
-    }
+    bool add_pci(HostShareCapacity &sr);
 
     /**
      *  Deletes a new VM to the host share by incrementing usage counters
@@ -437,7 +421,7 @@ class Host : public PoolObjectSQL, public ClusterableSingle
     void reserved_capacity(std::string& rcpu, std::string& rmem) const;
 
     /**
-     *  Gets a host template attribuet, if not defined it look for it in the
+     *  Gets a host template attribute, if not defined it look for it in the
      *  cluster template.
      *    @param name of the attribute
      *    @param value of the attribute
@@ -446,7 +430,7 @@ class Host : public PoolObjectSQL, public ClusterableSingle
 
     void update_wilds();
 
-        /* ---------------------------------------------------------------------- */
+    /* ---------------------------------------------------------------------- */
     /* Functions to search for values in the HostXML object                   */
     /* ---------------------------------------------------------------------- */
     /**

diff --git a/include/HostShare.h b/include/HostShare.h
@@ -84,7 +84,7 @@ class HostShare : public ObjectXML
    bool add_pci(HostShareCapacity &sr)
     {
         // NOTE THIS FUNCTION DOES NOT PERFORM ANY ROLLBACK
-        return pci.add(sr.pci, sr.vmid);
+        return pci.add(sr.pci, sr.vmid, sr.vgpu_profile);
     }
 
     /**

diff --git a/include/HostShareCapacity.h b/include/HostShareCapacity.h
@@ -49,6 +49,8 @@ struct HostShareCapacity
     long long mem;
     long long disk;
 
+    std::string vgpu_profile;
+
     std::vector<VectorAttribute *> pci;
 
     VectorAttribute * topology;

diff --git a/include/HostSharePCI.h b/include/HostSharePCI.h
@@ -80,12 +80,13 @@ class HostSharePCI : public Template
      *    @param devs list of requested PCI devices, will include address of
      *    assigned devices.
      *    @param vmid of the VM
+     *    @param hp host/cluster vGPU profile
      *
      *    @return true if the devices where added
      *
      *    NOTE THIS FUNCTION DOES NOT PERFORM ANY ROLLBACK
      */
-    bool add(std::vector<VectorAttribute *> &devs, int vmid);
+    bool add(std::vector<VectorAttribute *> &devs, int vmid, const std::string& hp);
 
     /**
      *  Remove the VM assignment from the PCI device list
@@ -210,7 +211,8 @@ class HostSharePCI : public Template
      *  @param device VM attribute that represents the decive request
      *  @param vmid of the VM
      */
-    bool add_by_name(VectorAttribute *device, int vmid);
+    bool add_by_name(VectorAttribute *device, int vmid,
+            const std::string& vprofile);
 
     /**
      *  Allocates the given VM device using the SHORT_ADDRESS attribute
@@ -219,16 +221,21 @@ class HostSharePCI : public Template
      *
      *  @return pci_id of the allocated device or -1 if not allocated
      */
-    bool add_by_addr(VectorAttribute *device, const std::string& addr, int vmid);
+    bool add_by_addr(VectorAttribute *device, const std::string& addr, int vmid,
+            const std::string& vprofile);

     /**
      *  Adds PCI attributes of the selected PCI to the VM PCI device
      *
+     *  Sets the VGPU profile for NVIDIA cards NOTE: A migration may overwrite
+     *  this value if the new host uses a different profile.
+     *
      *  @param device VM attribute
      *  @param pci Host device
      *  @param sp if true set the "PREVIOUS_ADDRESS" attribute
      */
-    void pci_attribute(VectorAttribute *device, PCIDevice *pci, bool sp);
+    void pci_attribute(VectorAttribute *device, PCIDevice *pci, bool sp,
+            const std::string& vprofile);
 };
 
 #endif /*HOST_SHARE_PCI_H_*/
diff --git a/include/NebulaService.h b/include/NebulaService.h
@@ -150,7 +150,7 @@ class NebulaService
      */
     static std::string code_version()
     {
-        return "6.99.0"; // bump version
+        return "6.99.85"; // bump version
     }
 
     /**

diff --git a/include/Snapshots.h b/include/Snapshots.h
@@ -55,18 +55,26 @@ class Snapshots
      *
      *    - MIXED: Snapshots are children of last snapshot reverted to
      *      |- snap_1 (<--- revert)
-     *         |- snap_2
      *         |- snap_3
+     *         |- snap_4
+     *      |- snap_2
+     *
      *    - FORMAT: Depends on the image format, (used in shared TM)
      *              - for qcow2 -> DENY
      *              - for raw   -> ALLOW
+     *
+     *    - LINEAR: No parent snapshot, in case of revert all younger snapshot are deleted
+     *      |- snap_1
+     *      |- snap_2 (<--- revert, delete snap_3)
+     *      |- snap_3
      */
     enum AllowOrphansMode
     {
         ALLOW  = 0,
         DENY   = 1,
         MIXED  = 2,
-        FORMAT = 3
+        FORMAT = 3,
+        LINEAR = 4
     };
 
     static std::string allow_orphans_mode_to_str(AllowOrphansMode aom)
@@ -77,6 +85,7 @@ class Snapshots
             case DENY:   return "NO";
             case MIXED:  return "MIXED";
             case FORMAT: return "FORMAT";
+            case LINEAR: return "LINEAR";
         }
 
         return "NO";
@@ -96,6 +105,10 @@ class Snapshots
         {
             return FORMAT;
         }
+        else if (aom == "LINEAR")
+        {
+            return LINEAR;
+        }
         else
         {
             return DENY;
@@ -284,6 +297,13 @@ class Snapshots
      */
     std::string snapshot_attribute(int id, const char* name) const;
 
+    AllowOrphansMode orphans_mode() const
+    {
+        return orphans;
+    }
+
+    std::vector<int> get_younger_snapshots(int id) const;
+
 private:
 
     /**

diff --git a/include/VirtualMachineDisk.h b/include/VirtualMachineDisk.h
@@ -307,6 +307,18 @@ class VirtualMachineDisk : public VirtualMachineAttribute
     void delete_snapshot(int snap_id, Template& ds_quota, Template& vm_quota,
                          bool& io, bool& vo);
 
+    /**
+     *  Deletes all younger (bigger snap_id) snapshots
+     *    @param snap_id of the last snapshot to keep
+     *    @param ds_quotas template with snapshot usage for the DS quotas
+     *    @param vm_quotas template with snapshot usage for the VM quotas
+     *    @param io delete ds quotas from image owners
+     *    @param vo delete ds quotas from vm owners
+     */
+    void delete_younger_snapshots(int snap_id, Template& ds_quota, Template& vm_quota,
+        bool& io, bool& vo);
+
+
     /* ---------------------------------------------------------------------- */
     /* Disk resize functions                                                  */
     /* ---------------------------------------------------------------------- */
@@ -824,6 +836,13 @@ class VirtualMachineDisks : public VirtualMachineAttributeSet
      */
     bool backup_increment(bool do_volatile);
 
+    /**
+     *  Returns true if all disks support keep last feature for backups
+     *
+     *  @param do_volatile consider volatile disks
+     */
+    bool backup_keep_last(bool do_volatile);
+
     /**
      *  Returns list of disk IDs, ready for backup
      *
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,7 +150,7 @@ class NebulaService @@
          */
         static std::string code_version()
         {
-            return "6.99.0"; // bump version
+            return "6.99.85"; // bump version
         }
         /**
@@ Expand Down @@