diff --git a/conanfile.py b/conanfile.py index c4c07f99..35a7c137 100644 --- a/conanfile.py +++ b/conanfile.py @@ -9,7 +9,7 @@ class HomeObjectConan(ConanFile): name = "homeobject" - version = "2.1.0" + version = "2.1.1" homepage = "https://github.com/eBay/HomeObject" description = "Blob Store built on HomeReplication" diff --git a/src/lib/homestore_backend/hs_blob_manager.cpp b/src/lib/homestore_backend/hs_blob_manager.cpp index bfcb1ee9..79e90b14 100644 --- a/src/lib/homestore_backend/hs_blob_manager.cpp +++ b/src/lib/homestore_backend/hs_blob_manager.cpp @@ -176,6 +176,7 @@ BlobManager::AsyncResult< blob_id_t > HSHomeObject::_put_blob(ShardInfo const& s void HSHomeObject::on_blob_put_commit(int64_t lsn, sisl::blob const& header, sisl::blob const& key, homestore::MultiBlkId const& pbas, cintrusive< homestore::repl_req_ctx >& hs_ctx) { + LOGTRACEMOD(blobmgr, "blob put commit lsn:{}, pbas:{}", lsn, pbas.to_string()); repl_result_ctx< BlobManager::Result< BlobInfo > >* ctx{nullptr}; if (hs_ctx && hs_ctx->is_proposer()) { ctx = boost::static_pointer_cast< repl_result_ctx< BlobManager::Result< BlobInfo > > >(hs_ctx).get(); @@ -208,6 +209,8 @@ void HSHomeObject::on_blob_put_commit(int64_t lsn, sisl::blob const& header, sis // Write to index table with key {shard id, blob id } and value {pba}. auto const [exist_already, status] = add_to_index_table(index_table, blob_info); + LOGTRACEMOD(blobmgr, "blob put commit blob_id: {}, lsn:{}, exist_already:{}, status:{}, pbas: {}", blob_id, lsn, + exist_already, status, pbas.to_string()); if (!exist_already) { if (status != homestore::btree_status_t::success) { LOGE("Failed to insert into index table for blob {} err {}", lsn, enum_name(status)); diff --git a/src/lib/homestore_backend/hs_homeobject.cpp b/src/lib/homestore_backend/hs_homeobject.cpp index 400761e8..3bdfde90 100644 --- a/src/lib/homestore_backend/hs_homeobject.cpp +++ b/src/lib/homestore_backend/hs_homeobject.cpp @@ -67,7 +67,8 @@ class HSReplApplication : public homestore::ReplApplication { if (auto app = _ho_application.lock(); app) { endpoint = fmt::format("{}{}", uri_prefix, app->lookup_peer(uuid)); } else { - RELEASE_ASSERT(false, "HomeObjectApplication lifetime unexpected!"); + LOGW("HomeObjectApplication lifetime unexpected! Shutdown in progress?"); + return {}; } std::pair< std::string, uint16_t > host_port; diff --git a/src/lib/homestore_backend/hs_pg_manager.cpp b/src/lib/homestore_backend/hs_pg_manager.cpp index 39aa8bcd..161af0c5 100644 --- a/src/lib/homestore_backend/hs_pg_manager.cpp +++ b/src/lib/homestore_backend/hs_pg_manager.cpp @@ -102,7 +102,7 @@ void HSHomeObject::on_create_pg_message_commit(int64_t lsn, sisl::blob const& he auto const* msg_header = r_cast< ReplicationMessageHeader const* >(header.cbytes()); if (msg_header->corrupted()) { - LOGE("create PG message header is corrupted , lsn:{}", lsn); + LOGE("create PG message header is corrupted , lsn:{}; header: {}", lsn, msg_header->to_string()); if (ctx) { ctx->promise_.setValue(folly::makeUnexpected(PGError::CRC_MISMATCH)); } return; }