Disagg: Add nullptr check on S3LockLocalManager (#9387)

ref #8673, ref #9394 Signed-off-by: Calvin Neo <[email protected]> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
pingcap · Sep 2, 2024 · 0761d45 · 0761d45
1 parent 738aade
commit 0761d45
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/dbms/src/Flash/Disaggregated/S3LockClient.cpp b/dbms/src/Flash/Disaggregated/S3LockClient.cpp
@@ -177,6 +177,7 @@ String S3LockClient::updateOwnerAddr(const Timepoint & deadline, const LoggerPtr
     using namespace std::chrono_literals;
     while (true)
     {
+        RUNTIME_CHECK(s3gc_owner != nullptr);
         auto owner_info = s3gc_owner->getOwnerID();
         switch (owner_info.status)
         {

diff --git a/dbms/src/Storages/Page/V3/Universal/S3LockLocalManager.cpp b/dbms/src/Storages/Page/V3/Universal/S3LockLocalManager.cpp
@@ -96,6 +96,11 @@ std::optional<CheckpointProto::ManifestFilePrefix> S3LockLocalManager::initStore
         }
 
         s3lock_client = std::move(s3lock_client_);
+        if unlikely (s3lock_client == nullptr)
+        {
+            LOG_INFO(log, "S3 lock manager has null s3lock client");
+        }
+
         store_id = actual_store_id;
 
         LOG_INFO(
@@ -223,6 +228,7 @@ String S3LockLocalManager::createS3Lock(
     }
     else
     {
+        RUNTIME_CHECK_MSG(s3lock_client, "S3 Lock Client is not initialized");
         // Try to create a lock file for the data file created by another store.
         // e.g. Ingest some pages from CheckpointDataFile or DTFile when doing FAP,
         // send rpc to S3LockService