Greg Padgett has uploaded a new change for review.

Change subject: WIP core: Add DB columns for CPU Overcommit (1/5)
......................................................................

WIP core: Add DB columns for CPU Overcommit (1/5)

This patch series adds support for CPU Overcommitment based on counting
host threads as cores for the purpose of VM startup/shutdown/migration.

Patch 1: add database columns holding metadata needed to track host
data and overcommit settings:

 vds_dynamic.cpu_ht_enabled - boolean, host supports hyperthreading
 vds_dynamic.vdsm_count_threads_as_cores - boolean, corresponds to
     vdsm.conf option report_host_threads_as_cores
 vds_groups.count_threads_as_cores - boolean, whether overcommitment
     option is enabled by user

Change-Id: I8fed81d00ec9086573877145dff0e6821a1c34f9
Signed-off-by: Greg Padgett <gpadg...@redhat.com>
---
M backend/manager/dbscripts/create_views.sql
A backend/manager/dbscripts/upgrade/03_02_0060_add_cpu_overcommit_columns.sql
M 
backend/manager/dbscripts/upgrade/post_upgrade/0010_add_object_column_white_list_table.sql
M backend/manager/dbscripts/vds_groups_sp.sql
M backend/manager/dbscripts/vds_sp.sql
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
9 files changed, 62 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/10166/1

diff --git a/backend/manager/dbscripts/create_views.sql 
b/backend/manager/dbscripts/create_views.sql
index e7903c4..b259abe 100644
--- a/backend/manager/dbscripts/create_views.sql
+++ b/backend/manager/dbscripts/create_views.sql
@@ -621,12 +621,14 @@
                       vds_groups.selection_algorithm as selection_algorithm, 
vds_static.vds_id as vds_id, vds_static.vds_name as vds_name, vds_static.ip as 
ip, vds_static.vds_unique_id as vds_unique_id,
                       vds_static.host_name as host_name, vds_static.port as 
port, vds_static.vds_strength as vds_strength, vds_static.server_SSL_enabled as 
server_SSL_enabled, vds_static.vds_type as vds_type,
                       vds_static.pm_type as pm_type, vds_static.pm_user as 
pm_user, vds_static.pm_password as pm_password, vds_static.pm_port as pm_port,
-                      vds_static.pm_options as pm_options, 
vds_static.pm_enabled as pm_enabled, vds_static.vds_spm_priority as 
vds_spm_priority, vds_dynamic.hooks as hooks,vds_dynamic.status as status, 
vds_dynamic.cpu_cores as cpu_cores, vds_dynamic.cpu_model as cpu_model,
-                      vds_dynamic.cpu_speed_mh as cpu_speed_mh, 
vds_dynamic.if_total_speed as if_total_speed, vds_dynamic.kvm_enabled as 
kvm_enabled, vds_dynamic.physical_mem_mb as physical_mem_mb,
+                      vds_static.pm_options as pm_options, 
vds_static.pm_enabled as pm_enabled, vds_static.vds_spm_priority as 
vds_spm_priority, vds_dynamic.hooks as hooks,vds_dynamic.status as status,
+                      vds_dynamic.cpu_cores as cpu_cores, 
vds_dynamic.cpu_ht_enabled as cpu_ht_enabled, vds_dynamic.cpu_model as 
cpu_model,
+                      vds_dynamic.cpu_speed_mh as cpu_speed_mh, 
vds_dynamic.vdsm_count_threads_as_cores as vdsm_count_threads_as_cores,
+                      vds_dynamic.if_total_speed as if_total_speed, 
vds_dynamic.kvm_enabled as kvm_enabled, vds_dynamic.physical_mem_mb as 
physical_mem_mb,
                       vds_dynamic.pending_vcpus_count as pending_vcpus_count, 
vds_dynamic.pending_vmem_size as pending_vmem_size,vds_dynamic.mem_commited as 
mem_commited, vds_dynamic.vm_active as vm_active, vds_dynamic.vm_count as 
vm_count,
                       vds_dynamic.vm_migrating as vm_migrating, 
vds_dynamic.vms_cores_count as vms_cores_count, 
vds_dynamic.cpu_over_commit_time_stamp as cpu_over_commit_time_stamp,
                       vds_dynamic.net_config_dirty as net_config_dirty, 
vds_groups.high_utilization as high_utilization, vds_groups.low_utilization as 
low_utilization,
-                      vds_groups.max_vds_memory_over_commit as 
max_vds_memory_over_commit, vds_groups.cpu_over_commit_duration_minutes as 
cpu_over_commit_duration_minutes,
+                      vds_groups.max_vds_memory_over_commit as 
max_vds_memory_over_commit, vds_groups.cpu_over_commit_duration_minutes as 
cpu_over_commit_duration_minutes, vds_groups.count_threads_as_cores as 
count_threads_as_cores,
                       storage_pool.id as storage_pool_id, storage_pool.name as 
storage_pool_name, vds_dynamic.reserved_mem as reserved_mem,
                       vds_dynamic.guest_overhead as guest_overhead, 
vds_dynamic.rpm_version as rpm_version, vds_dynamic.software_version as 
software_version, vds_dynamic.version_name as version_name, 
vds_dynamic.build_name as build_name,
                       vds_dynamic.previous_status as previous_status, 
vds_statistics.cpu_idle as cpu_idle, vds_statistics.cpu_load as cpu_load, 
vds_statistics.cpu_sys as cpu_sys, vds_statistics.cpu_user as cpu_user,
@@ -654,12 +656,13 @@
                       vds_static.host_name, vds_static.port, 
vds_static.vds_strength, vds_static.server_SSL_enabled, vds_static.vds_type,
                       vds_static.pm_type, vds_static.pm_user, 
vds_static.pm_password, vds_static.pm_port,
                       vds_static.pm_options, vds_static.pm_enabled, 
vds_dynamic.hooks, vds_dynamic.status, vds_dynamic.cpu_cores,
-                      vds_dynamic.cpu_model, vds_dynamic.cpu_speed_mh, 
vds_dynamic.if_total_speed, vds_dynamic.kvm_enabled,
+                      vds_dynamic.cpu_ht_enabled, vds_dynamic.cpu_model, 
vds_dynamic.cpu_speed_mh,
+                      vds_dynamic.vdsm_count_threads_as_cores, 
vds_dynamic.if_total_speed, vds_dynamic.kvm_enabled,
                       vds_dynamic.physical_mem_mb, 
vds_dynamic.pending_vcpus_count, vds_dynamic.pending_vmem_size,
                       vds_dynamic.mem_commited, vds_dynamic.vm_active, 
vds_dynamic.vm_count, vds_dynamic.vm_migrating,
                       vds_dynamic.vms_cores_count, 
vds_dynamic.cpu_over_commit_time_stamp,
                       vds_dynamic.net_config_dirty, 
vds_groups.high_utilization, vds_groups.low_utilization,
-                      vds_groups.max_vds_memory_over_commit, 
vds_groups.cpu_over_commit_duration_minutes,
+                      vds_groups.max_vds_memory_over_commit, 
vds_groups.cpu_over_commit_duration_minutes, vds_groups.count_threads_as_cores,
                       storage_pool.id AS storage_pool_id, storage_pool.name AS 
storage_pool_name, tags_vds_map_view.tag_name,
                       tags_vds_map_view.tag_id, vds_dynamic.reserved_mem, 
vds_dynamic.guest_overhead, vds_dynamic.rpm_version, 
vds_dynamic.software_version,
                       vds_dynamic.version_name, vds_dynamic.build_name, 
vds_dynamic.previous_status, vds_statistics.cpu_idle,
@@ -883,7 +886,7 @@
 SELECT     vds_groups.vds_group_id, vds_groups.name, vds_groups.description, 
vds_groups.cpu_name, vds_groups._create_date,
                       vds_groups._update_date, vds_groups.selection_algorithm, 
vds_groups.high_utilization, vds_groups.low_utilization,
                       vds_groups.cpu_over_commit_duration_minutes, 
vds_groups.storage_pool_id,
-                      vds_groups.max_vds_memory_over_commit, 
vds_groups.compatibility_version,
+                      vds_groups.max_vds_memory_over_commit, 
vds_groups.count_threads_as_cores, vds_groups.compatibility_version,
                       vds_groups.transparent_hugepages, 
vds_groups.migrate_on_error,
                       storage_pool_iso_map.storage_id
 FROM         vds_groups LEFT JOIN
diff --git 
a/backend/manager/dbscripts/upgrade/03_02_0060_add_cpu_overcommit_columns.sql 
b/backend/manager/dbscripts/upgrade/03_02_0060_add_cpu_overcommit_columns.sql
new file mode 100644
index 0000000..f72eb1f
--- /dev/null
+++ 
b/backend/manager/dbscripts/upgrade/03_02_0060_add_cpu_overcommit_columns.sql
@@ -0,0 +1,4 @@
+select fn_db_add_column('vds_groups', 'count_threads_as_cores', 'BOOLEAN NOT 
NULL DEFAULT FALSE');
+
+select fn_db_add_column('vds_dynamic', 'cpu_ht_enabled', 'BOOLEAN');
+select fn_db_add_column('vds_dynamic', 'vdsm_count_threads_as_cores', 
'BOOLEAN');
diff --git 
a/backend/manager/dbscripts/upgrade/post_upgrade/0010_add_object_column_white_list_table.sql
 
b/backend/manager/dbscripts/upgrade/post_upgrade/0010_add_object_column_white_list_table.sql
index 309b636..0f50883 100644
--- 
a/backend/manager/dbscripts/upgrade/post_upgrade/0010_add_object_column_white_list_table.sql
+++ 
b/backend/manager/dbscripts/upgrade/post_upgrade/0010_add_object_column_white_list_table.sql
@@ -54,7 +54,8 @@
           'otp_validity', 'spm_status', 'supported_cluster_levels', 
'supported_engines',
           'vds_group_compatibility_version', 'host_os', 'kvm_version', 
'libvirt_version', 'spice_version', 'kernel_version',
           'iscsi_initiator_name', 'transparent_hugepages_state', 
'anonymous_hugepages',
-          'non_operational_reason', 'recoverable', 'sshKeyFingerprint'));
+          'non_operational_reason', 'recoverable', 'sshKeyFingerprint',
+          'count_threads_as_cores', 'cpu_ht_enabled', 
'vdsm_count_threads_as_cores'));
 -- pm_options are missing
 END; $function$
 LANGUAGE plpgsql;
diff --git a/backend/manager/dbscripts/vds_groups_sp.sql 
b/backend/manager/dbscripts/vds_groups_sp.sql
index 8075224..8235fb1 100644
--- a/backend/manager/dbscripts/vds_groups_sp.sql
+++ b/backend/manager/dbscripts/vds_groups_sp.sql
@@ -18,6 +18,7 @@
        v_cpu_over_commit_duration_minutes INTEGER,
        v_storage_pool_id UUID ,
        v_max_vds_memory_over_commit INTEGER,
+       v_count_threads_as_cores BOOLEAN,
        v_compatibility_version VARCHAR(40),
        v_transparent_hugepages BOOLEAN ,
        v_migrate_on_error INTEGER,
@@ -27,11 +28,11 @@
    AS $procedure$
 BEGIN
       INSERT INTO vds_groups(vds_group_id,description, name, cpu_name, 
selection_algorithm, high_utilization, low_utilization,
-       cpu_over_commit_duration_minutes, storage_pool_id,  
max_vds_memory_over_commit, compatibility_version, transparent_hugepages, 
migrate_on_error,
-       virt_service, gluster_service)
+       cpu_over_commit_duration_minutes, storage_pool_id,  
max_vds_memory_over_commit, count_threads_as_cores, compatibility_version,
+    transparent_hugepages, migrate_on_error, virt_service, gluster_service)
        VALUES(v_vds_group_id,v_description, v_name, v_cpu_name, 
v_selection_algorithm, v_high_utilization, v_low_utilization,
-       v_cpu_over_commit_duration_minutes, v_storage_pool_id,  
v_max_vds_memory_over_commit, v_compatibility_version, v_transparent_hugepages, 
v_migrate_on_error,
-       v_virt_service, v_gluster_service);
+       v_cpu_over_commit_duration_minutes, v_storage_pool_id,  
v_max_vds_memory_over_commit, v_count_threads_as_cores, v_compatibility_version,
+    v_transparent_hugepages, v_migrate_on_error, v_virt_service, 
v_gluster_service);
 END; $procedure$
 LANGUAGE plpgsql;
 
@@ -49,6 +50,7 @@
        v_cpu_over_commit_duration_minutes INTEGER,
        v_storage_pool_id UUID ,
        v_max_vds_memory_over_commit INTEGER,
+       v_count_threads_as_cores BOOLEAN,
        v_compatibility_version VARCHAR(40),
        v_transparent_hugepages BOOLEAN ,
        v_migrate_on_error INTEGER,
@@ -65,6 +67,7 @@
       low_utilization = v_low_utilization,cpu_over_commit_duration_minutes = 
v_cpu_over_commit_duration_minutes,
       storage_pool_id = v_storage_pool_id,_update_date = LOCALTIMESTAMP,
       max_vds_memory_over_commit = v_max_vds_memory_over_commit,
+      count_threads_as_cores = v_count_threads_as_cores,
       compatibility_version = v_compatibility_version,transparent_hugepages = 
v_transparent_hugepages,
       migrate_on_error = v_migrate_on_error,
       virt_service = v_virt_service, gluster_service = v_gluster_service
diff --git a/backend/manager/dbscripts/vds_sp.sql 
b/backend/manager/dbscripts/vds_sp.sql
index 40ce2c4..2470bc1 100644
--- a/backend/manager/dbscripts/vds_sp.sql
+++ b/backend/manager/dbscripts/vds_sp.sql
@@ -136,8 +136,10 @@
 
 
 Create or replace FUNCTION InsertVdsDynamic(v_cpu_cores INTEGER ,
+ v_cpu_ht_enabled BOOLEAN ,
  v_cpu_model VARCHAR(255) ,
  v_cpu_speed_mh DECIMAL(18,0) ,
+ v_vdsm_count_threads_as_cores BOOLEAN ,
  v_if_total_speed VARCHAR(40) ,
  v_kvm_enabled BOOLEAN ,
  v_mem_commited INTEGER ,
@@ -177,8 +179,8 @@
 BEGIN
 
    BEGIN
-INSERT INTO vds_dynamic(cpu_cores, cpu_model, cpu_speed_mh, if_total_speed, 
kvm_enabled, mem_commited, physical_mem_mb,        status, vds_id, vm_active, 
vm_count, vm_migrating, reserved_mem, guest_overhead, rpm_version, 
software_version, version_name, build_name, previous_status, cpu_flags, 
cpu_over_commit_time_stamp, vms_cores_count, pending_vcpus_count, 
pending_vmem_size, cpu_sockets,net_config_dirty, supported_cluster_levels, 
supported_engines, host_os, kvm_version, libvirt_version, spice_version, 
kernel_version, iscsi_initiator_name, transparent_hugepages_state, 
anonymous_hugepages,hooks)
-       VALUES(v_cpu_cores,     v_cpu_model,    v_cpu_speed_mh, 
v_if_total_speed, v_kvm_enabled, v_mem_commited, v_physical_mem_mb,     
v_status, v_vds_id, v_vm_active, v_vm_count, v_vm_migrating,    v_reserved_mem, 
v_guest_overhead, v_rpm_version, v_software_version, v_version_name, 
v_build_name, v_previous_status, v_cpu_flags, v_cpu_over_commit_time_stamp, 
v_vms_cores_count,v_pending_vcpus_count, v_pending_vmem_size, v_cpu_sockets, 
v_net_config_dirty, v_supported_cluster_levels, v_supported_engines, v_host_os, 
v_kvm_version, v_libvirt_version, v_spice_version, v_kernel_version, 
v_iscsi_initiator_name, v_transparent_hugepages_state, 
v_anonymous_hugepages,v_hooks);
+INSERT INTO vds_dynamic(cpu_cores, cpu_ht_enabled, cpu_model, cpu_speed_mh, 
vdsm_count_threads_as_cores, if_total_speed, kvm_enabled, mem_commited, 
physical_mem_mb,   status, vds_id, vm_active, vm_count, vm_migrating, 
reserved_mem, guest_overhead, rpm_version, software_version, version_name, 
build_name, previous_status, cpu_flags, cpu_over_commit_time_stamp, 
vms_cores_count, pending_vcpus_count, pending_vmem_size, 
cpu_sockets,net_config_dirty, supported_cluster_levels, supported_engines, 
host_os, kvm_version, libvirt_version, spice_version, kernel_version, 
iscsi_initiator_name, transparent_hugepages_state, anonymous_hugepages,hooks)
+       VALUES(v_cpu_cores,     v_cpu_ht_enabled, v_cpu_model,  v_cpu_speed_mh, 
v_vdsm_count_threads_as_cores, v_if_total_speed, v_kvm_enabled, v_mem_commited, 
v_physical_mem_mb,      v_status, v_vds_id, v_vm_active, v_vm_count, 
v_vm_migrating,    v_reserved_mem, v_guest_overhead, v_rpm_version, 
v_software_version, v_version_name, v_build_name, v_previous_status, 
v_cpu_flags, v_cpu_over_commit_time_stamp, 
v_vms_cores_count,v_pending_vcpus_count, v_pending_vmem_size, v_cpu_sockets, 
v_net_config_dirty, v_supported_cluster_levels, v_supported_engines, v_host_os, 
v_kvm_version, v_libvirt_version, v_spice_version, v_kernel_version, 
v_iscsi_initiator_name, v_transparent_hugepages_state, 
v_anonymous_hugepages,v_hooks);
    END;
 
    RETURN;
@@ -190,8 +192,10 @@
 
 
 Create or replace FUNCTION UpdateVdsDynamic(v_cpu_cores INTEGER ,
+ v_cpu_ht_enabled BOOLEAN ,
  v_cpu_model VARCHAR(255) ,
  v_cpu_speed_mh DECIMAL(18,0) ,
+ v_vdsm_count_threads_as_cores BOOLEAN ,
  v_if_total_speed VARCHAR(40) ,
  v_kvm_enabled BOOLEAN ,
  v_mem_commited INTEGER ,
@@ -235,7 +239,9 @@
 
    BEGIN
       UPDATE vds_dynamic
-      SET cpu_cores = v_cpu_cores,cpu_model = v_cpu_model,cpu_speed_mh = 
v_cpu_speed_mh,
+      SET cpu_cores = v_cpu_cores,cpu_ht_enabled = v_cpu_ht_enabled,
+      cpu_model = v_cpu_model,cpu_speed_mh = v_cpu_speed_mh,
+      vdsm_count_threads_as_cores = v_vdsm_count_threads_as_cores,
       if_total_speed = v_if_total_speed,kvm_enabled = v_kvm_enabled,
       mem_commited = v_mem_commited,physical_mem_mb = v_physical_mem_mb,
       status = v_status,vm_active = v_vm_active,vm_count = v_vm_count,
diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
index c931076..90f462b 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
@@ -219,9 +219,11 @@
             entity.setport(rs.getInt("port"));
             entity.setstatus(VDSStatus.forValue(rs.getInt("status")));
             entity.setcpu_cores((Integer) rs.getObject("cpu_cores"));
+            entity.setcpu_ht_enabled((Boolean) rs.getObject("cpu_ht_enabled"));
             entity.setcpu_model(rs.getString("cpu_model"));
             entity.setcpu_user(rs.getDouble("cpu_user"));
             entity.setcpu_speed_mh(rs.getDouble("cpu_speed_mh"));
+            entity.setvdsm_count_threads_as_cores((Boolean) 
rs.getObject("vdsm_count_threads_as_cores"));
             entity.setif_total_speed(rs.getString("if_total_speed"));
             entity.setkvm_enabled((Boolean) rs.getObject("kvm_enabled"));
             entity.setphysical_mem_mb((Integer) rs
diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
index 804f201..ebc06d7 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
@@ -34,8 +34,10 @@
                     throws SQLException {
                 VdsDynamic entity = new VdsDynamic();
                 entity.setcpu_cores((Integer) rs.getObject("cpu_cores"));
+                entity.setcpu_ht_enabled((Boolean) 
rs.getObject("cpu_ht_enabled"));
                 entity.setcpu_model(rs.getString("cpu_model"));
                 entity.setcpu_speed_mh(rs.getDouble("cpu_speed_mh"));
+                entity.setvdsm_count_threads_as_cores((Boolean) 
rs.getObject("vdsm_count_threads_as_cores"));
                 entity.setif_total_speed(rs.getString("if_total_speed"));
                 entity.setkvm_enabled((Boolean) rs.getObject("kvm_enabled"));
                 entity.setmem_commited((Integer) rs.getObject("mem_commited"));
@@ -94,8 +96,10 @@
     public void save(VdsDynamic vds) {
         MapSqlParameterSource parameterSource = 
getCustomMapSqlParameterSource()
                 .addValue("cpu_cores", vds.getcpu_cores())
+                .addValue("cpu_ht_enabled", vds.getcpu_ht_enabled())
                 .addValue("cpu_model", vds.getcpu_model())
                 .addValue("cpu_speed_mh", vds.getcpu_speed_mh())
+                .addValue("vdsm_count_threads_as_cores", 
vds.getvdsm_count_threads_as_cores())
                 .addValue("if_total_speed", vds.getif_total_speed())
                 .addValue("kvm_enabled", vds.getkvm_enabled())
                 .addValue("mem_commited", vds.getmem_commited())
@@ -143,8 +147,10 @@
     public void update(VdsDynamic vds) {
         MapSqlParameterSource parameterSource = 
getCustomMapSqlParameterSource()
                 .addValue("cpu_cores", vds.getcpu_cores())
+                .addValue("cpu_ht_enabled", vds.getcpu_ht_enabled())
                 .addValue("cpu_model", vds.getcpu_model())
                 .addValue("cpu_speed_mh", vds.getcpu_speed_mh())
+                .addValue("vdsm_count_threads_as_cores", 
vds.getvdsm_count_threads_as_cores())
                 .addValue("if_total_speed", vds.getif_total_speed())
                 .addValue("kvm_enabled", vds.getkvm_enabled())
                 .addValue("mem_commited", vds.getmem_commited())
diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
index c981b20..12ab474 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java
@@ -143,6 +143,8 @@
                 .addValue("storage_pool_id", group.getStoragePoolId())
                 .addValue("max_vds_memory_over_commit",
                         group.getmax_vds_memory_over_commit())
+                .addValue("count_threads_as_cores",
+                        group.getcount_threads_as_cores())
                 .addValue("transparent_hugepages",
                         group.getTransparentHugepages())
                 .addValue("compatibility_version",
@@ -175,6 +177,8 @@
                     .getString("storage_pool_id")));
             entity.setmax_vds_memory_over_commit(rs
                     .getInt("max_vds_memory_over_commit"));
+            entity.setcount_threads_as_cores(rs
+                    .getBoolean("count_threads_as_cores"));
             entity.setTransparentHugepages(rs
                     .getBoolean("transparent_hugepages"));
             entity.setcompatibility_version(new Version(rs
diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml 
b/backend/manager/modules/dal/src/test/resources/fixtures.xml
index 8b57cf0..8d53fac 100644
--- a/backend/manager/modules/dal/src/test/resources/fixtures.xml
+++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml
@@ -480,6 +480,7 @@
         <column>transparent_hugepages</column>
         <column>virt_service</column>
         <column>gluster_service</column>
+        <column>treat_threads_as_cores</column>
         <row>
             <value>b399944a-81ab-4ec5-8266-e19ba7c3c9d1</value>
             <value>rhel6.iscsi</value>
@@ -496,6 +497,7 @@
             <value>2.3</value>
             <value>0</value>
             <value>true</value>
+            <value>false</value>
             <value>false</value>
         </row>
         <row>
@@ -515,6 +517,7 @@
             <value>0</value>
             <value>true</value>
             <value>false</value>
+            <value>false</value>
         </row>
         <row>
             <value>b399944a-81ab-4ec5-8266-e19ba7c3c9d3</value>
@@ -532,6 +535,7 @@
             <value>2.3</value>
             <value>0</value>
             <value>true</value>
+            <value>false</value>
             <value>false</value>
         </row>
         <row>
@@ -551,6 +555,7 @@
             <value>0</value>
             <value>true</value>
             <value>false</value>
+            <value>false</value>
         </row>
         <row>
             <value>eba797fb-8e3b-4777-b63c-92e7a5957d7c</value>
@@ -568,6 +573,7 @@
             <value>2.3</value>
             <value>0</value>
             <value>true</value>
+            <value>false</value>
             <value>false</value>
         </row>
                <row>
@@ -587,6 +593,7 @@
             <value>0</value>
             <value>true</value>
             <value>false</value>
+            <value>false</value>
         </row>
         <row>
             <value>eba797fb-8e3b-4777-b63c-92e7a5957d7e</value>
@@ -604,6 +611,7 @@
             <value>2.3</value>
             <value>0</value>
             <value>true</value>
+            <value>false</value>
             <value>false</value>
         </row>
         <row>
@@ -623,6 +631,7 @@
             <value>0</value>
             <value>false</value>
             <value>true</value>
+            <value>false</value>
         </row>
     </table>
 
@@ -1271,6 +1280,8 @@
         <column>_update_date</column>
         <column>hooks</column>
         <column>non_operational_reason</column>
+        <column>cpu_ht_enabled</column>
+        <column>vdsm_treat_threads_as_cores</column>
         <row>
             <value>afce7a39-8e8c-4819-ba9c-796d316592e6</value>
             <value>3</value>
@@ -1310,6 +1321,8 @@
             <value>2010-12-01 14:13:10</value>
             <value>{}</value>
             <value>0</value>
+            <value>true</value>
+            <value>false</value>
         </row>
         <row>
             <value>afce7a39-8e8c-4819-ba9c-796d316592e7</value>
@@ -1350,6 +1363,8 @@
             <value>2010-12-01 14:13:10</value>
             <value>{}</value>
             <value>0</value>
+            <value>true</value>
+            <value>false</value>
         </row>
         <row>
             <value>23f6d691-5dfb-472b-86dc-9e1d2d3c18f3</value>
@@ -1390,6 +1405,8 @@
             <value>2010-12-01 14:13:10</value>
             <value>{}</value>
             <value>0</value>
+            <value>true</value>
+            <value>false</value>
         </row>
         <row>
             <value>2001751e-549b-4e7a-aff6-32d36856c125</value>
@@ -1430,6 +1447,8 @@
             <value>2010-12-01 14:13:10</value>
             <value>{}</value>
             <value>0</value>
+            <value>true</value>
+            <value>false</value>
         </row>
     </table>
 


--
To view, visit http://gerrit.ovirt.org/10166
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fed81d00ec9086573877145dff0e6821a1c34f9
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Greg Padgett <gpadg...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to