Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
slapos
Commits
14001ab2
Commit
14001ab2
authored
Dec 11, 2014
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monitor: fix stuck process
parent
8298d98a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
48 deletions
+37
-48
stack/monitor/buildout.cfg
stack/monitor/buildout.cfg
+1
-1
stack/monitor/monitor.py.in
stack/monitor/monitor.py.in
+36
-47
No files found.
stack/monitor/buildout.cfg
View file @
14001ab2
...
@@ -48,7 +48,7 @@ mode = 0644
...
@@ -48,7 +48,7 @@ mode = 0644
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
url = ${:_profile_base_location_}/${:filename}
download-only = true
download-only = true
md5sum =
cb2f15850d3dc82459a0044adb4416cf
md5sum =
49587347fd82d93cca27715f787f8bec
destination = ${buildout:parts-directory}/monitor-template-monitor-bin
destination = ${buildout:parts-directory}/monitor-template-monitor-bin
filename = monitor.py.in
filename = monitor.py.in
mode = 0644
mode = 0644
...
...
stack/monitor/monitor.py.in
View file @
14001ab2
...
@@ -36,25 +36,29 @@ option_list = [
...
@@ -36,25 +36,29 @@ option_list = [
]
]
class Popen(subprocess.Popen):
class Popen(subprocess.Popen):
__timeout = None
def set_timeout(self, timeout):
def timeout(self, delay, delay_before_kill=5):
self.set_timeout = None # assert we're not called twice
if self.__timeout is not None: self.__timeout.cancel()
event = threading.Event()
self.__timeout = threading.Timer(delay, self.stop, [delay_before_kill])
event.__killed = False # we just need a mutable
self.__timeout.start()
def t():
def waiter():
# do not call wait() or poll() because they're not thread-safe
self.wait()
if not event.wait(timeout) and self.returncode is None:
self.__timeout.cancel()
# race condition if waitpid completes just before the signal sent ?
threading.Thread(target=waiter).start()
def stop(self, delay_before_kill=5):
if self.__timeout is not None: self.__timeout.cancel()
self.terminate()
self.terminate()
t = threading.Timer(delay_before_kill, self.kill)
event.__killed = True
if event.wait(5):
return
if self.returncode is None:
self.kill() # same race as for terminate ?
t = threading.Thread(target=t)
t.daemon = True
t.start()
t.start()
r = self.wait()
def killed():
t.cancel()
event.set()
return r
t.join()
return event.__killed
return killed
def init_db():
def init_db():
db = sqlite3.connect(db_path)
db = sqlite3.connect(db_path)
...
@@ -109,34 +113,23 @@ def runServices(directory):
...
@@ -109,34 +113,23 @@ def runServices(directory):
def runScripts(directory):
def runScripts(directory):
scripts = getListOfScripts(directory)
# XXX script_timeout could be passed as parameters
# XXX script_timeout could be passed as parameters
script_timeout = 60 # in seconds
script_timeout = 60 # in seconds
result = {}
result = {}
for script in scripts:
with open(os.devnull, 'r+') as f:
command = [os.path.join(promise_dir, script)]
for script in getListOfScripts(directory):
script = os.path.basename(command[0])
command = os.path.join(promise_dir, script),
script = os.path.basename(script)
result[script] = ''
result[script] = ''
process_handler = Popen(command,
p = Popen(command, cwd=instance_path,
cwd=instance_path,
env=None if sys.platform == 'cygwin' else {},
env=None if sys.platform == 'cygwin' else {},
stdout=subprocess.PIPE,
stdin=f, stdout=f, stderr=subprocess.PIPE)
stderr=subprocess.PIPE,
killed = p.set_timeout(script_timeout)
stdin=subprocess.PIPE)
stderr = p.communicate()[1]
process_handler.stdin.flush()
if killed():
process_handler.stdin.close()
process_handler.stdin = None
process_handler.timeout(script_timeout)
process_handler.wait()
if process_handler.poll() is None:
process_handler.terminate()
result[script] = "Time Out"
result[script] = "Time Out"
elif process_handler.poll() != 0:
elif p.returncode:
stderr = process_handler.communicate()[1]
if stderr is not None:
result[script] = stderr.strip()
result[script] = stderr.strip()
return result
return result
...
@@ -183,10 +176,6 @@ def main():
...
@@ -183,10 +176,6 @@ def main():
print json.dumps(monitors)
print json.dumps(monitors)
else:
else:
writeFiles(monitors)
writeFiles(monitors)
if len(monitors) == 0:
exit(0)
else:
exit(1)
if __name__ == "__main__":
if __name__ == "__main__":
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment