From 0f6a001be699955f2bf14f6323d5b6400358088d Mon Sep 17 00:00:00 2001 From: Brooklyn Dewolf Date: Tue, 30 Apr 2024 14:03:28 +0200 Subject: [PATCH 1/3] Add support for DC/cluster level 4.8 This patch adds support for DC/cluster compatibility level 4.8. Hosts need to be running on libvirt >= 9.5 and qemu-kvm 8.1. Signed-off-by: Brooklyn Dewolf --- .../utils/VersionStorageFormatUtil.java | 1 + .../org/ovirt/engine/core/compat/Version.java | 3 +- packaging/dbscripts/common_sp.sql | 2 +- .../upgrade/pre_upgrade/0000_config.sql | 173 ++++++++++++------ .../ovirt-engine-common/base/core/misc.py | 2 +- 5 files changed, 124 insertions(+), 57 deletions(-) diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VersionStorageFormatUtil.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VersionStorageFormatUtil.java index d700c17fa26..268cf0d341a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VersionStorageFormatUtil.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VersionStorageFormatUtil.java @@ -20,6 +20,7 @@ public class VersionStorageFormatUtil { versionToFormat.put(Version.v4_5, StorageFormatType.V5); versionToFormat.put(Version.v4_6, StorageFormatType.V5); versionToFormat.put(Version.v4_7, StorageFormatType.V5); + versionToFormat.put(Version.v4_8, StorageFormatType.V5); }; private static final Map earliestVersionSupported = new TreeMap<>(); diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java index 4d97138a0e8..6f8b0f85c01 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java @@ -25,8 +25,9 @@ public class Version implements Comparable, Serializable { public static final Version v4_5 = new Version(4, 5); public static final Version v4_6 = new Version(4, 6); public static final Version v4_7 = new Version(4, 7); + public static final Version v4_8 = new Version(4, 8); public static final List ALL = - Collections.unmodifiableList(Arrays.asList(v4_2, v4_3, v4_4, v4_5, v4_6, v4_7)); + Collections.unmodifiableList(Arrays.asList(v4_2, v4_3, v4_4, v4_5, v4_6, v4_7, v4_8)); public static final int VERSION_NOT_SET = -1; public Version(String value) { diff --git a/packaging/dbscripts/common_sp.sql b/packaging/dbscripts/common_sp.sql index 2de90350f11..58d2dfd0017 100644 --- a/packaging/dbscripts/common_sp.sql +++ b/packaging/dbscripts/common_sp.sql @@ -1317,7 +1317,7 @@ RETURNS VARCHAR [] AS $FUNCTION$ BEGIN RETURN -ARRAY ['4.2', '4.3', '4.4', '4.5', '4.6', '4.7']; +ARRAY ['4.2', '4.3', '4.4', '4.5', '4.6', '4.7', '4.8']; END;$FUNCTION$ LANGUAGE plpgsql; diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 4c870d43df5..62b47400a34 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -152,8 +152,8 @@ select fn_db_add_config_value('GlusterPeerStatusRetries', '2', 'general'); select fn_db_add_config_value('GlusterTaskMinWaitForCleanupInMins', '10', 'general'); select fn_db_add_config_value('GlusterRefreshRateHealInfo', '600', 'general'); select fn_db_add_config_value('GlusterUnSyncedEntriesHistoryLimit', '40', 'general'); -select fn_db_add_config_value_for_versions_up_to('LibgfApiSupported', 'false', '4.7'); -select fn_db_add_config_value_for_versions_up_to('UseNativeIOForGluster', 'false', '4.7'); +select fn_db_add_config_value_for_versions_up_to('LibgfApiSupported', 'false', '4.8'); +select fn_db_add_config_value_for_versions_up_to('UseNativeIOForGluster', 'false', '4.8'); select fn_db_add_config_value('GlusterVolumeFreeSpaceThresholdInPercent', '20', 'general'); select fn_db_add_config_value('StorageDeviceSpaceLimit', '90', 'general'); @@ -175,29 +175,29 @@ select fn_db_add_config_value('HighUtilizationForEvenlyDistribute','75','general select fn_db_add_config_value('HighUtilizationForPowerSave','75','general'); select fn_db_add_config_value('HostPreparingForMaintenanceIdleTime', '300', 'general'); select fn_db_add_config_value('HostTimeDriftInSec','300','general'); -select fn_db_add_config_value_for_versions_up_to('HotPlugCpuSupported','{"x86":"true","ppc":"true","s390x":"true"}', '4.7'); -select fn_db_add_config_value_for_versions_up_to('HotUnplugCpuSupported', '{"x86":"true","ppc":"true","s390x":"false"}', '4.7'); -select fn_db_add_config_value_for_versions_up_to('HotPlugMemorySupported', '{"x86":"true","ppc":"true","s390x":"false"}', '4.7'); +select fn_db_add_config_value_for_versions_up_to('HotPlugCpuSupported','{"x86":"true","ppc":"true","s390x":"true"}', '4.8'); +select fn_db_add_config_value_for_versions_up_to('HotUnplugCpuSupported', '{"x86":"true","ppc":"true","s390x":"false"}', '4.8'); +select fn_db_add_config_value_for_versions_up_to('HotPlugMemorySupported', '{"x86":"true","ppc":"true","s390x":"false"}', '4.8'); select fn_db_add_config_value('MaxMemorySlots','16','general'); select fn_db_add_config_value('HotPlugMemoryMultiplicationSizeMb','256','general'); -select fn_db_add_config_value_for_versions_up_to('HotUnplugMemorySupported', '{"x86":"true","ppc":"true","s390x":"false"}', '4.7'); +select fn_db_add_config_value_for_versions_up_to('HotUnplugMemorySupported', '{"x86":"true","ppc":"true","s390x":"false"}', '4.8'); select fn_db_add_config_value_for_versions_up_to('CopyPreallocatedFileBasedDiskSupported', 'false', '4.2'); -select fn_db_add_config_value_for_versions_up_to('CopyPreallocatedFileBasedDiskSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('CopyPreallocatedFileBasedDiskSupported', 'true', '4.8'); select fn_db_add_config_value_for_versions_up_to('ManagedBlockDomainSupported', 'false', '4.5'); -select fn_db_add_config_value_for_versions_up_to('ManagedBlockDomainSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('ManagedBlockDomainSupported', 'true', '4.8'); -- migration support per architecture -select fn_db_add_config_value_for_versions_up_to('IsMigrationSupported','{"undefined": "true", "x86": "true", "ppc" : "true", "s390x" : "true"}','4.7'); +select fn_db_add_config_value_for_versions_up_to('IsMigrationSupported','{"undefined": "true", "x86": "true", "ppc" : "true", "s390x" : "true"}','4.8'); -- snapshot support per architecture -select fn_db_add_config_value_for_versions_up_to('IsMemorySnapshotSupported','{"undefined": "true", "x86": "true", "ppc" : "true", "s390x" : "true"}','4.7'); +select fn_db_add_config_value_for_versions_up_to('IsMemorySnapshotSupported','{"undefined": "true", "x86": "true", "ppc" : "true", "s390x" : "true"}','4.8'); -- suspend support per architecture -select fn_db_add_config_value_for_versions_up_to('IsSuspendSupported','{"undefined": "true", "x86": "true", "ppc" : "true", "s390x" : "true"}','4.7'); +select fn_db_add_config_value_for_versions_up_to('IsSuspendSupported','{"undefined": "true", "x86": "true", "ppc" : "true", "s390x" : "true"}','4.8'); select fn_db_add_config_value('OsRepositoryConfDir','/osinfo.conf.d','general'); select fn_db_add_config_value('IterationsWithBalloonProblem','3','general'); select fn_db_add_config_value('DefaultSysprepLocale','en_US','general'); -- default requirement for rng sources (empty string by default, additional legal value is 'HWRNG') -select fn_db_add_config_value_for_versions_up_to('ClusterRequiredRngSourcesDefault', '', '4.7'); +select fn_db_add_config_value_for_versions_up_to('ClusterRequiredRngSourcesDefault', '', '4.8'); -- The internal between checking for new updates availability for the host select fn_db_add_config_value('HostPackagesUpdateTimeInHours','24','general'); @@ -312,7 +312,7 @@ select fn_db_add_config_value('IPTablesConfigForVirt', select fn_db_add_config_value_for_versions_up_to('ipv6IscsiSupported', 'false', '4.2'); -select fn_db_add_config_value_for_versions_up_to('ipv6IscsiSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('ipv6IscsiSupported', 'true', '4.8'); select fn_db_add_config_value('IPTablesConfigSiteCustom','','general'); select fn_db_add_config_value('IsMultilevelAdministrationOn','true','general'); select fn_db_add_config_value('JobCleanupRateInMinutes','10','general'); @@ -332,13 +332,13 @@ select fn_db_add_config_value('DefaultManagementNetwork','ovirtmgmt','general'); select fn_db_add_config_value('MaxAuditLogMessageLength','10000','general'); select fn_db_add_config_value('MaxBlockDiskSizeInGibiBytes','8192','general'); select fn_db_add_config_value('MaxNumberOfHostsInStoragePool','250','general'); -select fn_db_add_config_value_for_versions_up_to('MaxNumOfCpuPerSocket', '254', '4.7'); -select fn_db_add_config_value_for_versions_up_to('MaxNumOfThreadsPerCpu', '8', '4.7'); +select fn_db_add_config_value_for_versions_up_to('MaxNumOfCpuPerSocket', '254', '4.8'); +select fn_db_add_config_value_for_versions_up_to('MaxNumOfThreadsPerCpu', '8', '4.8'); select fn_db_add_config_value_for_versions_up_to('MaxNumOfVmCpus', '{"x86":384,"ppc":384,"s390x":384}', '4.4'); select fn_db_add_config_value('MaxNumOfVmCpus', '{"x86":512,"ppc":384,"s390x":384}', '4.5'); -select fn_db_add_config_value_for_versions_up_to('MaxNumOfVmCpus', '{"x86":710,"ppc":384,"s390x":384}', '4.7'); +select fn_db_add_config_value_for_versions_up_to('MaxNumOfVmCpus', '{"x86":710,"ppc":384,"s390x":384}', '4.8'); select fn_db_add_config_value_for_versions_up_to('MaxNumOfVmSockets', '16', '4.5'); -select fn_db_add_config_value_for_versions_up_to('MaxNumOfVmSockets', '10000', '4.7'); +select fn_db_add_config_value_for_versions_up_to('MaxNumOfVmSockets', '10000', '4.8'); select fn_db_add_config_value('MaxNumOfCpusCoefficient', '2', 'general'); select fn_db_add_config_value('ManyVmCpus', '128', 'general'); select fn_db_add_config_value('UefiBigVmMemoryGB', '16', 'general'); @@ -364,7 +364,7 @@ select fn_db_add_config_value('SpeedOptimizationSchedulingThreshold','10','gener select fn_db_add_config_value('SchedulerAllowOverBooking','false','general'); select fn_db_add_config_value('SchedulerOverBookingThreshold','10','general'); select fn_db_add_config_value_for_versions_up_to('IgnoreVmToVmAffinityForHostMaintenance', 'false', '4.2'); -select fn_db_add_config_value_for_versions_up_to('IgnoreVmToVmAffinityForHostMaintenance', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('IgnoreVmToVmAffinityForHostMaintenance', 'true', '4.8'); select fn_db_add_config_value('UploadFileMaxTimeInMinutes','5','general'); select fn_db_add_config_value('RetrieveDataMaxTimeInMinutes','5','general'); select fn_db_add_config_value('StorageDomainOvfStoreCount','2','general'); @@ -579,6 +579,39 @@ select fn_db_add_config_value('ServerCPUList', || '4:IBM z14:sie,model_z14-base:z14-base:s390x;', '4.7'); +select fn_db_add_config_value('ServerCPUList', + '1:Intel Nehalem Family:vmx,nx,model_Nehalem:Nehalem:x86_64; ' + || '2:Secure Intel Nehalem Family:vmx,spec_ctrl,ssbd,model_Nehalem:Nehalem,+spec-ctrl,+ssbd:x86_64; ' + || '3:Intel Westmere Family:aes,vmx,nx,model_Westmere:Westmere:x86_64; ' + || '4:Secure Intel Westmere Family:aes,vmx,spec_ctrl,ssbd,model_Westmere:Westmere,+pcid,+spec-ctrl,+ssbd:x86_64; ' + || '5:Intel SandyBridge Family:vmx,nx,model_SandyBridge:SandyBridge:x86_64; ' + || '6:Secure Intel SandyBridge Family:vmx,spec_ctrl,ssbd,md_clear,model_SandyBridge:SandyBridge,+pcid,+spec-ctrl,+ssbd,+md-clear:x86_64; ' + || '7:Intel IvyBridge Family:vmx,nx,model_IvyBridge:IvyBridge:x86_64; ' + || '8:Secure Intel IvyBridge Family:vmx,spec_ctrl,ssbd,md_clear,model_IvyBridge:IvyBridge,+pcid,+spec-ctrl,+ssbd,+md-clear:x86_64; ' + || '9:Intel Haswell Family:vmx,nx,model_Haswell-noTSX:Haswell-noTSX:x86_64; ' + || '10:Secure Intel Haswell Family:vmx,spec_ctrl,ssbd,md_clear,model_Haswell-noTSX:Haswell-noTSX,+spec-ctrl,+ssbd,+md-clear:x86_64; ' + || '11:Intel Broadwell Family:vmx,nx,model_Broadwell-noTSX:Broadwell-noTSX:x86_64; ' + || '12:Secure Intel Broadwell Family:vmx,spec_ctrl,ssbd,md_clear,model_Broadwell-noTSX:Broadwell-noTSX,+spec-ctrl,+ssbd,+md-clear:x86_64; ' + || '13:Intel Skylake Client Family:vmx,nx,model_Skylake-Client:Skylake-Client,-hle,-rtm,-mpx:x86_64; ' + || '14:Secure Intel Skylake Client Family:vmx,ssbd,md_clear,model_Skylake-Client-noTSX-IBRS:Skylake-Client-noTSX-IBRS,+ssbd,+md-clear,-mpx:x86_64; ' + || '15:Intel Skylake Server Family:vmx,nx,model_Skylake-Server:Skylake-Server,-hle,-rtm,-mpx:x86_64; ' + || '16:Secure Intel Skylake Server Family:vmx,ssbd,md_clear,model_Skylake-Server-noTSX-IBRS:Skylake-Server-noTSX-IBRS,+ssbd,+md-clear,-mpx:x86_64; ' + || '17:Intel Cascadelake Server Family:vmx,model_Cascadelake-Server:Cascadelake-Server,-hle,-rtm,-mpx:x86_64; ' + || '18:Secure Intel Cascadelake Server Family:vmx,model_Cascadelake-Server-noTSX:Cascadelake-Server-noTSX,-mpx:x86_64; ' + || '19:Intel Icelake Server Family:vmx,model_Icelake-Server-noTSX:Icelake-Server-noTSX,-mpx:x86_64; ' + || '20:Secure Intel Icelake Server Family:vmx,arch-capabilities,rdctl-no,ibrs-all,skip-l1dfl-vmentry,mds-no,pschange-mc-no,model_Icelake-Server-noTSX:Icelake-Server-noTSX,+arch-capabilities,+rdctl-no,+ibrs-all,+skip-l1dfl-vmentry,+mds-no,+pschange-mc-no,-mpx:x86_64; ' + || '1:AMD Opteron G4:svm,nx,model_Opteron_G4:Opteron_G4:x86_64; ' + || '2:AMD Opteron G5:svm,nx,model_Opteron_G5:Opteron_G5:x86_64; ' + || '3:AMD EPYC:svm,nx,model_EPYC:EPYC:x86_64; ' + || '4:Secure AMD EPYC:svm,nx,ibpb,ssbd,model_EPYC:EPYC,+ibpb,+virt-ssbd:x86_64; ' + || '1:IBM POWER8:powernv,model_POWER8:POWER8:ppc64; ' + || '2:IBM POWER9:powernv,model_POWER9:POWER9:ppc64; ' + || '1:IBM z114, z196:sie,model_z196-base:z196-base:s390x; ' + || '2:IBM zBC12, zEC12:sie,model_zEC12-base:zEC12-base:s390x; ' + || '3:IBM z13s, z13:sie,model_z13-base:z13-base:s390x; ' + || '4:IBM z14:sie,model_z14-base:z14-base:s390x;', + '4.8'); + select fn_db_add_config_value('ServerRebootTimeout','600','general'); select fn_db_add_config_value('SetupNetworksPollingTimeout','3','general'); select fn_db_add_config_value('SignCertTimeoutInSeconds','30','general'); @@ -629,7 +662,7 @@ select fn_db_add_config_value('EventProcessingPoolSize','10','general'); select fn_db_add_config_value('EventPurgeTimeoutInHours','3','general'); select fn_db_add_config_value('TimeToReduceFailedRunOnVdsInMinutes','30','general'); select fn_db_add_config_value('UnknownTaskPrePollingLapse','60000','general'); -select fn_db_add_config_value_for_versions_up_to('UserDefinedVMProperties', '','4.7'); +select fn_db_add_config_value_for_versions_up_to('UserDefinedVMProperties', '','4.8'); select fn_db_add_config_value('UserSessionTimeOutInterval','30','general'); select fn_db_add_config_value('UtilizationThresholdInPercent','80','general'); select fn_db_add_config_value('ValidNumOfMonitors','1,2,4','general'); @@ -654,11 +687,11 @@ select fn_db_add_config_value('vdsTimeout','180','general'); select fn_db_add_config_value('WindowsGuestAgentUpdateCheckInternal', '180', 'general'); select fn_db_add_config_value('VdsCertificateValidityInDays','1827','general'); --Handling Virtual Machine Domain Name -select fn_db_add_config_value_for_versions_up_to('VM32BitMaxMemorySizeInMB','20480','4.7'); +select fn_db_add_config_value_for_versions_up_to('VM32BitMaxMemorySizeInMB','20480','4.8'); select fn_db_add_config_value_for_versions_up_to('VM64BitMaxMemorySizeInMB','6291456','4.5'); -select fn_db_add_config_value_for_versions_up_to('VM64BitMaxMemorySizeInMB','16777216','4.7'); +select fn_db_add_config_value_for_versions_up_to('VM64BitMaxMemorySizeInMB','16777216','4.8'); select fn_db_add_config_value_for_versions_up_to('VMPpc64BitMaxMemorySizeInMB', '1048576', '4.3'); -select fn_db_add_config_value_for_versions_up_to('VMPpc64BitMaxMemorySizeInMB', '6291456', '4.7'); +select fn_db_add_config_value_for_versions_up_to('VMPpc64BitMaxMemorySizeInMB', '6291456', '4.8'); select fn_db_add_config_value('VmGracefulShutdownMessage','System Administrator has initiated shutdown of this Virtual Machine. Virtual Machine is shutting down.','general'); select fn_db_add_config_value('VmGracefulShutdownTimeout','30','general'); --Number of subsequent failures in VM creation in a pool before giving up and stop creating new VMs @@ -711,11 +744,11 @@ select fn_db_add_config_value('LogMaxCpuUsedThresholdInPercentage', '95', 'gener select fn_db_add_config_value('LogMaxNetworkUsedThresholdInPercentage', '95', 'general'); -- Allow to specify SecurityGroups property for vNICs, containing either an empty string or a list of one or more comma-separated UUIDs. -select fn_db_add_config_value_for_versions_up_to('CustomDeviceProperties', '{type=interface;prop={SecurityGroups=^(?:(?:[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}, *)*[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}|)$}}', '4.7'); +select fn_db_add_config_value_for_versions_up_to('CustomDeviceProperties', '{type=interface;prop={SecurityGroups=^(?:(?:[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}, *)*[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}|)$}}', '4.8'); -- Network Custom Properties -select fn_db_add_config_value_for_versions_up_to('PreDefinedNetworkCustomProperties', $q$bridge_opts=^[^\s=]+=[^\s=]+(\s+[^\s=]+=[^\s=]+)*$$q$, '4.7'); -- tag prevents psql from escaping backslashes ('q' is arbitrary) -select fn_db_add_config_value_for_versions_up_to('UserDefinedNetworkCustomProperties', '', '4.7'); +select fn_db_add_config_value_for_versions_up_to('PreDefinedNetworkCustomProperties', $q$bridge_opts=^[^\s=]+=[^\s=]+(\s+[^\s=]+=[^\s=]+)*$$q$, '4.8'); -- tag prevents psql from escaping backslashes ('q' is arbitrary) +select fn_db_add_config_value_for_versions_up_to('UserDefinedNetworkCustomProperties', '', '4.8'); --attestation configuration select fn_db_add_config_value('SecureConnectionWithOATServers','true','general'); @@ -790,7 +823,7 @@ select fn_db_add_config_value('DefaultMigrationEncryption','false','general'); -- Keep the ids and names in sync with front end LocalizedMigrationPolicies.properties. The descriptions have been moved there select fn_db_add_config_value_for_versions_up_to('MigrationPolicies','[{"id":{"uuid":"80554327-0569-496b-bdeb-fcbbf52b827b"},"maxMigrations":2,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"name":"Minimal downtime","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["300"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["500"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"abort","params":[]}]}},{"id":{"uuid":"80554327-0569-496b-bdeb-fcbbf52b827c"},"maxMigrations":1,"autoConvergence":true,"migrationCompression":true,"enableGuestEvents":true,"name":"Suspend workload if needed","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["300"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["500"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"setDowntime","params":["5000"]},{"action":"abort","params":[]}]}},{"id":{"uuid":"a7aeedb2-8d66-4e51-bb22-32595027ce71"},"maxMigrations":2,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"name":"Post-copy migration","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"postcopy","params":[]},{"action":"abort","params":[]}]}}]','4.6'); -select fn_db_add_config_value_for_versions_up_to('MigrationPolicies','[{"id":{"uuid":"80554327-0569-496b-bdeb-fcbbf52b827b"},"maxMigrations":2,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"name":"Minimal downtime","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["300"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["500"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"abort","params":[]}]}},{"id":{"uuid":"80554327-0569-496b-bdeb-fcbbf52b827c"},"maxMigrations":1,"autoConvergence":true,"migrationCompression":true,"enableGuestEvents":true,"name":"Suspend workload if needed","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["300"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["500"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"setDowntime","params":["5000"]},{"action":"abort","params":[]}]}},{"id":{"uuid":"a7aeedb2-8d66-4e51-bb22-32595027ce71"},"maxMigrations":2,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"name":"Post-copy migration","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"postcopy","params":[]},{"action":"abort","params":[]}]}},{"id":{"uuid":"57237b82-b8c2-425f-b425-114b35219626"},"maxMigrations":1,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"zeroCopy":true,"name":"Very large VMs","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["500"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["700"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["1000"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["1500"]}}],"initialItems":[{"action":"setDowntime","params":["300"]}],"lastItems":[{"action":"setDowntime","params":["5000"]},{"action":"abort","params":[]}]}}]','4.7'); +select fn_db_add_config_value_for_versions_up_to('MigrationPolicies','[{"id":{"uuid":"80554327-0569-496b-bdeb-fcbbf52b827b"},"maxMigrations":2,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"name":"Minimal downtime","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["300"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["500"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"abort","params":[]}]}},{"id":{"uuid":"80554327-0569-496b-bdeb-fcbbf52b827c"},"maxMigrations":1,"autoConvergence":true,"migrationCompression":true,"enableGuestEvents":true,"name":"Suspend workload if needed","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["300"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["500"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"setDowntime","params":["5000"]},{"action":"abort","params":[]}]}},{"id":{"uuid":"a7aeedb2-8d66-4e51-bb22-32595027ce71"},"maxMigrations":2,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"name":"Post-copy migration","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"postcopy","params":[]},{"action":"abort","params":[]}]}},{"id":{"uuid":"57237b82-b8c2-425f-b425-114b35219626"},"maxMigrations":1,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"zeroCopy":true,"name":"Very large VMs","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["500"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["700"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["1000"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["1500"]}}],"initialItems":[{"action":"setDowntime","params":["300"]}],"lastItems":[{"action":"setDowntime","params":["5000"]},{"action":"abort","params":[]}]}}]','4.8'); -- Hosted Engine select fn_db_add_config_value('HostedEngineVmName','HostedEngine','general'); @@ -815,11 +848,11 @@ select fn_db_add_config_value('UploadImageXhrMaxRetries','3','general'); select fn_db_add_config_value('ForceRefreshDomainFilesListByDefault','true','general'); select fn_db_add_config_value_for_versions_up_to('CustomBondNameSupported', 'false', '4.2'); -select fn_db_add_config_value_for_versions_up_to('CustomBondNameSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('CustomBondNameSupported', 'true', '4.8'); -- BIOS Type select fn_db_add_config_value_for_versions_up_to('BiosTypeSupported', 'false', '4.2'); -select fn_db_add_config_value_for_versions_up_to('BiosTypeSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('BiosTypeSupported', 'true', '4.8'); -- Live Snapshot select fn_db_add_config_value('LiveSnapshotTimeoutInMinutes', '30', 'general'); @@ -832,9 +865,9 @@ select fn_db_add_config_value('VirtioWinIsoPath','/usr/share/virtio-win','genera -- vGPU select fn_db_add_config_value_for_versions_up_to('VgpuPlacementSupported', 'false', '4.2'); -select fn_db_add_config_value_for_versions_up_to('VgpuPlacementSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('VgpuPlacementSupported', 'true', '4.8'); select fn_db_add_config_value_for_versions_up_to('VgpuFramebufferSupported', 'false', '4.4'); -select fn_db_add_config_value_for_versions_up_to('VgpuFramebufferSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('VgpuFramebufferSupported', 'true', '4.8'); -- engine-backup @@ -844,7 +877,7 @@ select fn_db_add_config_value('DbJustRestored','0','general'); select fn_db_add_config_value('PredefinedVMProperties', 'sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_]*):(true|false))(,(([a-zA-Z0-9_]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$;hugepages=^[0-9]+$', '4.2'); select fn_db_add_config_value('PredefinedVMProperties', 'sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_]*):(true|false))(,(([a-zA-Z0-9_]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$;hugepages=^[0-9]+$', '4.3'); select fn_db_add_config_value_for_versions_up_to('PredefinedVMProperties', 'sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_-]*):(true|false))(,(([a-zA-Z0-9_-]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$;hugepages=^[0-9]+$;scsi_hostdev=^(scsi_generic|scsi_block|scsi_hd|virtio_blk_pci)$;nvram_template=^.*$', '4.5'); -select fn_db_add_config_value_for_versions_up_to('PredefinedVMProperties', 'sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_-]*):(true|false))(,(([a-zA-Z0-9_-]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$;hugepages=^[0-9]+$;scsi_hostdev=^(scsi_generic|scsi_block|scsi_hd|virtio_blk_pci)$;nvram_template=^.*$;extra_cpu_flags=^([+-]?[a-zA-Z0-9_-]+)(,[+-]?[a-zA-Z0-9_-]+)*$', '4.7'); +select fn_db_add_config_value_for_versions_up_to('PredefinedVMProperties', 'sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_-]*):(true|false))(,(([a-zA-Z0-9_-]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$;hugepages=^[0-9]+$;scsi_hostdev=^(scsi_generic|scsi_block|scsi_hd|virtio_blk_pci)$;nvram_template=^.*$;extra_cpu_flags=^([+-]?[a-zA-Z0-9_-]+)(,[+-]?[a-zA-Z0-9_-]+)*$', '4.8'); -- Host monitoring watchdog select fn_db_add_config_value('HostMonitoringWatchdogIntervalInSeconds','900','general'); @@ -905,47 +938,47 @@ select fn_db_add_config_value('VMConsoleTicketTolerance', '10000', 'general'); select fn_db_add_config_value_for_versions_up_to('SpiceSecureChannels', 'smain,sinputs,scursor,splayback,srecord,sdisplay,ssmartcard,susbredir', - '4.7'); + '4.8'); select fn_db_add_config_value_for_versions_up_to('SshHostRebootCommand', 'systemctl reboot', - '4.7'); -select fn_db_add_config_value_for_versions_up_to('SshSoftFencingCommand', '/usr/bin/vdsm-tool service-restart vdsmd', '4.7'); -select fn_db_add_config_value_for_versions_up_to('SshVdsPowerdownCommand', '/sbin/poweroff', '4.7'); + '4.8'); +select fn_db_add_config_value_for_versions_up_to('SshSoftFencingCommand', '/usr/bin/vdsm-tool service-restart vdsmd', '4.8'); +select fn_db_add_config_value_for_versions_up_to('SshVdsPowerdownCommand', '/sbin/poweroff', '4.8'); select fn_db_add_config_value_for_versions_up_to('VdsFenceOptionMapping', 'apc:secure=secure,port=ipport,slot=port;apc_snmp:port=port,encrypt_options=encrypt_options;bladecenter:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;drac5:secure=secure,slot=port;drac7:;eps:slot=port;hpblade:port=port;ilo:secure=ssl,port=ipport;ipmilan:;ilo2:secure=ssl,port=ipport;ilo3:;ilo4:;ilo_ssh:port=port;redfish:port=ipport,secure=ssl;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port', - '4.7'); + '4.8'); select fn_db_add_config_value_for_versions_up_to('VdsFenceType', 'apc,apc_snmp,bladecenter,cisco_ucs,drac5,drac7,eps,hpblade,ilo,ilo2,ilo3,ilo4,ilo_ssh,ipmilan,redfish,rsa,rsb,wti', - '4.7'); + '4.8'); select fn_db_add_config_value_for_versions_up_to('ScsiReservationSupported', 'false', '4.2'); -select fn_db_add_config_value_for_versions_up_to('ScsiReservationSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('ScsiReservationSupported', 'true', '4.8'); select fn_db_add_config_value('AlwaysFilterResultsForWebUi', 'false', 'general'); select fn_db_add_config_value('EnableKASLRDump','true','general'); select fn_db_add_config_value('GuestNicNamesBlacklist','lo[0-9]*,Loopback.*,tun[0-9]*,veth[0-9a-f]*','general'); select fn_db_add_config_value_for_versions_up_to('HyperVSynicStimerSupported', 'false', '4.2'); -select fn_db_add_config_value_for_versions_up_to('HyperVSynicStimerSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('HyperVSynicStimerSupported', 'true', '4.8'); select fn_db_add_config_value_for_versions_up_to('IsDeferringFileVolumePreallocationSupported', 'false', '4.2'); -select fn_db_add_config_value_for_versions_up_to('IsDeferringFileVolumePreallocationSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('IsDeferringFileVolumePreallocationSupported', 'true', '4.8'); select fn_db_add_config_value_for_versions_up_to('IsPortIsolationSupported', 'false', '4.4'); -select fn_db_add_config_value_for_versions_up_to('IsPortIsolationSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('IsPortIsolationSupported', 'true', '4.8'); select fn_db_add_config_value_for_versions_up_to('TpmDeviceSupported', '{"x86":"false","ppc":"false","s390x":"false"}', '4.5'); -select fn_db_add_config_value_for_versions_up_to('TpmDeviceSupported', '{"x86":"true","ppc":"true","s390x":"false"}', '4.7'); +select fn_db_add_config_value_for_versions_up_to('TpmDeviceSupported', '{"x86":"true","ppc":"true","s390x":"false"}', '4.8'); select fn_db_add_config_value_for_versions_up_to('NvramPersistenceSupported', 'false', '4.5'); -select fn_db_add_config_value_for_versions_up_to('NvramPersistenceSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('NvramPersistenceSupported', 'true', '4.8'); select fn_db_add_config_value_for_versions_up_to('EnableBochsDisplay','false','4.5'); -select fn_db_add_config_value_for_versions_up_to('EnableBochsDisplay','true','4.7'); +select fn_db_add_config_value_for_versions_up_to('EnableBochsDisplay','true','4.8'); select fn_db_add_config_value_for_versions_up_to('VirtioVgaSupported','false','4.6'); -select fn_db_add_config_value_for_versions_up_to('VirtioVgaSupported','true','4.7'); +select fn_db_add_config_value_for_versions_up_to('VirtioVgaSupported','true','4.8'); select fn_db_add_config_value_for_versions_up_to('ParallelMigrationsSupported', 'false', '4.6'); -select fn_db_add_config_value_for_versions_up_to('ParallelMigrationsSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('ParallelMigrationsSupported', 'true', '4.8'); select fn_db_add_config_value_for_versions_up_to('IsDedicatedSupported', 'false', '4.6'); -select fn_db_add_config_value_for_versions_up_to('IsDedicatedSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('IsDedicatedSupported', 'true', '4.8'); -- Incremental backup select fn_db_add_config_value_for_versions_up_to('IsIncrementalBackupSupported', 'false', '4.4'); -select fn_db_add_config_value_for_versions_up_to('IsIncrementalBackupSupported', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('IsIncrementalBackupSupported', 'true', '4.8'); select fn_db_add_config_value_for_versions_up_to('UseHybridBackup', 'false', '4.6'); -select fn_db_add_config_value_for_versions_up_to('UseHybridBackup', 'true', '4.7'); +select fn_db_add_config_value_for_versions_up_to('UseHybridBackup', 'true', '4.8'); select fn_db_add_config_value('SucceededBackupCleanupTimeInMinutes','15','general'); select fn_db_add_config_value('FailedBackupCleanupTimeInMinutes','30','general'); select fn_db_add_config_value('SucceededImageTransferCleanupTimeInMinutes','15','general'); @@ -962,7 +995,7 @@ select fn_db_add_config_value('NumOfPciExpressPorts', '16', 'general'); select fn_db_add_config_value('SetupNetworksWaitTimeoutSeconds', '20', 'general'); -- Sku -> Version mapping for Windows Update -select fn_db_add_config_value_for_versions_up_to('SkuToAVLevel', '', '4.7'); +select fn_db_add_config_value_for_versions_up_to('SkuToAVLevel', '', '4.8'); -- UUID of this oVirt instance select fn_db_add_config_value('InstanceId', uuid_generate_v1()::varchar, 'general'); @@ -1107,7 +1140,7 @@ select fn_db_update_config_value('ClusterEmulatedMachines','pc-i440fx-rhel7.6.0, select fn_db_update_config_value('ClusterEmulatedMachines','pc-q35-rhel8.1.0,pc-q35-4.1,pc-i440fx-rhel7.6.0,pc-i440fx-2.12,pseries-rhel8.1.0,s390-ccw-virtio-2.12','4.4'); select fn_db_update_config_value('ClusterEmulatedMachines','pc-q35-rhel8.3.0,pc-q35-4.1,pc-i440fx-rhel7.6.0,pc-i440fx-2.12,pseries-rhel8.3.0,s390-ccw-virtio-2.12','4.5'); select fn_db_update_config_value('SpiceDriverNameInGuest','{"windows": "RHEV-Spice", "linux" : "xorg-x11-drv-qxl" }','general'); -select fn_db_update_config_value('SupportedClusterLevels','4.2,4.3,4.4,4.5,4.6,4.7','general'); +select fn_db_update_config_value('SupportedClusterLevels','4.2,4.3,4.4,4.5,4.6,4.7,4.8','general'); select fn_db_update_config_value('SupportedVDSMVersions','4.20,4.30,4.40,4.50','general'); select fn_db_update_config_value('VdcVersion','4.4.0.0','general'); -- ProductRPMVersion is automatically updated by engine-setup, @@ -1115,7 +1148,7 @@ select fn_db_update_config_value('VdcVersion','4.4.0.0','general'); select fn_db_update_config_value('ProductRPMVersion','4.4.0.0','general'); select fn_db_update_config_value_for_versions_from_up_to('VdsFenceOptionMapping','amt_ws:port=ipport;apc:secure=secure,port=ipport,slot=port;apc_snmp:port=port,encrypt_options=encrypt_options;bladecenter:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;drac5:secure=secure,slot=port;drac7:;eps:slot=port;hpblade:port=port;ilo:secure=ssl,port=ipport;ipmilan:;ilo2:secure=ssl,port=ipport;ilo3:;ilo4:;ilo_ssh:port=port;redfish:port=ipport,secure=ssl;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port', '4.2', '4.3'); select fn_db_update_config_value_for_versions_from_up_to('VdsFenceOptionMapping', 'amt_ws:port=ipport;apc:secure=secure,port=ipport,slot=port;apc_snmp:port=port,encrypt_options=encrypt_options;bladecenter:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;drac5:secure=secure,slot=port;drac7:;eps:slot=port;hpblade:port=port;ilo:secure=ssl,port=ipport;ipmilan:port=ipport;ilo2:secure=ssl,port=ipport;ilo3:;ilo4:;ilo_ssh:port=port;redfish:port=ipport,secure=ssl;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port', '4.4', '4.7'); -select fn_db_update_config_value_for_versions_from_up_to('VdsFenceType', 'amt_ws,apc,apc_snmp,bladecenter,cisco_ucs,drac5,drac7,eps,hpblade,ilo,ilo2,ilo3,ilo4,ilo_ssh,ipmilan,redfish,rsa,rsb,wti','4.2','4.7'); +select fn_db_update_config_value_for_versions_from_up_to('VdsFenceType', 'amt_ws,apc,apc_snmp,bladecenter,cisco_ucs,drac5,drac7,eps,hpblade,ilo,ilo2,ilo3,ilo4,ilo_ssh,ipmilan,redfish,rsa,rsb,wti','4.2','4.8'); select fn_db_update_config_value('VdsRefreshRate','3','general'); select fn_db_update_config_value('VmGracefulShutdownMessage','System Administrator has initiated shutdown of this Virtual Machine. Virtual Machine is shutting down.','general'); select fn_db_update_config_value('AgentAppName','ovirt-guest-agent-common,ovirt-guest-agent','general'); @@ -1134,7 +1167,7 @@ select fn_db_update_config_value('HotUnplugCpuSupported', '{"x86":"true","ppc":" select fn_db_update_config_value('PredefinedVMProperties', 'sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_]*):(true|false))(,(([a-zA-Z0-9_]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$;hugepages=^[0-9]+$', '4.2'); select fn_db_update_config_value('PredefinedVMProperties', 'sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_]*):(true|false))(,(([a-zA-Z0-9_]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$;hugepages=^[0-9]+$', '4.3'); select fn_db_update_config_value_for_versions_from_up_to('PredefinedVMProperties', 'sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_-]*):(true|false))(,(([a-zA-Z0-9_-]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$;hugepages=^[0-9]+$;scsi_hostdev=^(scsi_generic|scsi_block|scsi_hd|virtio_blk_pci)$;nvram_template=^.*$', '4.4','4.5'); -select fn_db_update_config_value_for_versions_from_up_to('PredefinedVMProperties', 'sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_-]*):(true|false))(,(([a-zA-Z0-9_-]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$;hugepages=^[0-9]+$;scsi_hostdev=^(scsi_generic|scsi_block|scsi_hd|virtio_blk_pci)$;nvram_template=^.*$;extra_cpu_flags=^([+-]?[a-zA-Z0-9_-]+)(,[+-]?[a-zA-Z0-9_-]+)*$', '4.6', '4.7'); +select fn_db_update_config_value_for_versions_from_up_to('PredefinedVMProperties', 'sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_-]*):(true|false))(,(([a-zA-Z0-9_-]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$;hugepages=^[0-9]+$;scsi_hostdev=^(scsi_generic|scsi_block|scsi_hd|virtio_blk_pci)$;nvram_template=^.*$;extra_cpu_flags=^([+-]?[a-zA-Z0-9_-]+)(,[+-]?[a-zA-Z0-9_-]+)*$', '4.6', '4.8'); select fn_db_update_config_value('HotPlugMemorySupported','{"x86":"true","ppc":"true","s390x":"false"}', '4.2'); select fn_db_update_config_value('HotUnplugMemorySupported','{"x86":"true","ppc":"true","s390x":"false"}','4.2'); @@ -1354,6 +1387,38 @@ select fn_db_update_config_value('ServerCPUList', || '3:IBM z13s, z13:sie,model_z13-base:z13-base:s390x; ' || '4:IBM z14:sie,model_z14-base:z14-base:s390x;', '4.7'); +select fn_db_update_config_value('ServerCPUList', + '1:Intel Nehalem Family:vmx,nx,model_Nehalem:Nehalem:x86_64; ' + || '2:Secure Intel Nehalem Family:vmx,spec_ctrl,ssbd,model_Nehalem:Nehalem,+spec-ctrl,+ssbd:x86_64; ' + || '3:Intel Westmere Family:aes,vmx,nx,model_Westmere:Westmere:x86_64; ' + || '4:Secure Intel Westmere Family:aes,vmx,spec_ctrl,ssbd,model_Westmere:Westmere,+pcid,+spec-ctrl,+ssbd:x86_64; ' + || '5:Intel SandyBridge Family:vmx,nx,model_SandyBridge:SandyBridge:x86_64; ' + || '6:Secure Intel SandyBridge Family:vmx,spec_ctrl,ssbd,md_clear,model_SandyBridge:SandyBridge,+pcid,+spec-ctrl,+ssbd,+md-clear:x86_64; ' + || '7:Intel IvyBridge Family:vmx,nx,model_IvyBridge:IvyBridge:x86_64; ' + || '8:Secure Intel IvyBridge Family:vmx,spec_ctrl,ssbd,md_clear,model_IvyBridge:IvyBridge,+pcid,+spec-ctrl,+ssbd,+md-clear:x86_64; ' + || '9:Intel Haswell Family:vmx,nx,model_Haswell-noTSX:Haswell-noTSX:x86_64; ' + || '10:Secure Intel Haswell Family:vmx,spec_ctrl,ssbd,md_clear,model_Haswell-noTSX:Haswell-noTSX,+spec-ctrl,+ssbd,+md-clear:x86_64; ' + || '11:Intel Broadwell Family:vmx,nx,model_Broadwell-noTSX:Broadwell-noTSX:x86_64; ' + || '12:Secure Intel Broadwell Family:vmx,spec_ctrl,ssbd,md_clear,model_Broadwell-noTSX:Broadwell-noTSX,+spec-ctrl,+ssbd,+md-clear:x86_64; ' + || '13:Intel Skylake Client Family:vmx,nx,model_Skylake-Client:Skylake-Client,-hle,-rtm,-mpx:x86_64; ' + || '14:Secure Intel Skylake Client Family:vmx,ssbd,md_clear,model_Skylake-Client-noTSX-IBRS:Skylake-Client-noTSX-IBRS,+ssbd,+md-clear,-mpx:x86_64; ' + || '15:Intel Skylake Server Family:vmx,nx,model_Skylake-Server:Skylake-Server,-hle,-rtm,-mpx:x86_64; ' + || '16:Secure Intel Skylake Server Family:vmx,ssbd,md_clear,model_Skylake-Server-noTSX-IBRS:Skylake-Server-noTSX-IBRS,+ssbd,+md-clear,-mpx:x86_64; ' + || '17:Intel Cascadelake Server Family:vmx,model_Cascadelake-Server:Cascadelake-Server,-hle,-rtm,-mpx:x86_64; ' + || '18:Secure Intel Cascadelake Server Family:vmx,model_Cascadelake-Server-noTSX:Cascadelake-Server-noTSX,-mpx:x86_64; ' + || '19:Intel Icelake Server Family:vmx,model_Icelake-Server-noTSX:Icelake-Server-noTSX,-mpx:x86_64; ' + || '20:Secure Intel Icelake Server Family:vmx,arch-capabilities,rdctl-no,ibrs-all,skip-l1dfl-vmentry,mds-no,pschange-mc-no,model_Icelake-Server-noTSX:Icelake-Server-noTSX,+arch-capabilities,+rdctl-no,+ibrs-all,+skip-l1dfl-vmentry,+mds-no,+pschange-mc-no,-mpx:x86_64; ' + || '1:AMD Opteron G4:svm,nx,model_Opteron_G4:Opteron_G4:x86_64; ' + || '2:AMD Opteron G5:svm,nx,model_Opteron_G5:Opteron_G5:x86_64; ' + || '3:AMD EPYC:svm,nx,model_EPYC:EPYC:x86_64; ' + || '4:Secure AMD EPYC:svm,nx,ibpb,ssbd,model_EPYC:EPYC,+ibpb,+virt-ssbd:x86_64; ' + || '1:IBM POWER8:powernv,model_POWER8:POWER8:ppc64; ' + || '2:IBM POWER9:powernv,model_POWER9:POWER9:ppc64; ' + || '1:IBM z114, z196:sie,model_z196-base:z196-base:s390x; ' + || '2:IBM zBC12, zEC12:sie,model_zEC12-base:zEC12-base:s390x; ' + || '3:IBM z13s, z13:sie,model_z13-base:z13-base:s390x; ' + || '4:IBM z14:sie,model_z14-base:z14-base:s390x;', + '4.8'); -- qemu-guest-agent is also a viable agent select fn_db_update_config_value('AgentAppName','ovirt-guest-agent-common,ovirt-guest-agent,qemu-guest-agent','general'); @@ -1464,7 +1529,7 @@ select fn_db_update_default_config_value('ServerRebootTimeout', '300', '600', 'g select fn_db_update_default_config_value('VdsCertificateValidityInDays', '398', '1827', 'general', false); -- Add Very large VMs migration policy -select fn_db_update_default_config_value('MigrationPolicies', '[{"id":{"uuid":"80554327-0569-496b-bdeb-fcbbf52b827b"},"maxMigrations":2,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"name":"Minimal downtime","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["300"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["500"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"abort","params":[]}]}},{"id":{"uuid":"80554327-0569-496b-bdeb-fcbbf52b827c"},"maxMigrations":1,"autoConvergence":true,"migrationCompression":true,"enableGuestEvents":true,"name":"Suspend workload if needed","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["300"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["500"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"setDowntime","params":["5000"]},{"action":"abort","params":[]}]}},{"id":{"uuid":"a7aeedb2-8d66-4e51-bb22-32595027ce71"},"maxMigrations":2,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"name":"Post-copy migration","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"postcopy","params":[]},{"action":"abort","params":[]}]}}]', '[{"id":{"uuid":"80554327-0569-496b-bdeb-fcbbf52b827b"},"maxMigrations":2,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"name":"Minimal downtime","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["300"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["500"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"abort","params":[]}]}},{"id":{"uuid":"80554327-0569-496b-bdeb-fcbbf52b827c"},"maxMigrations":1,"autoConvergence":true,"migrationCompression":true,"enableGuestEvents":true,"name":"Suspend workload if needed","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["300"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["500"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"setDowntime","params":["5000"]},{"action":"abort","params":[]}]}},{"id":{"uuid":"a7aeedb2-8d66-4e51-bb22-32595027ce71"},"maxMigrations":2,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"name":"Post-copy migration","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"postcopy","params":[]},{"action":"abort","params":[]}]}},{"id":{"uuid":"57237b82-b8c2-425f-b425-114b35219626"},"maxMigrations":1,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"zeroCopy":true,"name":"Very large VMs","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["500"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["700"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["1000"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["1500"]}}],"initialItems":[{"action":"setDowntime","params":["300"]}],"lastItems":[{"action":"setDowntime","params":["5000"]},{"action":"abort","params":[]}]}}]', '4.7', false); +select fn_db_update_default_config_value('MigrationPolicies', '[{"id":{"uuid":"80554327-0569-496b-bdeb-fcbbf52b827b"},"maxMigrations":2,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"name":"Minimal downtime","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["300"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["500"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"abort","params":[]}]}},{"id":{"uuid":"80554327-0569-496b-bdeb-fcbbf52b827c"},"maxMigrations":1,"autoConvergence":true,"migrationCompression":true,"enableGuestEvents":true,"name":"Suspend workload if needed","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["300"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["500"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"setDowntime","params":["5000"]},{"action":"abort","params":[]}]}},{"id":{"uuid":"a7aeedb2-8d66-4e51-bb22-32595027ce71"},"maxMigrations":2,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"name":"Post-copy migration","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"postcopy","params":[]},{"action":"abort","params":[]}]}}]', '[{"id":{"uuid":"80554327-0569-496b-bdeb-fcbbf52b827b"},"maxMigrations":2,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"name":"Minimal downtime","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["300"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["500"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"abort","params":[]}]}},{"id":{"uuid":"80554327-0569-496b-bdeb-fcbbf52b827c"},"maxMigrations":1,"autoConvergence":true,"migrationCompression":true,"enableGuestEvents":true,"name":"Suspend workload if needed","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["300"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["500"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"setDowntime","params":["5000"]},{"action":"abort","params":[]}]}},{"id":{"uuid":"a7aeedb2-8d66-4e51-bb22-32595027ce71"},"maxMigrations":2,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"name":"Post-copy migration","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["150"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["200"]}}],"initialItems":[{"action":"setDowntime","params":["100"]}],"lastItems":[{"action":"postcopy","params":[]},{"action":"abort","params":[]}]}},{"id":{"uuid":"57237b82-b8c2-425f-b425-114b35219626"},"maxMigrations":1,"autoConvergence":true,"migrationCompression":false,"enableGuestEvents":true,"zeroCopy":true,"name":"Very large VMs","description":"","config":{"convergenceItems":[{"stallingLimit":1,"convergenceItem":{"action":"setDowntime","params":["400"]}},{"stallingLimit":2,"convergenceItem":{"action":"setDowntime","params":["500"]}},{"stallingLimit":3,"convergenceItem":{"action":"setDowntime","params":["700"]}},{"stallingLimit":4,"convergenceItem":{"action":"setDowntime","params":["1000"]}},{"stallingLimit":6,"convergenceItem":{"action":"setDowntime","params":["1500"]}}],"initialItems":[{"action":"setDowntime","params":["300"]}],"lastItems":[{"action":"setDowntime","params":["5000"]},{"action":"abort","params":[]}]}}]', '4.8', false); ------------------------------------------------------------------------------------ -- Split config section diff --git a/packaging/setup/plugins/ovirt-engine-common/base/core/misc.py b/packaging/setup/plugins/ovirt-engine-common/base/core/misc.py index e3b66d516ea..fe8c778d6d0 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/core/misc.py @@ -95,7 +95,7 @@ def _init(self): ) self.environment.setdefault( osetupcons.CoreEnv.UPGRADE_SUPPORTED_VERSIONS, - '4.2,4.3,4.4,4.5,4.6,4.7' + '4.2,4.3,4.4,4.5,4.6,4.7,4.8' ) self.logger.debug( From ab41880d79e214998c0a30d7cd7849106acac3f9 Mon Sep 17 00:00:00 2001 From: Brooklyn Dewolf Date: Tue, 30 Apr 2024 15:01:38 +0200 Subject: [PATCH 2/3] Added discard-no-unref support to CL 4.8 The discard-no-unref was introduced to qemu to counteract fragmentation. Without this, qcow2 images would grow over 100% of their size. See https://patchew.org/QEMU/20230602124747.1544077-1-jean-louis@dupond.be/ I have added the option to ovirt-engine so that this flag is enabled by default on hosts with cluster level compatibility level 4.8. The EnableQemuDiscardNoUnref option can be enabled/disabled in the config. The Virtual Disk option 'Enable Discard' also needs to be active before this flag is enabled. Signed-off-by: Brooklyn Dewolf --- .../java/org/ovirt/engine/core/common/config/ConfigValues.java | 3 +++ .../core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilder.java | 3 +++ packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql | 2 ++ packaging/etc/engine-config/engine-config.properties | 3 +++ 4 files changed, 11 insertions(+) diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index 769eeecf10e..0abf5877be7 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -1631,6 +1631,9 @@ public enum ConfigValues { @TypeConverterAttribute(Boolean.class) IsDedicatedSupported, + @TypeConverterAttribute(Boolean.class) + EnableQemuDiscardNoUnref, + Invalid; private ClientAccessLevel accessLevel; diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilder.java index 96ad36c8d6b..9a78181c0a1 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilder.java @@ -2291,6 +2291,9 @@ private void writeDiskDriver(VmDevice device, Disk disk, DiskVmElement dve, int writer.writeAttributeString("name", "qemu"); if (dve.isPassDiscard()) { writer.writeAttributeString("discard", "unmap"); + if ((boolean) Config.getValue(ConfigValues.EnableQemuDiscardNoUnref, vm.getClusterCompatibilityVersion().toString())) { + writer.writeAttributeString("discard_no_unref", "on"); + } } if (pinTo > 0) { writer.writeAttributeString("iothread", String.valueOf(pinTo)); diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 62b47400a34..d9fd5ee59c6 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -973,6 +973,8 @@ select fn_db_add_config_value_for_versions_up_to('ParallelMigrationsSupported', select fn_db_add_config_value_for_versions_up_to('ParallelMigrationsSupported', 'true', '4.8'); select fn_db_add_config_value_for_versions_up_to('IsDedicatedSupported', 'false', '4.6'); select fn_db_add_config_value_for_versions_up_to('IsDedicatedSupported', 'true', '4.8'); +select fn_db_add_config_value_for_versions_up_to('EnableQemuDiscardNoUnref', 'false', '4.7'); +select fn_db_add_config_value_for_versions_up_to('EnableQemuDiscardNoUnref', 'true', '4.8'); -- Incremental backup select fn_db_add_config_value_for_versions_up_to('IsIncrementalBackupSupported', 'false', '4.4'); diff --git a/packaging/etc/engine-config/engine-config.properties b/packaging/etc/engine-config/engine-config.properties index 5decb4409ba..05b1003046f 100644 --- a/packaging/etc/engine-config/engine-config.properties +++ b/packaging/etc/engine-config/engine-config.properties @@ -615,3 +615,6 @@ CertExpirationWarnPeriodInDays.description=Number of days to issue warnings befo CertExpirationWarnPeriodInDays.type=Integer VdsCertificateValidityInDays.description=Number of days which the hypervisor certificate is valid for. VdsCertificateValidityInDays.type=Integer +# Discard no Unref +EnableQemuDiscardNoUnref.description=Enable the QEMU discard-no-unref feature. +EnableQemuDiscardNoUnref.type=Boolean From 574f3ced80d6510b6937ca834311f787ad7d54ed Mon Sep 17 00:00:00 2001 From: Brooklyn Dewolf Date: Thu, 16 May 2024 09:55:10 +0200 Subject: [PATCH 3/3] Bump machine type for cluster level 4.8 Hosts supporting level 4.8 need to be running on RHEL 9.4 or CentOS Stream/RHEL 9. Signed-off-by: Brooklyn Dewolf --- packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index d9fd5ee59c6..390c00a4c75 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -87,6 +87,7 @@ select fn_db_add_config_value('ClusterEmulatedMachines','pc-q35-rhel8.1.0,pc-q35 select fn_db_add_config_value('ClusterEmulatedMachines','pc-q35-rhel8.3.0,pc-q35-4.1,pc-i440fx-rhel7.6.0,pc-i440fx-2.12,pseries-rhel8.3.0,s390-ccw-virtio-2.12','4.5'); select fn_db_add_config_value('ClusterEmulatedMachines','pc-q35-rhel8.4.0,pc-q35-4.1,pc-i440fx-rhel7.6.0,pc-i440fx-2.12,pseries-rhel8.4.0,s390-ccw-virtio-2.12','4.6'); select fn_db_add_config_value('ClusterEmulatedMachines','pc-q35-rhel8.6.0,pc-q35-4.1,pc-i440fx-rhel7.6.0,pc-i440fx-2.12,pseries-rhel8.4.0,s390-ccw-virtio-2.12','4.7'); +select fn_db_add_config_value('ClusterEmulatedMachines','pc-q35-rhel9.4.0,pc-q35-4.1,pc-i440fx-rhel7.6.0,pc-i440fx-2.12,pseries-rhel8.4.0,s390-ccw-virtio-2.12','4.8'); select fn_db_add_config_value('CpuOverCommitDurationMinutes','2','general'); --Handling Data directory for ENGINE select fn_db_add_config_value('DataDir','/usr/share/engine','general');