mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 10:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix: return value for DflyMigrateAck (#4379)

Browse source
This commit is contained in:
Borys 2024-12-29 09:37:08 +02:00 • committed by GitHub
parent 5b9c7e415a
commit c4be62edc8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/server/cluster/cluster_family.cc
View file

@ -1012,7 +1012,7 @@ void ClusterFamily::DflyMigrateAck(CmdArgList args, SinkReplyBuilder* builder) {
[source_id = source_id](const auto& m) { return m.node_info.id == source_id; }); [source_id = source_id](const auto& m) { return m.node_info.id == source_id; });
if (m_it == in_migrations.end()) { if (m_it == in_migrations.end()) {
LOG(WARNING) << "migration isn't in config"; LOG(WARNING) << "migration isn't in config";
return builder->SendLong(OutgoingMigration::kInvalidAttempt); return builder->SendError(OutgoingMigration::kUnknownMigration);
} }
auto migration = GetIncomingMigration(source_id); auto migration = GetIncomingMigration(source_id);

1
src/server/cluster/outgoing_slot_migration.h
View file

@ -59,7 +59,6 @@ class OutgoingMigration : private ProtocolClient {
size_t GetKeyCount() const ABSL_LOCKS_EXCLUDED(state_mu_); size_t GetKeyCount() const ABSL_LOCKS_EXCLUDED(state_mu_);
static constexpr long kInvalidAttempt = -1;
static constexpr std::string_view kUnknownMigration = "UNKNOWN_MIGRATION"; static constexpr std::string_view kUnknownMigration = "UNKNOWN_MIGRATION";
private: private: