MahatiC

diff --git a/test/functional/tests.py b/test/functional/tests.py
index 0615bf9..885e1de 100644
--- a/test/functional/tests.py
+++ b/test/functional/tests.py
@@ -1651,6 +1651,8 @@ class TestFile(Base):
         hdrs = {'Range': range_string}
         self.assertRaises(ResponseError, file_item.read, hdrs=hdrs)
         self.assert_status(416)
+        self.assertEqual(file_item.read_md5(),
+                         self.env.conn.response.getheader('etag'))

MahatiC

diff --git a/swift/obj/auditor.py b/swift/obj/auditor.py
index feef077..43d65b1 100644
--- a/swift/obj/auditor.py
+++ b/swift/obj/auditor.py
@@ -267,15 +267,15 @@ class AuditorWorker(object):
         except DiskFileDeleted:
             # If there is a tombstone, call get_hashes to cleanup and reclaim
             ondisk_info_dict = df._ondisk_info
-            ts = (ondisk_info_dict['ts_info']['timestamp']).internal
-

MahatiC

diff --git a/src/librbd/io/ReadResult.cc b/src/librbd/io/ReadResult.cc
index 1b8cdb0..9acaa73 100644
--- a/src/librbd/io/ReadResult.cc
+++ b/src/librbd/io/ReadResult.cc
@@ -71,11 +71,20 @@ struct ReadResult::AssembleResultVisitor : public boost::static_visitor<void> {
 
   void operator()(Bufferlist &bufferlist) const {
     bufferlist.bl->clear();
-    destriper.assemble_result(cct, *bufferlist.bl, true);
+    //destriper.assemble_result(cct, *bufferlist.bl, true);

MahatiC

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 050c762..01a5c50 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -2317,6 +2317,10 @@ void Objecter::_op_submit(Op *op, shunique_lock& sul, ceph_tid_t *ptid)
   bool check_for_latest_map = _calc_target(&op->target, nullptr)
     == RECALC_OP_TARGET_POOL_DNE;
 
+  op_target_t *t = &op->target;
+  ldout(cct, 20) << "test oid val:" << t->base_oid << dendl;

MahatiC

diff --git a/src/librbd/io/ImageRequestWQ.cc b/src/librbd/io/ImageRequestWQ.cc
index 7f479f4..8711102 100644
--- a/src/librbd/io/ImageRequestWQ.cc
+++ b/src/librbd/io/ImageRequestWQ.cc
@@ -12,6 +12,7 @@
 #include "librbd/exclusive_lock/Policy.h"
 #include "librbd/io/AioCompletion.h"
 #include "librbd/io/ImageRequest.h"
+#include "common/EventTrace.h"

MahatiC

overrides:
  ceph:
    conf:
      client:
        rbd default features: 125
        rbd op threads: 8

MahatiC

template <typename I>
void ObjectMap<I>::rollback(uint64_t snap_id, Context *on_finish) {
  ceph_assert(m_image_ctx.snap_lock.is_locked());
  ceph_assert(m_image_ctx.object_map_lock.is_wlocked());

  using klass = ObjectMap<I>;
  Context *ctx = create_context_callback<klass>(this, on_finish);

  object_map::SnapshotRollbackRequest *req =
    new object_map::SnapshotRollbackRequest(m_image_ctx, snap_id, ctx);

MahatiC

#!/usr/bin/env bash
set -ex

# create a snapshot, then export it and check that setting read flags works
# by looking at --debug-ms output

function clean_up {
    rm -f test.log || true
    rbd snap remove test@snap || true
    rbd rm test || true

MahatiC

#!/usr/bin/env bash
set -ex

# create a snapshot, then export it and check that setting read flags works
# by looking at --debug-ms output

function clean_up {
    rm -f test.log || true
    rbd snap remove test@snap || true
    rbd rm test || true

MahatiC

template <typename ImageCtxT>
class ParentWriteLog {
  //will contain all the common code between SSDWriteLog and ReplicatedWriteLog classes
};

template <typename ImageCtxT>
class SSDWriteLog : public ParentWriteLog<ImageCtxT> {
public:
  //SSD specific code
};