[Engine-patches] Change in ovirt-engine[master]: core: fix numa update info

[gchaplik]

Gilad Chaplik has uploaded a new change for review.

Change subject: core: fix numa update info
......................................................................

core: fix numa update info

Change-Id: I13c587521d9233b74a27aba59a5c1c7ca386e1db
Signed-off-by: Gilad Chaplik <gchap...@redhat.com>
---
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
3 files changed, 16 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/32903/1

diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
index 80c2d1f..00d9fb6 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
@@ -182,6 +182,8 @@
         vds.setHighlyAvailableIsActive(getHighlyAvailableIsActive());
         
vds.setHighlyAvailableGlobalMaintenance(getHighlyAvailableGlobalMaintenance());
         
vds.setHighlyAvailableLocalMaintenance(getHighlyAvailableLocalMaintenance());
+        vds.setNumaNodeList(getNumaNodeList());
+        vds.setAutoNumaBalancing(getAutoNumaBalancing());
 
         return vds;
     }
diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
index 750a029..3a8a43a 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
@@ -391,6 +391,10 @@
      * @param vds
      */
     public void updateNumaData(final VDS vds) {
+        if (vds.getNumaNodeList() == null || vds.getNumaNodeList().isEmpty()) {
+            return;
+        }
+
         final List<VdsNumaNode> numaNodesToSave = new ArrayList<>();
         final List<VdsNumaNode> numaNodesToUpdate = new ArrayList<>();
         final List<Guid> numaNodesToRemove = new ArrayList<>();
diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
index 1fd4c0a..9a620a5 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
@@ -354,9 +354,10 @@
                 nodesMap.put(node.getIndex(), node);
             }
             for (VdsNumaNode node : updateNumaNodes) {
-                if (nodesMap.containsKey(node.getIndex())) {
-                    node.setId(nodesMap.get(node.getIndex()).getId());
+                VdsNumaNode vdsNumaNode = nodesMap.get(node.getIndex());
+                if (vdsNumaNode != null) {
                     if (node.getNumaNodeStatistics() != null) {
+                        updateNumaCapsFields(node, vdsNumaNode);
                         vdsNumaNodesToSave.add(node);
                     }
                 }
@@ -374,6 +375,13 @@
         }
     }
 
+    private void updateNumaCapsFields(VdsNumaNode node, VdsNumaNode 
vdsNumaNode) {
+        node.setId(vdsNumaNode.getId());
+        node.setCpuIds(vdsNumaNode.getCpuIds());
+        node.setMemTotal(vdsNumaNode.getMemTotal());
+        node.setNumaNodeDistances(vdsNumaNode.getNumaNodeDistances());
+    }
+
     private void saveVmJobsToDb() {
         getDbFacade().getVmJobDao().updateAllInBatch(vmJobsToUpdate.values());
 


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

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