|
 |
21ab4e |
From b9440ad4a074f7617fa9556dd0803d24013d19fd Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Kotresh HR <khiremat@redhat.com>
|
|
|
21ab4e |
Date: Fri, 7 Apr 2017 05:33:34 -0400
|
|
|
21ab4e |
Subject: [PATCH 379/393] geo-rep: Fix EBUSY traceback
|
|
|
21ab4e |
|
|
|
21ab4e |
EBUSY was added to retry list of errno_wrap
|
|
|
21ab4e |
without importing. Fixing the same.
|
|
|
21ab4e |
|
|
|
21ab4e |
> BUG: 1434018
|
|
|
21ab4e |
> Signed-off-by: Kotresh HR <khiremat@redhat.com>
|
|
|
21ab4e |
> Reviewed-on: https://review.gluster.org/17011
|
|
|
21ab4e |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> Reviewed-by: Aravinda VK <avishwan@redhat.com>
|
|
|
21ab4e |
|
|
|
21ab4e |
Change-Id: Ide81a9ccc9b948a96265b6890da078b722b45d51
|
|
|
21ab4e |
BUG: 1427870
|
|
|
21ab4e |
Signed-off-by: Kotresh HR <khiremat@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/103383
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
geo-replication/syncdaemon/resource.py | 2 +-
|
|
|
21ab4e |
geo-replication/syncdaemon/syncdutils.py | 2 +-
|
|
|
21ab4e |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
|
|
|
21ab4e |
index 6397cf3..e4b4e55 100644
|
|
|
21ab4e |
--- a/geo-replication/syncdaemon/resource.py
|
|
|
21ab4e |
+++ b/geo-replication/syncdaemon/resource.py
|
|
|
21ab4e |
@@ -24,7 +24,7 @@ import tempfile
|
|
|
21ab4e |
import threading
|
|
|
21ab4e |
import subprocess
|
|
|
21ab4e |
from errno import EEXIST, ENOENT, ENODATA, ENOTDIR, ELOOP
|
|
|
21ab4e |
-from errno import EISDIR, ENOTEMPTY, ESTALE, EINVAL
|
|
|
21ab4e |
+from errno import EISDIR, ENOTEMPTY, ESTALE, EINVAL, EBUSY
|
|
|
21ab4e |
from select import error as SelectError
|
|
|
21ab4e |
import shutil
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/geo-replication/syncdaemon/syncdutils.py b/geo-replication/syncdaemon/syncdutils.py
|
|
|
21ab4e |
index e85857f..a22289e 100644
|
|
|
21ab4e |
--- a/geo-replication/syncdaemon/syncdutils.py
|
|
|
21ab4e |
+++ b/geo-replication/syncdaemon/syncdutils.py
|
|
|
21ab4e |
@@ -18,7 +18,7 @@ import logging
|
|
|
21ab4e |
import socket
|
|
|
21ab4e |
from threading import Lock, Thread as baseThread
|
|
|
21ab4e |
from errno import EACCES, EAGAIN, EPIPE, ENOTCONN, ECONNABORTED
|
|
|
21ab4e |
-from errno import EINTR, ENOENT, EPERM, ESTALE, errorcode
|
|
|
21ab4e |
+from errno import EINTR, ENOENT, EPERM, ESTALE, EBUSY, errorcode
|
|
|
21ab4e |
from signal import signal, SIGTERM
|
|
|
21ab4e |
import select as oselect
|
|
|
21ab4e |
from os import waitpid as owaitpid
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|