aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-04-15 11:25:07 +0100
committerKeir Fraser <keir.fraser@citrix.com>2009-04-15 11:25:07 +0100
commit19c624b57a2a6c1af0e466d6888317138052105f (patch)
tree5aa4ab59cdecd33eba1f165d7dd3029f9f927370
parentb158b87dbedc458adade946653aebcda9e99a5af (diff)
downloadxen-19c624b57a2a6c1af0e466d6888317138052105f.tar.gz
xen-19c624b57a2a6c1af0e466d6888317138052105f.tar.bz2
xen-19c624b57a2a6c1af0e466d6888317138052105f.zip
xend: serialise domain restart threads
I observed from xend.log that several domain restart threads run simultaneously. This patch make it singleton. Without this, several coredump of a domain might be created. Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>
-rw-r--r--tools/python/xen/xend/XendDomainInfo.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 720a1b7bb1..3fa2327272 100644
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -350,6 +350,8 @@ class XendDomainInfo:
@type shutdownWatch: xen.xend.xenstore.xswatch
@ivar shutdownStartTime: UNIX Time when domain started shutting down.
@type shutdownStartTime: float or None
+ @ivar restart_in_progress: Is a domain restart thread running?
+ @type restart_in_progress: bool
# @ivar state: Domain state
# @type state: enum(DOM_STATE_HALTED, DOM_STATE_RUNNING, ...)
@ivar state_updated: lock for self.state
@@ -418,6 +420,7 @@ class XendDomainInfo:
self.shutdownWatch = None
self.shutdownStartTime = None
self._resume = resume
+ self.restart_in_progress = False
self.state_updated = threading.Condition()
self.refresh_shutdown_lock = threading.Condition()
@@ -1929,7 +1932,8 @@ class XendDomainInfo:
finally:
self.refresh_shutdown_lock.release()
- if restart_reason:
+ if restart_reason and not self.restart_in_progress:
+ self.restart_in_progress = True
threading.Thread(target = self._maybeRestart,
args = (restart_reason,)).start()