From 1acb6717d9ca07ee8d5e503bde7cbb55667e49ea Mon Sep 17 00:00:00 2001 From: "Kevin(Shengkai) Wang" Date: Wed, 9 Jan 2019 03:09:33 +0800 Subject: [PATCH] [mellanox] Block the select function by default in get_transceiver_change_event() (#2422) * Use default timeout value which will block the select function * Submodule update for argument type issue in Select class Submodule update sonic-swss-common: e8caaea - Align the argument type with epoll_wait() (#255) 3ea133d - [selectable]: Update throw message (#253) Signed-off-by: Kevin Wang --- device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py | 6 +++++- src/sonic-swss-common | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py index 1a02b9ff39..e4f9f05d41 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py +++ b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py @@ -176,7 +176,11 @@ class SfpUtil(SfpUtilBase): if 'LIVENESS' not in keys: return False, phy_port_dict - (state, c) = self.db_sel.select(timeout) + if timeout: + (state, c) = self.db_sel.select(timeout) + else: + (state, c) = self.db_sel.select() + if state == self.db_sel_timeout: status = True elif state != self.db_sel_object: diff --git a/src/sonic-swss-common b/src/sonic-swss-common index edbfeec663..e8caaead52 160000 --- a/src/sonic-swss-common +++ b/src/sonic-swss-common @@ -1 +1 @@ -Subproject commit edbfeec663f32585cbf3468a88deb950fed3bb69 +Subproject commit e8caaead527d46d42e41e99b884f41c57f70018b