incubator-kudu git commit: KUDU-1389. Retry on EINTR in more PosixEnv syscalls

[mp...@apache.org]

Repository: incubator-kudu
Updated Branches:
  refs/heads/master 3cb45e969 -> fd0f6f398


KUDU-1389. Retry on EINTR in more PosixEnv syscalls

* Retry on EINTR in PosixSequentialFile::Read().
* Add RETRY_ON_EINTR for pwrite calls.

Change-Id: I26ed36b0a37aa6a252701d712704969014d6fa79
Reviewed-on: http://gerrit.cloudera.org:8080/2819
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Tested-by: Kudu Jenkins


Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/fd0f6f39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/fd0f6f39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/fd0f6f39

Branch: refs/heads/master
Commit: fd0f6f398d9e0809b9575ebd4846fea8dfe2bafb
Parents: 3cb45e9
Author: Mike Percy <mp...@apache.org>
Authored: Tue Apr 19 14:03:03 2016 -0700
Committer: Mike Percy <mp...@apache.org>
Committed: Wed Apr 20 19:41:45 2016 +0000

----------------------------------------------------------------------
 src/kudu/util/env_posix.cc | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/fd0f6f39/src/kudu/util/env_posix.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/env_posix.cc b/src/kudu/util/env_posix.cc
index 73399ca..74bd3f9 100644
--- a/src/kudu/util/env_posix.cc
+++ b/src/kudu/util/env_posix.cc
@@ -18,6 +18,7 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <time.h>
+#include <type_traits>
 #include <unistd.h>
 #include <vector>
 
@@ -65,9 +66,19 @@
 #define fread_unlocked fread
 #endif
 
-#define RETRY_ON_EINTR(ret, expr) do { \
-  ret = (expr); \
-} while ((ret == -1) && (errno == EINTR));
+// Retry on EINTR for functions like read() that return -1 on error.
+#define RETRY_ON_EINTR(err, expr) do { \
+  static_assert(std::is_signed<decltype(err)>::value == true, \
+                #err " must be a signed integer"); \
+  (err) = (expr); \
+} while ((err) == -1 && errno == EINTR)
+
+// Same as the above, but for stream API calls like fread() and fwrite().
+#define STREAM_RETRY_ON_EINTR(nread, stream, expr) do { \
+  static_assert(std::is_unsigned<decltype(nread)>::value == true, \
+                #nread " must be an unsigned integer"); \
+  (nread) = (expr); \
+} while ((nread) == 0 && ferror(stream) == EINTR)
 
 // See KUDU-588 for details.
 DEFINE_bool(writable_file_use_fsync, false,
@@ -222,7 +233,8 @@ class PosixSequentialFile: public SequentialFile {
   virtual Status Read(size_t n, Slice* result, uint8_t* scratch) OVERRIDE {
     ThreadRestrictions::AssertIOAllowed();
     Status s;
-    size_t r = fread_unlocked(scratch, 1, n, file_);
+    size_t r;
+    STREAM_RETRY_ON_EINTR(r, file_, fread_unlocked(scratch, 1, n, file_));
     *result = Slice(scratch, r);
     if (r < n) {
       if (feof(file_)) {
@@ -441,7 +453,8 @@ class PosixWritableFile : public WritableFile {
       ++j;
     }
 
-    ssize_t written = pwritev(fd_, iov, n, filesize_);
+    ssize_t written;
+    RETRY_ON_EINTR(written, pwritev(fd_, iov, n, filesize_));
 
     if (PREDICT_FALSE(written == -1)) {
       int err = errno;
@@ -458,7 +471,8 @@ class PosixWritableFile : public WritableFile {
 #else
     for (size_t i = offset; i < offset + n; i++) {
       const Slice& data = data_vector[i];
-      ssize_t written = pwrite(fd_, data.data(), data.size(), filesize_);
+      ssize_t written;
+      RETRY_ON_EINTR(written, pwrite(fd_, data.data(), data.size(), filesize_));
       if (PREDICT_FALSE(written == -1)) {
         int err = errno;
         return IOError("pwrite error", err);
@@ -530,7 +544,8 @@ class PosixRWFile : public RWFile {
 
   virtual Status Write(uint64_t offset, const Slice& data) OVERRIDE {
     ThreadRestrictions::AssertIOAllowed();
-    ssize_t written = pwrite(fd_, data.data(), data.size(), offset);
+    ssize_t written;
+    RETRY_ON_EINTR(written, pwrite(fd_, data.data(), data.size(), offset));
 
     if (PREDICT_FALSE(written == -1)) {
       int err = errno;