diff --git a/src/box/recovery.cc b/src/box/recovery.cc
index 0cfb9cfeb334880f39f1805a76d6c6a9166dfc02..5feeece84b2c8eb890a6b7ccc3ae155889eb9d62 100644
--- a/src/box/recovery.cc
+++ b/src/box/recovery.cc
@@ -906,6 +906,11 @@ wal_opt_rotate(struct xlog **wal, struct recovery_state *r,
 		 * (when we close the file), and try to reopen the next
 		 * WAL. In other words, make sure that replication relays
 		 * try to open the next WAL only when it exists.
+		 *
+		 * On the other hand, this creates a nasty race
+		 * condition when a relay sees a newer file
+		 * without possibly have read all the content
+		 * of the previous file.
 		 */
 		if (wal_to_close) {
 			/*
diff --git a/test/box/bsdsocket.result b/test/box/bsdsocket.result
index 691d63bd6030755bf6f0b26ac5171952aa40fb2d..0114c29326151c7514cbae66d4d89646842e545f 100644
--- a/test/box/bsdsocket.result
+++ b/test/box/bsdsocket.result
@@ -596,7 +596,7 @@ function aexitst(ai, host, port)
             return true
         end
     end
-    return false
+    return ai 
 end;
 ---
 ...
diff --git a/test/box/bsdsocket.test.lua b/test/box/bsdsocket.test.lua
index 98ac0a4d2200e84ee7a28a3053135e794259db28..17cb89605de8b13c8d9fbe3eed5584e6cf5bf847 100644
--- a/test/box/bsdsocket.test.lua
+++ b/test/box/bsdsocket.test.lua
@@ -190,7 +190,7 @@ function aexitst(ai, host, port)
             return true
         end
     end
-    return false
+    return ai 
 end;
 
 aexitst( socket.getaddrinfo('localhost', 'http', {  protocol = 'tcp',