From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 17 Mar 2017 17:05:55 +0000 (-0400)
Subject: common: do not print error when asok is closed
X-Git-Tag: v12.0.2~122^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be09f4ced709b10abb13406e0a3c4902c1e8bfec;p=ceph-ci.git

common: do not print error when asok is closed

If the admin socket is closed without sending a command, we get stderr messages like:

    ceph-mds[17174]: 2017-03-16 02:30:06.240322 7f40c7e44700 -1 asok(0x561abb4d4000) AdminSocket: error reading request code: (0) Success

If the socket is closed on the other end, just return.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc
index bc1feec69c3..36e198cb7bf 100644
--- a/src/common/admin_socket.cc
+++ b/src/common/admin_socket.cc
@@ -320,8 +320,10 @@ bool AdminSocket::do_accept()
   while (1) {
     int ret = safe_read(connection_fd, &cmd[pos], 1);
     if (ret <= 0) {
-      lderr(m_cct) << "AdminSocket: error reading request code: "
-		   << cpp_strerror(ret) << dendl;
+      if (ret < 0) {
+        lderr(m_cct) << "AdminSocket: error reading request code: "
+		     << cpp_strerror(ret) << dendl;
+      }
       VOID_TEMP_FAILURE_RETRY(close(connection_fd));
       return false;
     }