mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-22 17:35:59 +03:00
3f5629302a
Python 3.5 in F24 was throwing the following exception: Traceback (most recent call last): File "/usr/lib/python3.5/site-packages/lvmdbusd/main.py", line 73, in process_request req.run_cmd() File "/usr/lib/python3.5/site-packages/lvmdbusd/request.py", line 73, in run_cmd self.register_error(-1, st) File "/usr/lib/python3.5/site-packages/lvmdbusd/request.py", line 123, in register_error self._reg_ending(None, error_rc, error) File "/usr/lib/python3.5/site-packages/lvmdbusd/request.py", line 115, in _reg_ending self.cb_error(self._rc_error) File "/usr/lib64/python3.5/site-packages/dbus/service.py", line 669, in <lambda> keywords[error_callback] = lambda exception: _method_reply_error(connection, message, exception) File "/usr/lib64/python3.5/site-packages/dbus/service.py", line 293, in _method_reply_error exception)) File "/usr/lib64/python3.5/traceback.py", line 136, in format_exception_only return list(TracebackException(etype, value, None).format_exception_only()) File "/usr/lib64/python3.5/traceback.py", line 442, in __init__ if (exc_value and exc_value.__cause__ is not None AttributeError: 'str' object has no attribute '__cause__' This was caused because we were calling the dbus error callback with a string instead of an actual exception. On python 3.4 this was apparently OK, but not with 3.5. Corrected to pass the exception to error callback. Change tested on both python 3.4 and 3.5. Reported-by: Vratislav Podzimek <vpodzime@redhat.com> Signed-off-by: Tony Asleson <tasleson@redhat.com>
150 lines
3.9 KiB
Python
150 lines
3.9 KiB
Python
# Copyright (C) 2015-2016 Red Hat, Inc. All rights reserved.
|
|
#
|
|
# This copyrighted material is made available to anyone wishing to use,
|
|
# modify, copy, or redistribute it subject to the terms and conditions
|
|
# of the GNU General Public License v.2.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
import threading
|
|
# noinspection PyUnresolvedReferences
|
|
from gi.repository import GObject
|
|
from .job import Job
|
|
from . import cfg
|
|
import traceback
|
|
from .utils import log_error
|
|
|
|
|
|
class RequestEntry(object):
|
|
def __init__(self, tmo, method, arguments, cb, cb_error,
|
|
return_tuple=True):
|
|
self.tmo = tmo
|
|
self.method = method
|
|
self.arguments = arguments
|
|
self.cb = cb
|
|
self.cb_error = cb_error
|
|
|
|
self.timer_id = -1
|
|
self.lock = threading.RLock()
|
|
self.done = False
|
|
self._result = None
|
|
self._job = False
|
|
self._rc = 0
|
|
self._rc_error = None
|
|
self._return_tuple = return_tuple
|
|
|
|
if self.tmo < 0:
|
|
# Client is willing to block forever
|
|
pass
|
|
elif tmo == 0:
|
|
self._return_job()
|
|
else:
|
|
self.timer_id = GObject.timeout_add_seconds(
|
|
tmo, RequestEntry._request_timeout, self)
|
|
|
|
@staticmethod
|
|
def _request_timeout(r):
|
|
"""
|
|
Method which gets called when the timer runs out!
|
|
:param r: RequestEntry which timed out
|
|
:return: Nothing
|
|
"""
|
|
r.timer_expired()
|
|
|
|
def _return_job(self):
|
|
self._job = Job(self)
|
|
cfg.om.register_object(self._job, True)
|
|
if self._return_tuple:
|
|
self.cb(('/', self._job.dbus_object_path()))
|
|
else:
|
|
self.cb(self._job.dbus_object_path())
|
|
|
|
def run_cmd(self):
|
|
try:
|
|
result = self.method(*self.arguments)
|
|
self.register_result(result)
|
|
except Exception as e:
|
|
# Use the request entry to return the result as the client may
|
|
# have gotten a job by the time we hit an error
|
|
# Lets get the stacktrace and set that to the error message
|
|
st = traceback.format_exc()
|
|
log_error("Exception returned to client: \n%s" % st)
|
|
self.register_error(-1, str(e), e)
|
|
|
|
def is_done(self):
|
|
with self.lock:
|
|
rc = self.done
|
|
return rc
|
|
|
|
def get_errors(self):
|
|
with self.lock:
|
|
return (self._rc, self._rc_error)
|
|
|
|
def result(self):
|
|
with self.lock:
|
|
if self.done:
|
|
return self._result
|
|
return '/'
|
|
|
|
def _reg_ending(self, result, error_rc=0, error_msg=None,
|
|
error_exception=None):
|
|
with self.lock:
|
|
self.done = True
|
|
if self.timer_id != -1:
|
|
# Try to prevent the timer from firing
|
|
GObject.source_remove(self.timer_id)
|
|
|
|
self._result = result
|
|
self._rc = error_rc
|
|
self._rc_error = error_msg
|
|
|
|
if not self._job:
|
|
# We finished and there is no job, so return result or error
|
|
# now!
|
|
# Note: If we don't have a valid cb or cbe, this indicates a
|
|
# request that doesn't need a response as we already returned
|
|
# one before the request was processed.
|
|
if error_rc == 0:
|
|
if self.cb:
|
|
if self._return_tuple:
|
|
self.cb((result, '/'))
|
|
else:
|
|
self.cb(result)
|
|
else:
|
|
if self.cb_error:
|
|
if not error_exception:
|
|
if not error_msg:
|
|
error_exception = Exception(
|
|
"An error occurred, but no reason was "
|
|
"given, see service logs!")
|
|
else:
|
|
error_exception = Exception(error_msg)
|
|
|
|
self.cb_error(error_exception)
|
|
else:
|
|
# We have a job and it's complete, indicate that it's done.
|
|
# TODO: We need to signal the job is done too.
|
|
self._job.Complete = True
|
|
self._job = None
|
|
|
|
def register_error(self, error_rc, error_message, error_exception):
|
|
self._reg_ending(None, error_rc, error_message, error_exception)
|
|
|
|
def register_result(self, result):
|
|
self._reg_ending(result)
|
|
|
|
def timer_expired(self):
|
|
with self.lock:
|
|
# Set the timer back to -1 as we will get a warning if we try
|
|
# to remove a timer that doesn't exist
|
|
self.timer_id = -1
|
|
if not self.done:
|
|
# Create dbus job object and return path to caller
|
|
self._return_job()
|
|
else:
|
|
# The job is done, we have nothing to do
|
|
pass
|
|
|
|
return False
|