From: yuhuan.yang <yuhuan.yang@123.com>
Date: Mon, 22 May 2017 13:55:23 +0000 (+0800)
Subject: Solve mic hang issue, add timeout to show failure.
X-Git-Tag: staging-released-tools-18.01.7~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be73882c5cb4b1162db4eb239e81caa709f09f57;p=tools%2Fmic.git

Solve mic hang issue, add timeout to show failure.

Change-Id: If1d554455ff6d159789cd0aebae88ed3bdf2451b
---

diff --git a/mic/imager/baseimager.py b/mic/imager/baseimager.py
index c3553c1..c8a456c 100755
--- a/mic/imager/baseimager.py
+++ b/mic/imager/baseimager.py
@@ -30,13 +30,15 @@ import json
 from datetime import datetime
 
 import rpm
-
+import time
 from mic import kickstart
 from mic import msger, __version__ as VERSION
 from mic.utils.errors import CreatorError, Abort
 from mic.utils import misc, grabber, runner, fs_related as fs
 from mic.chroot import kill_proc_inchroot
 from mic.archive import get_archive_suffixes
+#post script max run time
+MAX_RUN_TIME = 120
 
 class BaseImageCreator(object):
     """Installs a system to a chroot directory.
@@ -1158,6 +1160,7 @@ class BaseImageCreator(object):
                 preexec = self._chroot
                 script = "/tmp/" + os.path.basename(path)
 
+            start_time = time.time()
             try:
                 try:
                     p = subprocess.Popen([s.interp, script],
@@ -1167,6 +1170,9 @@ class BaseImageCreator(object):
                                        stderr = subprocess.STDOUT)
                     while p.poll() == None:
                     	msger.info(p.stdout.readline().strip())
+                        end_time = time.time()
+                        if (end_time - start_time)/60 > MAX_RUN_TIME:
+                            raise CreatorError("Your post script is executed more than "+MAX_RUN_TIME+"mins, please check it!")
                 except OSError, (err, msg):
                     raise CreatorError("Failed to execute %%post script "
                                        "with '%s' : %s" % (s.interp, msg))