tsarevvv/nmstate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nm.active_connetion: retry on profile activation if libnm error happened

Browse Source 
When activating a profile if NetworkManager fails during the activation,
Nmstate should retry it once.

Then `mark_as_managed` is not needed anymore and is being removed.

Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
This commit is contained in:
Fernando Fernandez Mancera 2021-01-19 16:51:01 +01:00 committed by Gris Ge
parent db2288f63d
commit cbe5b57d0d
2 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libnmstate/nm/active_connection.py
View File

@ -27,7 +27,6 @@ from .common import Gio
from .common import NM
from .device import get_nm_dev
from .device import get_iface_type
from .device import mark_device_as_managed
from .ipv4 import is_dynamic as is_ipv4_dynamic
from .ipv6 import is_dynamic as is_ipv6_dynamic
@ -100,11 +99,8 @@ class ProfileActivation:
f"Activate profile uuid:{self._nm_profile.get_uuid()} "
f"iface:{self._iface_name} type: {self._iface_type}"
)
if self._nm_dev:
# Workaround of https://bugzilla.redhat.com/1880420
mark_device_as_managed(self._ctx, self._nm_dev)
user_data = None
retry = True
self._ctx.register_async(self._action)
self._ctx.client.activate_connection_async(
self._nm_profile,
@ -112,7 +108,7 @@ class ProfileActivation:
specific_object,
self._ctx.cancellable,
self._activate_profile_callback,
user_data,
retry,
)
self._fallback_checker = GLib.timeout_source_new(
FALLBACK_CHECKER_INTERNAL * 1000
@ -146,7 +142,7 @@ class ProfileActivation:
activation._fallback_checker.attach(ctx.context)
activation._wait_profile_activation()
def _activate_profile_callback(self, nm_client, result, _user_data):
def _activate_profile_callback(self, nm_client, result, retry):
nm_ac = None
if self._ctx.is_cancelled():
self._activation_clean_up()
@ -154,7 +150,20 @@ class ProfileActivation:
try:
nm_ac = nm_client.activate_connection_finish(result)
except GLib.Error as e:
if e.matches(Gio.io_error_quark(), Gio.IOErrorEnum.TIMED_OUT):
if retry:
retry = False
specific_object = None
logging.debug(f"Action {self._action} failed, trying again.")
self._ctx.client.activate_connection_async(
self._nm_profile,
self._nm_dev,
specific_object,
self._ctx.cancellable,
self._activate_profile_callback,
retry,
)
return
elif e.matches(Gio.io_error_quark(), Gio.IOErrorEnum.TIMED_OUT):
logging.debug(
f"{self._action} timeout on activation, "
"using fallback method to wait activation"

25
libnmstate/nm/device.py
View File

@ -23,7 +23,6 @@ from libnmstate.error import NmstateLibnmError
from libnmstate.schema import InterfaceType
from .common import NM
from .common import GLib
from .macvlan import is_macvtap
from .translator import Nm2Api
from .veth import is_veth
@ -160,30 +159,6 @@ def is_externally_managed(nm_dev):
return nm_ac and NM.ActivationStateFlags.EXTERNAL & nm_ac.get_state_flags()
def mark_device_as_managed(context, nm_dev):
action = f"Set device as managed: {nm_dev.get_iface()}"
context.register_async(action, fast=True)
user_data = context, action
context.client.dbus_set_property(
NM.Object.get_path(nm_dev),
NM_DBUS_INTERFACE_DEVICE,
"Managed",
GLib.Variant.new_boolean(True),
NM_USE_DEFAULT_TIMEOUT_VALUE,
context.cancellable,
_set_managed_callback,
user_data,
)
context.wait_all_finish()
def _set_managed_callback(_src_object, _result, user_data):
context, action = user_data
# There is no document mention this action might fail
# If anything goes wrong, we trust verifcation stage can detect it.
context.finish_async(action)
def get_iface_type(nm_dev):
# TODO: Below code are mimic from translator, need redesign on this
iface_type = nm_dev.get_type_description()