Merge working tree with build tree.

[m6w6/libmemcached] / libmemcached / do.cc

diff --git a/libmemcached/do.cc b/libmemcached/do.cc
index 3c3519c27b9cccb29df440a9e4719735bb3be424..2ce64483485a92c08da9c46a5d4cf2be49eb2235 100644 (file)
--- a/libmemcached/do.cc
+++ b/libmemcached/do.cc
@@ -50,9 +50,23 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
     msg.msg_iov= (struct iovec*)vector;
     msg.msg_iovlen= count;
 
-    if (::sendmsg(instance->fd, &msg, 0) < 1)
+    uint32_t retry= 5;
+    while (--retry)
     {
-      return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+      ssize_t sendmsg_length= ::sendmsg(instance->fd, &msg, 0);
+      if (sendmsg_length > 0)
+      {
+        break;
+      }
+      else if (sendmsg_length < 0)
+      {
+        if (errno == EMSGSIZE)
+        {
+          return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+        }
+
+        return memcached_set_errno(*instance, errno, MEMCACHED_AT);
+      }
     }
 
     return MEMCACHED_SUCCESS;
@@ -67,9 +81,14 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
 
   if (sent_length == -1 or size_t(sent_length) != command_length)
   {
-    rc= MEMCACHED_WRITE_FAILURE;
-    WATCHPOINT_ERROR(rc);
-    WATCHPOINT_ERRNO(errno);
+    if (memcached_last_error(instance->root) == MEMCACHED_SUCCESS)
+    {
+      return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+    }
+    else
+    {
+      rc= MEMCACHED_WRITE_FAILURE;
+    }
   }
   else if (memcached_is_replying(instance->root))
   {