From 9384a489d762e0bac8393e25a587cfc4859efb3a Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Mon, 14 Nov 2011 15:46:44 -0800
Subject: [PATCH] bug 12008: set host affinity before restart VM

status 12008: resolved fixed

Reviewed-by: Sangeetha
---
 .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 73032b6d6ee..601207b4660 100755
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -2580,8 +2580,10 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
         Connection conn = getConnection();
         s_vms.put(_cluster, _name, cmd.getVmName(), State.Starting);
         try {
+            Host host = null;
             Set<VM> vms = null;
             try {
+                host = Host.getByUuid(conn, _host.uuid);
                 vms = VM.getByNameLabel(conn, cmd.getVmName());
             } catch (XenAPIException e0) {
                 s_logger.debug("getByNameLabel failed " + e0.toString());
@@ -2592,6 +2594,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
             }
             for (VM vm : vms) {
                 try {
+                    vm.setAffinity(conn, host);
                     rebootVM(conn, vm, vm.getNameLabel(conn));
                 } catch (Exception e) {
                     String msg = e.toString();