From: huangjun <hjwsm1989@gmail.com>
Date: Thu, 23 Mar 2017 00:40:11 +0000 (+0800)
Subject:   osd/PrimaryLogPG: set return value if sparse read failed
X-Git-Tag: v12.0.2~285^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7669e9f3edb72d12f1b5cd5f587ac61a65aaf635;p=ceph.git

  osd/PrimaryLogPG: set return value if sparse read failed

  Signed-off-by: huangjun <hjwsm1989@gmail.com>
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 97f06ecfb00e..62342eec514d 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -4399,8 +4399,10 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 
           bufferlist tmpbl;
 	  r = pgbackend->objects_read_sync(soid, miter->first, miter->second, op.flags, &tmpbl);
-          if (r < 0)
+          if (r < 0) {
+            result = r;
             break;
+          }
 
           if (r < (int)miter->second) /* this is usually happen when we get extent that exceeds the actual file size */
             miter->second = r;