nikon/tuned
1
0
Fork 0
Code Activity Actions

scheduler: Prevent a traceback

Browse source 
Add a new method for restoring original CPU affinity of processes
_restore_ps_affinity() and call that in _instance_init() instead of
_instance_unapply_static(). _instance_unapply_static() touches
instance._terminate, which does not yet exist at that point
(_instance_init always gets a fresh instance object).

The reason this was not a problem in the past is that the true branch
of "if len(instance._scheduler_original) > 0:" was never executed,
because instance._scheduler_original was never correctly saved
to storage. The next commit in this patch series fixes that.

Signed-off-by: Ondřej Lysoněk <olysonek@redhat.com>
This commit is contained in:
Ondřej Lysoněk 2018-06-03 10:58:32 +02:00
parent e511d70d40
commit f3f05e426f
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tuned/plugins/plugin_scheduler.py
View file

@ -57,7 +57,7 @@ class SchedulerPlugin(base.Plugin):
instance._scheduler_original = self._storage.get(self._scheduler_storage_key(instance), {})
if len(instance._scheduler_original) > 0:
log.info("recovering scheduling settings from previous run")
self._instance_unapply_static(instance)
self._restore_ps_affinity(instance)
instance._scheduler_original = {}
self._storage.unset(self._scheduler_storage_key(instance))
@ -274,13 +274,8 @@ class SchedulerPlugin(base.Plugin):
instance._thread = threading.Thread(target = self._thread_code, args = [instance])
instance._thread.start()
def _instance_unapply_static(self, instance, full_rollback = False):
super(SchedulerPlugin, self)._instance_unapply_static(instance, full_rollback)
def _restore_ps_affinity(self, instance):
ps = self.get_processes()
if self._daemon and instance._runtime_tuning:
instance._terminate.set()
instance._thread.join()
for pid, vals in list(instance._scheduler_original.items()):
# if command line for the pid didn't change, it's very probably the same process
try:
@ -289,6 +284,15 @@ class SchedulerPlugin(base.Plugin):
self._set_affinity(pid, vals[3])
except KeyError as e:
pass
instance._scheduler_original = {}
self._storage.unset(self._scheduler_storage_key(instance))
def _instance_unapply_static(self, instance, full_rollback = False):
super(SchedulerPlugin, self)._instance_unapply_static(instance, full_rollback)
if self._daemon and instance._runtime_tuning:
instance._terminate.set()
instance._thread.join()
self._restore_ps_affinity(instance)
def _add_pid(self, instance, pid, r):
cmd = self.get_process(pid)