osd: partial revert of "ReplicatedPG: result code not correctly set in some cases."

This reverts the parts of commit 3b5d54bec0f0556b7dd6e7ea7e6df02ec71f97d9
that change omap return values (i.e., do not just assert, but
change what the client sees).

Fixes: #13796
Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 67a0657613bcb79856d9dd3a4d000e14ebaed82f..c5c290fe1bd62f8003a31934bd930959c9ee234b 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5277,7 +5277,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
        newop.op.op = CEPH_OSD_OP_SYNC_READ;
        newop.op.extent.offset = 0;
        newop.op.extent.length = 0;
-       result = do_osd_ops(ctx, nops);
+       do_osd_ops(ctx, nops);
        osd_op.outdata.claim(newop.outdata);
       }
       break;
@@ -5444,9 +5444,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
       }
       ++ctx->num_read;
       {
-       result = osd->store->omap_get_header(coll, ghobject_t(soid), &osd_op.outdata);
-       if (result < 0)
-         break;
+       osd->store->omap_get_header(coll, ghobject_t(soid), &osd_op.outdata);
        ctx->delta_stats.num_rd_kb += SHIFT_ROUND_UP(osd_op.outdata.length(), 10);
        ctx->delta_stats.num_rd++;
       }
@@ -5467,9 +5465,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
        tracepoint(osd, do_osd_op_pre_omapgetvalsbykeys, soid.oid.name.c_str(), soid.snap.val, list_entries(keys_to_get).c_str());
        map<string, bufferlist> out;
        if (pool.info.supports_omap()) {
-         result = osd->store->omap_get_values(coll, ghobject_t(soid), keys_to_get, &out);
-         if (result < 0)
-           break;
+         osd->store->omap_get_values(coll, ghobject_t(soid), keys_to_get, &out);
        } // else return empty omap entries
        ::encode(out, osd_op.outdata);
        ctx->delta_stats.num_rd_kb += SHIFT_ROUND_UP(osd_op.outdata.length(), 10);
@@ -5504,10 +5500,12 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
               i != assertions.end();
               ++i)
            to_get.insert(i->first);
-         result = osd->store->omap_get_values(coll, ghobject_t(soid),
+         int r = osd->store->omap_get_values(coll, ghobject_t(soid),
                                              to_get, &out);
-         if (result < 0)
+         if (r < 0) {
+           result = r;
            break;
+         }
        } // else leave out empty
 
        //Should set num_rd_kb based on encode length of map