refactor_create/seal_shard

Author: JacksonYao287

conanfile.py

@@ -10,7 +10,7 @@
 
 class HomeObjectConan(ConanFile):
     name = "homeobject"
-    version = "2.7.3"
+    version = "2.7.4"
 
     homepage = "https://github.com/eBay/HomeObject"
     description = "Blob Store built on HomeReplication"

src/lib/homestore_backend/gc_manager.cpp

@@ -556,27 +556,6 @@ bool GCManager::pdev_gc_actor::replace_blob_index(
     return true;
 }
 
-sisl::sg_list GCManager::pdev_gc_actor::generate_shard_super_blk_sg_list(shard_id_t shard_id) {
-    // TODO: do the buffer check before using it.
-    auto raw_shard_sb = m_hs_home_object->_get_hs_shard(shard_id);
-    RELEASE_ASSERT(raw_shard_sb, "can not find shard super blk for shard_id={} !!!", shard_id);
-
-    const auto shard_sb =
-        const_cast< HSHomeObject::HS_Shard* >(d_cast< const HSHomeObject::HS_Shard* >(raw_shard_sb))->sb_.get();
-
-    auto blk_size = homestore::data_service().get_blk_size();
-    auto shard_sb_size = sizeof(HSHomeObject::shard_info_superblk);
-    auto total_size = sisl::round_up(shard_sb_size, blk_size);
-    auto shard_sb_buf = iomanager.iobuf_alloc(blk_size, total_size);
-
-    std::memcpy(shard_sb_buf, shard_sb, shard_sb_size);
-
-    sisl::sg_list shard_sb_sgs;
-    shard_sb_sgs.size = total_size;
-    shard_sb_sgs.iovs.emplace_back(iovec{.iov_base = shard_sb_buf, .iov_len = total_size});
-    return shard_sb_sgs;
-}
-
 // note that, when we copy data, there is not create shard or put blob in this chunk, only delete blob might happen.
 bool GCManager::pdev_gc_actor::copy_valid_data(chunk_id_t move_from_chunk, chunk_id_t move_to_chunk,
                                                const uint64_t task_id) {
@@ -696,7 +675,7 @@ bool GCManager::pdev_gc_actor::copy_valid_data(chunk_id_t move_from_chunk, chunk
         }
 
         // prepare a shard header for this shard in move_to_chunk
-        sisl::sg_list header_sgs = generate_shard_super_blk_sg_list(shard_id);
+        sisl::sg_list header_sgs = m_hs_home_object->generate_shard_super_blk_sg_list(shard_id);
 
         // we ignore the state in shard header blk. we never read a shard header since we don`t know where it is(nor
         // record the pba in indextable)
@@ -841,7 +820,7 @@ bool GCManager::pdev_gc_actor::copy_valid_data(chunk_id_t move_from_chunk, chunk
                     }
 
                     // 3 write a shard footer for this shard
-                    sisl::sg_list footer_sgs = generate_shard_super_blk_sg_list(shard_id);
+                    sisl::sg_list footer_sgs = m_hs_home_object->generate_shard_super_blk_sg_list(shard_id);
                     return folly::collectAllUnsafe(futs)
                         .thenValue([this, &is_last_shard, &shard_id, &blk_size, &hints, &move_to_chunk,
                                     &last_shard_state, task_id, &data_service, footer_sgs](auto&& results) {

src/lib/homestore_backend/gc_manager.hpp

@@ -237,10 +237,6 @@ class GCManager {
 
         pdev_gc_metrics& metrics() { return metrics_; }
 
-    private:
-        // utils
-        sisl::sg_list generate_shard_super_blk_sg_list(shard_id_t shard_id);
-
     private:
         uint32_t m_pdev_id;
         std::shared_ptr< HeapChunkSelector > m_chunk_selector;

src/lib/homestore_backend/heap_chunk_selector.cpp

@@ -533,6 +533,7 @@ std::optional< homestore::chunk_num_t > HeapChunkSelector::get_most_available_bl
         LOGWARNMOD(homeobject, "No available chunk for pg={}, ctx=0x{:x}", pg_id, ctx);
         return std::nullopt;
     }
+
     auto v_chunk_id = std::distance(pg_chunks.begin(), max_it);
     LOGDEBUGMOD(homeobject, "Picked v_chunk_id={} : [p_chunk_id={}, avail={}], ctx=0x{:x}", v_chunk_id,
                 pg_chunks[v_chunk_id]->get_chunk_id(), pg_chunks[v_chunk_id]->available_blks(), ctx);

src/lib/homestore_backend/hs_blob_manager.cpp

@@ -401,6 +401,14 @@ HSHomeObject::blob_put_get_blk_alloc_hints(sisl::blob const& header, cintrusive<
         return folly::makeUnexpected(homestore::ReplServiceError::FAILED);
     }
 
+    if (msg_header->msg_type != ReplicationMessageType::PUT_BLOB_MSG) {
+        LOGW("traceID={}, shardID=0x{:x}, pg={}, shard=0x{:x}, unsupported message type {}, reject it!", tid,
+             msg_header->shard_id, (msg_header->shard_id >> homeobject::shard_width),
+             (msg_header->shard_id & homeobject::shard_mask), msg_header->pg_id, msg_header->msg_type);
+        if (ctx) { ctx->promise_.setValue(folly::makeUnexpected(BlobError(BlobErrorCode::UNSUPPORTED_OP))); }
+        return folly::makeUnexpected(homestore::ReplServiceError::RESULT_NOT_EXIST_YET);
+    }
+
     auto hs_pg = get_hs_pg(msg_header->pg_id);
     if (hs_pg == nullptr) {
         LOGW("traceID={}, shardID=0x{:x}, pg={}, shard=0x{:x}, Received a blob_put on an unknown pg={}, underlying "
@@ -425,6 +433,14 @@ HSHomeObject::blob_put_get_blk_alloc_hints(sisl::blob const& header, cintrusive<
 
     auto hs_shard = d_cast< HS_Shard* >((*shard_iter->second).get());
 
+    if (hs_shard->sb_->info.state != ShardInfo::State::OPEN) {
+        LOGW("traceID={}, shardID=0x{:x}, pg={}, shard=0x{:x}, Received a blob_put on an unopen shard, reject it!", tid,
+             msg_header->shard_id, (msg_header->shard_id >> homeobject::shard_width),
+             (msg_header->shard_id & homeobject::shard_mask));
+        if (ctx) { ctx->promise_.setValue(folly::makeUnexpected(BlobError(BlobErrorCode::SEALED_SHARD))); }
+        return folly::makeUnexpected(homestore::ReplServiceError::RESULT_NOT_EXIST_YET);
+    }
+
     homestore::blk_alloc_hints hints;
     hints.chunk_id_hint = hs_shard->sb_->p_chunk_id;
     if (hs_ctx->is_proposer()) { hints.reserved_blks = get_reserved_blks(); }

src/lib/homestore_backend/hs_homeobject.hpp

@@ -800,8 +800,8 @@ class HSHomeObject : public HomeObjectImpl {
      * @param repl_dev The replication device.
      * @param hs_ctx The replication request context.
      */
-    void on_shard_message_commit(int64_t lsn, sisl::blob const& header, homestore::MultiBlkId const& blkids,
-                                 shared< homestore::ReplDev > repl_dev, cintrusive< homestore::repl_req_ctx >& hs_ctx);
+    void on_shard_message_commit(int64_t lsn, sisl::blob const& header, shared< homestore::ReplDev > repl_dev,
+                                 cintrusive< homestore::repl_req_ctx >& hs_ctx);
 
     bool on_shard_message_pre_commit(int64_t lsn, sisl::blob const& header, sisl::blob const& key,
                                      cintrusive< homestore::repl_req_ctx >& hs_ctx);
@@ -841,16 +841,6 @@ class HSHomeObject : public HomeObjectImpl {
      */
     void on_replica_restart();
 
-    /**
-     * @brief Extracts the physical chunk ID for create shard from the message.
-     *
-     * @param header The message header that includes the shard_info_superblk, which contains the data necessary for
-     * extracting and mapping the chunk ID.
-     * @return An optional virtual chunk id if the extraction and mapping process is successful, otherwise an empty
-     * optional.
-     */
-    std::optional< homestore::chunk_num_t > resolve_v_chunk_id_from_msg(sisl::blob const& header);
-
     /**
      * @brief Releases a chunk based on the information provided in a CREATE_SHARD message.
      *
@@ -904,6 +894,8 @@ class HSHomeObject : public HomeObjectImpl {
     void update_pg_meta_after_gc(const pg_id_t pg_id, const homestore::chunk_num_t move_from_chunk,
                                  const homestore::chunk_num_t move_to_chunk, const uint64_t task_id);
 
+    sisl::sg_list generate_shard_super_blk_sg_list(shard_id_t shard_id);
+
     uint32_t get_pg_tombstone_blob_count(pg_id_t pg_id) const;
 
     // Snapshot persistence related