valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22928 from DSRCompany/flush_returners_queue

Browse Source 
Issue #22814: Flush returners queue before salt master shutdown
This commit is contained in:
Mike Place 2015-04-22 09:32:19 -06:00
commit e3fb101f63
1 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
salt/utils/event.py
View File

@ -56,6 +56,7 @@ from __future__ import absolute_import
import os import os
import time import time
import errno import errno
import signal
import hashlib import hashlib
import logging import logging
import datetime import datetime
@ -869,37 +870,56 @@ class EventReturn(multiprocessing.Process):
local_minion_opts = self.opts.copy() local_minion_opts = self.opts.copy()
local_minion_opts['file_client'] = 'local' local_minion_opts['file_client'] = 'local'
self.minion = salt.minion.MasterMinion(local_minion_opts) self.minion = salt.minion.MasterMinion(local_minion_opts)
self.event_queue = []
self.stop = False
def sig_stop(self, signum, frame):
self.stop = True # tell it to stop
def flush_events(self):
event_return = '{0}.event_return'.format(
self.opts['event_return']
)
if event_return in self.minion.returners:
try:
self.minion.returners[event_return](self.event_queue)
except Exception as exc:
log.error('Could not store events {0}. '
'Returner raised exception: {1}'.format(
self.event_queue, exc))
del self.event_queue[:]
else:
log.error(
'Could not store return for event(s) {0}. Returner '
'\'{1}\' not found.'
.format(self.event_queue, self.opts['event_return'])
)
def run(self): def run(self):
''' '''
Spin up the multiprocess event returner Spin up the multiprocess event returner
''' '''
# Properly exit if a SIGTERM is signalled
signal.signal(signal.SIGTERM, self.sig_stop)
salt.utils.appendproctitle(self.__class__.__name__) salt.utils.appendproctitle(self.__class__.__name__)
self.event = get_event('master', opts=self.opts) self.event = get_event('master', opts=self.opts)
events = self.event.iter_events(full=True) events = self.event.iter_events(full=True)
self.event.fire_event({}, 'salt/event_listen/start') self.event.fire_event({}, 'salt/event_listen/start')
event_queue = [] try:
for event in events: for event in events:
if self._filter(event): if self._filter(event):
event_queue.append(event) self.event_queue.append(event)
if len(event_queue) >= self.event_return_queue: if len(self.event_queue) >= self.event_return_queue:
event_return = '{0}.event_return'.format( self.flush_events()
self.opts['event_return'] if self.stop:
) break
if event_return in self.minion.returners: except zmq.error.ZMQError as exc:
try: if exc.errno != errno.EINTR: # Outside interrupt is a normal shutdown case
self.minion.returners[event_return](event_queue) raise
except Exception as exc: finally: # flush all we have at this moment
log.error('Could not store event {0}. ' if self.event_queue:
'Returner raised exception: {1}'.format( self.flush_events()
event, exc))
event_queue = []
else:
log.error(
'Could not store return for event(s) {0}. Returner '
'\'{1}\' not found.'
.format(event_queue, self.opts['event_return'])
)
def _filter(self, event): def _filter(self, event):
''' '''