This is an automated email from the ASF dual-hosted git repository.
w41ter pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 91465afaf8e [fix](cloud) Remove global snapshot data migrating context
(#57553)
91465afaf8e is described below
commit 91465afaf8ecaf16a5f43a7b459beca1376a05e8
Author: walter <[email protected]>
AuthorDate: Mon Nov 3 14:36:59 2025 +0800
[fix](cloud) Remove global snapshot data migrating context (#57553)
---
cloud/src/recycler/snapshot_data_migrator.cpp | 8 +++-----
cloud/src/recycler/snapshot_data_migrator.h | 24 +-----------------------
2 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/cloud/src/recycler/snapshot_data_migrator.cpp
b/cloud/src/recycler/snapshot_data_migrator.cpp
index f4b601a717b..48300cdc946 100644
--- a/cloud/src/recycler/snapshot_data_migrator.cpp
+++ b/cloud/src/recycler/snapshot_data_migrator.cpp
@@ -90,7 +90,7 @@ void SnapshotDataMigrator::migration_loop() {
if (migrating_instance_map_.count(instance_id)) continue;
}
- auto migrator = std::make_shared<InstanceDataMigrator>(txn_kv_,
instance, migrate_context_);
+ auto migrator = std::make_shared<InstanceDataMigrator>(txn_kv_,
instance);
if (migrator->init() != 0) {
LOG(WARNING) << "failed to init instance migrator, instance_id="
<< instance.instance_id();
@@ -187,12 +187,10 @@ bool SnapshotDataMigrator::is_instance_need_migrate(const
InstanceInfoPB& instan
}
InstanceDataMigrator::InstanceDataMigrator(std::shared_ptr<TxnKv> txn_kv,
- const InstanceInfoPB& instance,
- SnapshotDataMigrateContext&
migrate_context)
+ const InstanceInfoPB& instance)
: txn_kv_(std::move(txn_kv)),
instance_id_(instance.instance_id()),
- instance_info_(instance),
- migrate_context_(migrate_context) {}
+ instance_info_(instance) {}
InstanceDataMigrator::~InstanceDataMigrator() {
if (!stopped()) {
diff --git a/cloud/src/recycler/snapshot_data_migrator.h
b/cloud/src/recycler/snapshot_data_migrator.h
index ec4cae009f9..f8115bc39e2 100644
--- a/cloud/src/recycler/snapshot_data_migrator.h
+++ b/cloud/src/recycler/snapshot_data_migrator.h
@@ -19,7 +19,6 @@
#include <atomic>
#include <condition_variable>
-#include <cstdint>
#include <deque>
#include <memory>
#include <string>
@@ -34,23 +33,8 @@
#include "snapshot/snapshot_manager.h"
namespace doris::cloud {
-// class TxnKv;
-// class InstanceInfoPB;
-// class StorageVaultAccessor;
-// class SimpleThreadPool;
-// class Checker;
-// class SnapshotDataMigratorMetricsContext;
class InstanceDataMigrator;
-struct SnapshotDataMigrateContext {
- std::mutex mutex;
-
- // The indexes that have been migrated.
- std::unordered_set<int64_t> migrated_indexes;
- // The partitions that have been migrated.
- std::unordered_set<int64_t> migrated_partitions;
-};
-
class SnapshotDataMigrator {
public:
explicit SnapshotDataMigrator(std::shared_ptr<TxnKv> txn_kv);
@@ -70,8 +54,6 @@ private:
bool is_instance_need_migrate(const InstanceInfoPB& instance_info);
- SnapshotDataMigrateContext migrate_context_;
-
std::shared_ptr<TxnKv> txn_kv_;
std::atomic_bool stopped_ {false};
std::string ip_port_;
@@ -92,8 +74,7 @@ private:
class InstanceDataMigrator {
public:
- InstanceDataMigrator(std::shared_ptr<TxnKv> txn_kv, const InstanceInfoPB&
instance,
- SnapshotDataMigrateContext& migrate_context);
+ InstanceDataMigrator(std::shared_ptr<TxnKv> txn_kv, const InstanceInfoPB&
instance);
~InstanceDataMigrator();
std::string_view instance_id() const { return instance_id_; }
@@ -108,8 +89,6 @@ public:
// returns 0 for success otherwise error
int do_migrate();
- SnapshotDataMigrateContext& get_migrate_context() { return
migrate_context_; }
-
private:
// returns 0 for success otherwise error
int init_obj_store_accessors();
@@ -124,7 +103,6 @@ private:
std::shared_ptr<TxnKv> txn_kv_;
std::string instance_id_;
InstanceInfoPB instance_info_;
- SnapshotDataMigrateContext& migrate_context_;
std::unordered_map<std::string, std::shared_ptr<StorageVaultAccessor>>
accessor_map_;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
