Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
29e5f865d0
|
|||
8bbd8dbec2
|
|||
76639d8472
|
|||
e0cb7b8ca0
|
|||
22a2b4557b
|
22
bin/sau
22
bin/sau
@ -45,8 +45,13 @@ def init():
|
|||||||
log.addHandler(handler)
|
log.addHandler(handler)
|
||||||
|
|
||||||
|
|
||||||
def fork_and_reboot():
|
def fork_and_reboot(report_success=True):
|
||||||
log = logging.getLogger(sau.LOGNAME)
|
log = logging.getLogger(sau.LOGNAME)
|
||||||
|
if report_success:
|
||||||
|
exit_code=0
|
||||||
|
else:
|
||||||
|
exit_code=1
|
||||||
|
|
||||||
if os.path.exists('/proc/1/comm'):
|
if os.path.exists('/proc/1/comm'):
|
||||||
with open('/proc/1/comm', 'r') as f:
|
with open('/proc/1/comm', 'r') as f:
|
||||||
if f.readline().strip() == 'systemd':
|
if f.readline().strip() == 'systemd':
|
||||||
@ -56,7 +61,7 @@ def fork_and_reboot():
|
|||||||
try:
|
try:
|
||||||
pid = os.fork()
|
pid = os.fork()
|
||||||
if pid != 0:
|
if pid != 0:
|
||||||
sys.exit(0)
|
sys.exit(exit_code)
|
||||||
except OSError as err:
|
except OSError as err:
|
||||||
log.error("Fork #1 failed when going for reboot: {}".format(err))
|
log.error("Fork #1 failed when going for reboot: {}".format(err))
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
@ -83,8 +88,6 @@ def fork_and_reboot():
|
|||||||
os.dup2(stdout.fileno(), sys.stdout.fileno())
|
os.dup2(stdout.fileno(), sys.stdout.fileno())
|
||||||
os.dup2(stderr.fileno(), sys.stderr.fileno())
|
os.dup2(stderr.fileno(), sys.stderr.fileno())
|
||||||
|
|
||||||
log.warning("New fork!")
|
|
||||||
|
|
||||||
# sleep for a short while to give parent time to exit
|
# sleep for a short while to give parent time to exit
|
||||||
time.sleep(30)
|
time.sleep(30)
|
||||||
try:
|
try:
|
||||||
@ -121,7 +124,16 @@ def main():
|
|||||||
elif reboot_recommended:
|
elif reboot_recommended:
|
||||||
log.info('Rebooting because service restarts did not close all deleted files')
|
log.info('Rebooting because service restarts did not close all deleted files')
|
||||||
if reboot_required or reboot_recommended:
|
if reboot_required or reboot_recommended:
|
||||||
fork_and_reboot()
|
fork_and_reboot(report_success=conf.getboolean('default', 'reboot_is_success', Fallback=True))
|
||||||
|
|
||||||
|
if reboot_required:
|
||||||
|
log.warning("Upgrade was success, but a reboot is required due to a system upgrade")
|
||||||
|
return 1
|
||||||
|
elif reboot_recommended:
|
||||||
|
log.warning("Some services still uses old, deleted, files. You probably want to reboot")
|
||||||
|
return 1
|
||||||
|
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
def _conf_level_to_logging_level(conf_level):
|
def _conf_level_to_logging_level(conf_level):
|
||||||
|
@ -16,6 +16,9 @@ version_sensitivity=1
|
|||||||
# not close all deleted files (any platform)
|
# not close all deleted files (any platform)
|
||||||
do_reboot=no
|
do_reboot=no
|
||||||
|
|
||||||
|
# Set to 0 to exit with failure code when going for reboot.
|
||||||
|
reboot_is_success=yes
|
||||||
|
|
||||||
# Attempt to do a system upgrade
|
# Attempt to do a system upgrade
|
||||||
# FreeBSD: upgrade to latest patch version using freebsd-update fetch install
|
# FreeBSD: upgrade to latest patch version using freebsd-update fetch install
|
||||||
# Gentoo: allow upgrade of sys-kernel/-packages, clean old kernels, and update grub-config
|
# Gentoo: allow upgrade of sys-kernel/-packages, clean old kernels, and update grub-config
|
||||||
|
@ -224,7 +224,7 @@ def pkg_upgrade():
|
|||||||
log.error('keep_kernels cannot be less than one; falling back to default')
|
log.error('keep_kernels cannot be less than one; falling back to default')
|
||||||
keep_kernels = 4
|
keep_kernels = 4
|
||||||
for root, dirs, files in os.walk('/boot'):
|
for root, dirs, files in os.walk('/boot'):
|
||||||
for sysfile in ['config', 'initramfs', 'System.map', 'vmlinuz']:
|
for sysfile in ['config', 'initramfs', 'System.map', 'vmlinuz', 'kernel']:
|
||||||
match = sorted(
|
match = sorted(
|
||||||
[f for f in files if f.startswith(f'{sysfile}-')],
|
[f for f in files if f.startswith(f'{sysfile}-')],
|
||||||
reverse=True)
|
reverse=True)
|
||||||
|
105
sau/services.py
105
sau/services.py
@ -7,6 +7,7 @@ import psutil
|
|||||||
|
|
||||||
import sau
|
import sau
|
||||||
import sau.errors
|
import sau.errors
|
||||||
|
import sau.helpers
|
||||||
import sau.platforms
|
import sau.platforms
|
||||||
|
|
||||||
proc_fd_map_re = re.compile(r'^.*(/[^\(]*) \(deleted\)$')
|
proc_fd_map_re = re.compile(r'^.*(/[^\(]*) \(deleted\)$')
|
||||||
@ -16,7 +17,7 @@ def _warn(policy, msg):
|
|||||||
if not policy.startswith('silent'):
|
if not policy.startswith('silent'):
|
||||||
log.warning(msg)
|
log.warning(msg)
|
||||||
|
|
||||||
def _get_deleted_open_files(proc):
|
def get_deleted_open_files(proc):
|
||||||
log = logging.getLogger(sau.LOGNAME)
|
log = logging.getLogger(sau.LOGNAME)
|
||||||
files = set()
|
files = set()
|
||||||
|
|
||||||
@ -62,25 +63,40 @@ def get_exe_file(name):
|
|||||||
log.debug('Found binary for {} at {}'.format(name, root))
|
log.debug('Found binary for {} at {}'.format(name, root))
|
||||||
return os.path.join(root, name)
|
return os.path.join(root, name)
|
||||||
|
|
||||||
|
# return all processes with open files
|
||||||
|
def _get_processes():
|
||||||
|
log = logging.getLogger(sau.LOGNAME)
|
||||||
|
check_procs = set()
|
||||||
|
for proc in psutil.process_iter():
|
||||||
|
files = get_deleted_open_files(proc)
|
||||||
|
if files:
|
||||||
|
log.debug('{} has open deleted files'.format(proc))
|
||||||
|
check_procs.add(proc)
|
||||||
|
|
||||||
|
return check_procs
|
||||||
|
|
||||||
def restart_services():
|
def restart_services():
|
||||||
log = logging.getLogger(sau.LOGNAME)
|
log = logging.getLogger(sau.LOGNAME)
|
||||||
platform = sau.platforms.get_platform()
|
platform = sau.platforms.get_platform()
|
||||||
conf = sau.config
|
conf = sau.config
|
||||||
check_procs = set()
|
|
||||||
for proc in psutil.process_iter():
|
|
||||||
files = _get_deleted_open_files(proc)
|
|
||||||
if files:
|
|
||||||
log.info('{} has open deleted files'.format(proc))
|
|
||||||
check_procs.add(proc)
|
|
||||||
|
|
||||||
|
check_procs = _get_processes()
|
||||||
# wait before the second test
|
# wait before the second test
|
||||||
time.sleep(1)
|
time.sleep(5)
|
||||||
|
|
||||||
|
on_systemd = False
|
||||||
|
try:
|
||||||
|
init_proc = psutil.Process(pid=1)
|
||||||
|
if init_proc.name() == 'systemd':
|
||||||
|
on_systemd = True
|
||||||
|
except psutil.NoSuchProcess:
|
||||||
|
pass
|
||||||
|
|
||||||
# perform a second check to remove potential false positives
|
# perform a second check to remove potential false positives
|
||||||
service_procs = set()
|
service_procs = set()
|
||||||
retest_procs = set()
|
retest_procs = set()
|
||||||
for proc in check_procs:
|
for proc in check_procs:
|
||||||
files = _get_deleted_open_files(proc)
|
files = get_deleted_open_files(proc)
|
||||||
if not files:
|
if not files:
|
||||||
# no deleted open files for this process any longer
|
# no deleted open files for this process any longer
|
||||||
continue
|
continue
|
||||||
@ -89,32 +105,60 @@ def restart_services():
|
|||||||
except (psutil.NoSuchProcess, psutil.ZombieProcess, psutil.AccessDenied):
|
except (psutil.NoSuchProcess, psutil.ZombieProcess, psutil.AccessDenied):
|
||||||
# either of the above exceptions means the process has quit
|
# either of the above exceptions means the process has quit
|
||||||
continue
|
continue
|
||||||
parent = _get_top_parent(proc)
|
if on_systemd:
|
||||||
|
service_procs.add(proc)
|
||||||
|
else:
|
||||||
|
parent = _get_top_parent(proc)
|
||||||
|
service_procs.add(parent)
|
||||||
|
|
||||||
service_procs.add(parent)
|
|
||||||
retest_procs.add(proc)
|
retest_procs.add(proc)
|
||||||
|
|
||||||
|
recommend_restart = False
|
||||||
processes = {}
|
processes = {}
|
||||||
services = {}
|
services = {}
|
||||||
for proc in service_procs:
|
for proc in service_procs:
|
||||||
if not proc:
|
if not proc:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
service_name = None
|
||||||
try:
|
try:
|
||||||
service_exe = proc.exe()
|
service_exe = proc.exe()
|
||||||
proc_name = proc.name()
|
proc_name = proc.name()
|
||||||
except (psutil.NoSuchProcess, psutil.ZombieProcess, psutil.AccessDenied):
|
except (psutil.NoSuchProcess, psutil.ZombieProcess, psutil.AccessDenied):
|
||||||
log.debug('{} died before it could be restarted'.format(proc))
|
log.debug('{} died before it could be restarted'.format(proc))
|
||||||
continue
|
continue
|
||||||
service_name = _get_service_from_proc(proc)
|
|
||||||
|
if on_systemd:
|
||||||
|
if proc.pid == 1:
|
||||||
|
log.info("Upgrade of systemd detected; doing daemon-reexec")
|
||||||
|
ret, _out, _err = sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'daemon-reexec' ])
|
||||||
|
continue
|
||||||
|
ret, unit, err = sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'whoami', f'{proc.pid}' ])
|
||||||
|
unit = unit.strip()
|
||||||
|
name, unit_type = unit.split('.')
|
||||||
|
if ret != 0:
|
||||||
|
log.debug(f'Non-success ({ret}) when checking unit for process: {err}')
|
||||||
|
continue
|
||||||
|
elif unit_type != 'service':
|
||||||
|
log.warning(f'not restarting non-service unit "{unit}"; owner of {proc}')
|
||||||
|
else:
|
||||||
|
_ret, enabled, _err = sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'is-enabled', unit ])
|
||||||
|
enabled = enabled.strip()
|
||||||
|
if enabled in ('enabled', 'static'):
|
||||||
|
log.warning(f'Unit {name}.service has enable status: {enabled} - will only restart "enabled" services')
|
||||||
|
else:
|
||||||
|
service_name = name
|
||||||
|
else:
|
||||||
|
service_name = _get_service_from_proc(proc)
|
||||||
|
|
||||||
if not service_name:
|
if not service_name:
|
||||||
log.debug('no service for process {}'.format(proc))
|
log.warning('no service for process {}'.format(proc))
|
||||||
|
recommend_restart = True
|
||||||
continue
|
continue
|
||||||
|
|
||||||
services[proc_name] = service_name
|
services[proc_name] = service_name
|
||||||
processes[service_name] = [proc]
|
processes[service_name] = [proc]
|
||||||
|
|
||||||
recommend_restart = False
|
|
||||||
for service in set([x for x in services.values() if x]):
|
for service in set([x for x in services.values() if x]):
|
||||||
policy = _get_service_restart_policy(service)
|
policy = _get_service_restart_policy(service)
|
||||||
if policy == 'ignore':
|
if policy == 'ignore':
|
||||||
@ -131,34 +175,17 @@ def restart_services():
|
|||||||
|
|
||||||
tested_parents = set()
|
tested_parents = set()
|
||||||
for proc in retest_procs:
|
for proc in retest_procs:
|
||||||
parent = _get_top_parent(proc)
|
try:
|
||||||
if not parent:
|
proc_name = proc.name()
|
||||||
continue
|
if proc_name not in services:
|
||||||
parent_name = parent.name()
|
continue
|
||||||
if parent in tested_parents:
|
except (psutil.NoSuchProcess, psutil.ZombieProcess, psutil.AccessDenied):
|
||||||
log.debug('{} belongs to already tested parent {}'.format(proc, parent))
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if _get_deleted_open_files(proc):
|
if get_deleted_open_files(proc):
|
||||||
tested_parents.add(parent)
|
service = services[proc_name]
|
||||||
service = _get_service_from_proc(parent)
|
|
||||||
if not service:
|
|
||||||
log.warning('could not re-check process {} - failed to identify service'.format(proc))
|
|
||||||
recommend_restart = True
|
|
||||||
continue
|
|
||||||
policy = _get_service_restart_policy(service)
|
policy = _get_service_restart_policy(service)
|
||||||
|
_warn(policy, '{} still has deleted files open'.format(proc, parent))
|
||||||
log.debug('{} is in service {}'.format(proc, service))
|
|
||||||
if parent_name in services and not services[parent_name]:
|
|
||||||
_warn(policy, '{} (parent {}) does not belong to a service and could not be restarted'.format(proc, parent))
|
|
||||||
recommend_restart = True
|
|
||||||
continue
|
|
||||||
elif parent_name in services:
|
|
||||||
policy = _get_service_restart_policy(service)
|
|
||||||
log.debug('service {} has policy {}'.format(service, policy))
|
|
||||||
if policy in ('ignore', 'warn'):
|
|
||||||
continue
|
|
||||||
_warn(policy, '{} (parent {}) still has deleted files open'.format(proc, parent))
|
|
||||||
recommend_restart = True
|
recommend_restart = True
|
||||||
return recommend_restart
|
return recommend_restart
|
||||||
|
|
||||||
|
2
setup.py
2
setup.py
@ -5,7 +5,7 @@ from setuptools import setup, find_packages
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='sau',
|
name='sau',
|
||||||
version='0.9.4',
|
version='1.2.0',
|
||||||
description='Tool for auto-updating OS and packages',
|
description='Tool for auto-updating OS and packages',
|
||||||
author='Feffe',
|
author='Feffe',
|
||||||
author_email='feffe@fulh.ax',
|
author_email='feffe@fulh.ax',
|
||||||
|
Reference in New Issue
Block a user