Add Hypervisor default as cache mode for disk offerings

api/src/main/java/com/cloud/offering/DiskOffering.java

@@ -37,7 +37,7 @@
     State getState();
 
     enum DiskCacheMode {
-        NONE("none"), WRITEBACK("writeback"), WRITETHROUGH("writethrough");
+        HYPERVISOR_DEFAULT("hypervisor_default"), NONE("none"), WRITEBACK("writeback"), WRITETHROUGH("writethrough");
 
         private final String _diskCacheMode;
 

core/src/main/java/org/apache/cloudstack/storage/to/VolumeObjectTO.java

@@ -20,6 +20,7 @@
 package org.apache.cloudstack.storage.to;
 
 import com.cloud.agent.api.LogLevel;
+import com.cloud.offering.DiskOffering;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 
 import com.cloud.agent.api.to.DataObjectType;
@@ -112,8 +113,8 @@
         iopsWriteRate = volume.getIopsWriteRate();
         iopsWriteRateMax = volume.getIopsWriteRateMax();
         iopsWriteRateMaxLength = volume.getIopsWriteRateMaxLength();
-        cacheMode = volume.getCacheMode();
         hypervisorType = volume.getHypervisorType();
+        setCacheMode(volume.getCacheMode());
         setDeviceId(volume.getDeviceId());
         this.migrationOptions = volume.getMigrationOptions();
         this.directDownload = volume.isDirectDownload();
@@ -337,6 +338,10 @@
     }
 
     public void setCacheMode(DiskCacheMode cacheMode) {
+        if (DiskCacheMode.HYPERVISOR_DEFAULT.equals(cacheMode) && !Hypervisor.HypervisorType.KVM.equals(hypervisorType)) {
+            this.cacheMode = DiskOffering.DiskCacheMode.NONE;
+            return;
+        }
         this.cacheMode = cacheMode;
     }
 

engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql

@@ -32,5 +32,7 @@ FROM `cloud`.`role_permissions` rp
 WHERE rp.rule = 'quotaStatement'
 AND NOT EXISTS(SELECT 1 FROM cloud.role_permissions rp_ WHERE rp.role_id = rp_.role_id AND rp_.rule = 'quotaCreditsList');
 
-CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.host', 'last_mgmt_server_id', 'bigint unsigned DEFAULT NULL COMMENT "last management server this host is connected to" AFTER `mgmt_server_id`');
+-- Increase the cache_mode column size from cloud.disk_offering table
+CALL `cloud`.`IDEMPOTENT_CHANGE_COLUMN`('cloud.disk_offering', 'cache_mode', 'cache_mode', 'varchar(18) DEFAULT "none" COMMENT "The disk cache mode to use for disks created with this offering"');
 
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.host', 'last_mgmt_server_id', 'bigint unsigned DEFAULT NULL COMMENT "last management server this host is connected to" AFTER `mgmt_server_id`');

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java

@@ -708,7 +708,7 @@ public String toString() {
         }
 
         public enum DiskCacheMode {
-            NONE("none"), WRITEBACK("writeback"), WRITETHROUGH("writethrough");
+            HYPERVISOR_DEFAULT("default"), NONE("none"), WRITEBACK("writeback"), WRITETHROUGH("writethrough");
             String _diskCacheMode;
 
             DiskCacheMode(String cacheMode) {

plugins/storage/volume/adaptive/src/main/java/org/apache/cloudstack/storage/datastore/adapter/ProviderAdapterDiskOffering.java

@@ -34,7 +34,7 @@
             this.type = ProvisioningType.getProvisioningType(hiddenDiskOffering.getProvisioningType().toString());
         }
         if (hiddenDiskOffering.getCacheMode() != null) {
-            this.diskCacheMode = DiskCacheMode.getDiskCasehMode(hiddenDiskOffering.getCacheMode().toString());
+            this.diskCacheMode = DiskCacheMode.getDiskCacheMode(hiddenDiskOffering.getCacheMode().toString());
         }
         if (hiddenDiskOffering.getState() != null) {
             this.state = State.valueOf(hiddenDiskOffering.getState().toString());
@@ -166,7 +166,7 @@
     }
 
     enum DiskCacheMode {
-        NONE("none"), WRITEBACK("writeback"), WRITETHROUGH("writethrough");
+        HYPERVISOR_DEFAULT("hypervisor_default"), NONE("none"), WRITEBACK("writeback"), WRITETHROUGH("writethrough");
 
         private final String _diskCacheMode;
 
@@ -179,13 +179,15 @@
             return _diskCacheMode;
         }
 
-        public static DiskCacheMode getDiskCasehMode(String cacheMode) {
+        public static DiskCacheMode getDiskCacheMode(String cacheMode) {
             if (cacheMode.equals(NONE._diskCacheMode)) {
                 return NONE;
             } else if (cacheMode.equals(WRITEBACK._diskCacheMode)) {
                 return WRITEBACK;
             } else if (cacheMode.equals(WRITETHROUGH._diskCacheMode)) {
                 return WRITETHROUGH;
+            } else if (cacheMode.equals(HYPERVISOR_DEFAULT._diskCacheMode)) {
+                return HYPERVISOR_DEFAULT;
             } else {
                 throw new NotImplementedException("Invalid cache mode specified: " + cacheMode);
             }

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -8061,7 +8061,7 @@ protected void validateCacheMode(String cacheMode){
                 !Enums.getIfPresent(DiskOffering.DiskCacheMode.class,
                         cacheMode.toUpperCase()).isPresent()) {
             throw new InvalidParameterValueException(String.format("Invalid cache mode (%s). Please specify one of the following " +
-                    "valid cache mode parameters: none, writeback or writethrough", cacheMode));
+                    "valid cache mode parameters: none, writeback, writethrough or hypervisor_default.", cacheMode));
         }
     }
 

ui/public/locales/en.json

@@ -1103,6 +1103,7 @@
 "label.hourly": "Hourly",
 "label.hypervisor": "Hypervisor",
 "label.hypervisor.capabilities": "Hypervisor capabilities",
+"label.hypervisor.default": "Hypervisor default",
 "label.hypervisor.type": "Hypervisor type",
 "label.hypervisors": "Hypervisors",
 "label.hypervisorsnapshotreserve": "Hypervisor Snapshot reserve",
@@ -2601,7 +2602,7 @@
 "label.windows": "Windows",
 "label.with.snapshotid": "with Snapshot ID",
 "label.write": "Write",
-"label.writeback": "Write-back disk caching",
+"label.writeback": "Write-back",
 "label.writecachetype": "Write-cache Type",
 "label.writeio": "Write (IO)",
 "label.writethrough": "Write-through",

ui/public/locales/pt_BR.json

@@ -770,6 +770,7 @@
 "label.hourly": "A cada hora",
 "label.hypervisor": "Virtualizador",
 "label.hypervisor.capabilities": "Recursos do virtualizador",
+"label.hypervisor.default": "Padr\u00e3o do virtualizador",
 "label.hypervisor.type": "Tipo do virtualizador",
 "label.hypervisors": "Virtualizadores",
 "label.hypervisorsnapshotreserve": "Reserva de snapshot do virtualizador",
@@ -1812,7 +1813,7 @@
 "label.windows": "Windows",
 "label.with.snapshotid": "com o ID da snapshot",
 "label.write": "Escreva",
-"label.writeback": "Cache de disco write-back",
+"label.writeback": "Write-back",
 "label.writecachetype": "Tipo do cache de escrita",
 "label.writeio": "Escrita (IO)",
 "label.writethrough": "Write-through",

ui/src/views/offering/AddComputeOffering.vue

@@ -409,6 +409,9 @@
                 <a-radio-button value="writethrough">
                   {{ $t('label.writethrough') }}
                 </a-radio-button>
+                <a-radio-button value="hypervisor_default">
+                  {{ $t('label.hypervisor.default') }}
+                </a-radio-button>
               </a-radio-group>
             </a-form-item>
             <a-form-item :label="$t('label.qostype')" name="qostype" ref="qostype">

ui/src/views/offering/AddDiskOffering.vue

@@ -211,6 +211,9 @@
             <a-radio-button value="writethrough">
               {{ $t('label.writethrough') }}
             </a-radio-button>
+            <a-radio-button value="hypervisor_default">
+              {{ $t('label.hypervisor.default') }}
+            </a-radio-button>
           </a-radio-group>
         </a-form-item>
         <a-form-item v-if="isAdmin() || isDomainAdminAllowedToInformTags" name="tags" ref="tags">
@@ -601,7 +604,7 @@ export default {
     width: 80vw;
 
     @media (min-width: 800px) {
-      width: 430px;
+      width: 480px;
     }
   }
 </style>