From fd6f5725a9fdbd6544548285d0853bdba83aeaff Mon Sep 17 00:00:00 2001 From: Kotresh HR Date: Fri, 7 Apr 2017 05:33:34 -0400 Subject: geo-rep: Fix EBUSY traceback EBUSY was added to retry list of errno_wrap without importing. Fixing the same. > BUG: 1434018 > Signed-off-by: Kotresh HR > Reviewed-on: https://review.gluster.org/17011 > NetBSD-regression: NetBSD Build System > CentOS-regression: Gluster Build System > Smoke: Gluster Build System > Reviewed-by: Aravinda VK Change-Id: Ide81a9ccc9b948a96265b6890da078b722b45d51 BUG: 1441927 Signed-off-by: Kotresh HR Reviewed-on: https://review.gluster.org/17050 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Aravinda VK --- geo-replication/syncdaemon/resource.py | 2 +- geo-replication/syncdaemon/syncdutils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py index 977496318da..847ee770aaf 100644 --- a/geo-replication/syncdaemon/resource.py +++ b/geo-replication/syncdaemon/resource.py @@ -24,7 +24,7 @@ import tempfile import threading import subprocess from errno import EEXIST, ENOENT, ENODATA, ENOTDIR, ELOOP -from errno import EISDIR, ENOTEMPTY, ESTALE, EINVAL +from errno import EISDIR, ENOTEMPTY, ESTALE, EINVAL, EBUSY from select import error as SelectError import shutil diff --git a/geo-replication/syncdaemon/syncdutils.py b/geo-replication/syncdaemon/syncdutils.py index 292cd0aea19..d197b122b8f 100644 --- a/geo-replication/syncdaemon/syncdutils.py +++ b/geo-replication/syncdaemon/syncdutils.py @@ -18,7 +18,7 @@ import logging import socket from threading import Lock, Thread as baseThread from errno import EACCES, EAGAIN, EPIPE, ENOTCONN, ECONNABORTED -from errno import EINTR, ENOENT, EPERM, ESTALE, errorcode +from errno import EINTR, ENOENT, EPERM, ESTALE, EBUSY, errorcode from signal import signal, SIGTERM import select as oselect from os import waitpid as owaitpid -- cgit