Skip to contentSkip to conversation

Fix wait option of xm reboot command

PATCH New Masaki Kanno 1 participant 1 message Feb 7, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix wait option of xm reboot command

Hi,

When I rebooted a domain by xm reboot command with wait option, I saw the following message. But, rebooting the domain succeeded.

 # xm list
 Name                                        ID   Mem VCPUs      State   Time(s)
 Domain-0                                     0   743     2     r-----     68.4
 vm1                                          1   256     1     r-----    157.1
 # xm reboot --wait vm1
 Domain vm1 destroyed for failed in rebooting
 All domains rebooted
 # xm list
 Name                                        ID   Mem VCPUs      State   Time(s)
 Domain-0                                     0   743     2     r-----     77.4
 vm1                                          2   256     1     r-----      1.4

The cause why the message was shown is the domain is destroyed temporarily by processing of xm reboot command. The domain information is not gotten from Xend by server.xend.domains() function till recreating the domain is completed. This patch fixes processing of xm reboot command in Xm side. It waits just a bit till recreating the domain is completed, then it measures the success or failure of the reboot of the domain.

Best regards,
Kan

tools/python/xen/xm/shutdown.py +13 -2
diff -r 9d0e86d8c1d1 tools/python/xen/xm/shutdown.py
@@ -23,6 +23,8 @@ from opts import *
 from opts import *
 from main import server, serverType, SERVER_XEN_API, get_single_vm
 from xen.xend.XendAPIConstants import *
+
+RECREATING_TIMEOUT = 30
 
 gopts = Opts(use="""[options] [DOM]
 
@@ -53,6 +55,7 @@ def wait_reboot(opts, doms, rcs):
     if serverType == SERVER_XEN_API:
         opts.err("Cannot wait for reboot w/ XenAPI (yet)")
 
+    recreating = {}
     while doms:
         alive = server.xend.domains(0)
         reboot = []
@@ -61,9 +64,17 @@ def wait_reboot(opts, doms, rcs):
                 rc = server.xend.domain.getRestartCount(d)
                 if rc == rcs[d]: continue
                 reboot.append(d)
+
+            # Probably the domain is being recreated now.
+            # We have to wait just a bit for recreating the domain.
+            elif not recreating.has_key(d):
+                recreating[d] = 0
             else:
-                opts.info("Domain %s destroyed for failed in rebooting" % d)
-                doms.remove(d)
+                recreating[d] += 1
+                if recreating[d] > RECREATING_TIMEOUT:
+                    opts.info("Domain %s destroyed for failed in rebooting" % d)
+                    doms.remove(d)
+
         for d in reboot:
             opts.info("Domain %s rebooted" % d)
             doms.remove(d)

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel