diff --git a/src/facade/reply_builder.cc b/src/facade/reply_builder.cc index 1f49a72cfd87..d698c860000f 100644 --- a/src/facade/reply_builder.cc +++ b/src/facade/reply_builder.cc @@ -215,7 +215,8 @@ void SinkReplyBuilder2::SendError(ErrorReply error) { void SinkReplyBuilder2::SendError(OpStatus status) { if (status == OpStatus::OK) - return SendOk(); + return SendSimpleString("OK"); + // return SendOk(); SendError(StatusToMsg(status)); } diff --git a/src/facade/reply_builder.h b/src/facade/reply_builder.h index 81f5489a8e15..8158bbdf2437 100644 --- a/src/facade/reply_builder.h +++ b/src/facade/reply_builder.h @@ -238,9 +238,9 @@ class SinkReplyBuilder2 { virtual void SendStored() = 0; virtual void SendSetSkipped() = 0; - void SendOk() { - SendSimpleString("OK"); - } + // void SendOk() { // TMP + // SendSimpleString("OK"); + // } virtual void SendError(std::string_view str, std::string_view type = {}) = 0; // MC and Redis void SendError(OpStatus status); diff --git a/src/facade/reply_builder_test.cc b/src/facade/reply_builder_test.cc index 60a91553683e..c3641df52c70 100644 --- a/src/facade/reply_builder_test.cc +++ b/src/facade/reply_builder_test.cc @@ -205,8 +205,8 @@ RedisReplyBuilderTest::ParsingResults RedisReplyBuilderTest::Parse() { TEST_F(RedisReplyBuilderTest, MessageSend) { // Test each message that is "sent" to the sink - builder_->SendOk(); - ASSERT_EQ(TakePayload(), kOKMessage); + // builder_->SendOk(); + // ASSERT_EQ(TakePayload(), kOKMessage); builder_->StartArray(10); std::string_view hello_msg = "hello"; diff --git a/src/server/cluster/cluster_family.cc b/src/server/cluster/cluster_family.cc index d185dfd17193..de43f4fb2183 100644 --- a/src/server/cluster/cluster_family.cc +++ b/src/server/cluster/cluster_family.cc @@ -711,8 +711,8 @@ void ClusterFamily::DflySlotMigrationStatus(CmdArgList args, ConnectionContext* vector reply; reply.reserve(incoming_migrations_jobs_.size() + outgoing_migration_jobs_.size()); - auto append_answer = [rb, &reply](string_view direction, string_view node_id, string_view filter, - MigrationState state, size_t keys_number, string_view error) { + auto append_answer = [&reply](string_view direction, string_view node_id, string_view filter, + MigrationState state, size_t keys_number, string_view error) { if (filter.empty() || filter == node_id) { error = error.empty() ? "0" : error; reply.push_back(absl::StrCat(direction, " ", node_id, " ", StateToStr(state), @@ -794,10 +794,11 @@ SlotRanges ClusterFamily::RemoveOutgoingMigrations(shared_ptr new } namespace { + // returns removed incoming migration bool RemoveIncomingMigrationImpl(std::vector>& jobs, - string source_id) { - auto it = std::find_if(jobs.begin(), jobs.end(), [&source_id](const auto& im) { + string_view source_id) { + auto it = std::find_if(jobs.begin(), jobs.end(), [source_id](const auto& im) { // we can have only one migration per target-source pair return source_id == im->GetSourceID(); }); @@ -840,7 +841,7 @@ void ClusterFamily::InitMigration(CmdArgList args, ConnectionContext* cntx) { VLOG(1) << "Create incoming migration, args: " << args; CmdArgParser parser{args}; - auto [source_id, flows_num] = parser.Next(); + auto [source_id, flows_num] = parser.Next(); std::vector slots; do { @@ -853,7 +854,7 @@ void ClusterFamily::InitMigration(CmdArgList args, ConnectionContext* cntx) { const auto& incoming_migrations = cluster_config()->GetIncomingMigrations(); bool found = any_of(incoming_migrations.begin(), incoming_migrations.end(), - [&](const MigrationInfo& info) { + [source_id = source_id](const MigrationInfo& info) { // TODO: also compare slot ranges (in an order-agnostic way) return info.node_info.id == source_id; }); @@ -869,7 +870,7 @@ void ClusterFamily::InitMigration(CmdArgList args, ConnectionContext* cntx) { LOG_IF(WARNING, was_removed) << "Reinit issued for migration from:" << source_id; incoming_migrations_jobs_.emplace_back(make_shared( - std::move(source_id), &server_family_->service(), SlotRanges(std::move(slots)), flows_num)); + string(source_id), &server_family_->service(), SlotRanges(std::move(slots)), flows_num)); return cntx->SendOk(); } @@ -961,8 +962,9 @@ void ClusterFamily::DflyMigrateAck(CmdArgList args, ConnectionContext* cntx) { VLOG(1) << "DFLYMIGRATE ACK" << args; auto in_migrations = tl_cluster_config->GetIncomingMigrations(); - auto m_it = std::find_if(in_migrations.begin(), in_migrations.end(), - [source_id](const auto& m) { return m.node_info.id == source_id; }); + auto m_it = + std::find_if(in_migrations.begin(), in_migrations.end(), + [source_id = source_id](const auto& m) { return m.node_info.id == source_id; }); if (m_it == in_migrations.end()) { LOG(WARNING) << "migration isn't in config"; return cntx->SendLong(OutgoingMigration::kInvalidAttempt); diff --git a/src/server/cluster/incoming_slot_migration.cc b/src/server/cluster/incoming_slot_migration.cc index 3d0983c0461e..ebaf5686ff0c 100644 --- a/src/server/cluster/incoming_slot_migration.cc +++ b/src/server/cluster/incoming_slot_migration.cc @@ -81,7 +81,7 @@ class ClusterShardMigration { std::error_code Cancel() { std::lock_guard lk(mu_); if (socket_ != nullptr) { - return socket_->proactor()->Await([s = socket_, sid = source_shard_id_]() { + return socket_->proactor()->Await([s = socket_]() { if (s->IsOpen()) { return s->Shutdown(SHUT_RDWR); // Does not Close(), only forbids further I/O. } diff --git a/src/server/journal/streamer.cc b/src/server/journal/streamer.cc index 3640dabd057a..68d5a4f2a871 100644 --- a/src/server/journal/streamer.cc +++ b/src/server/journal/streamer.cc @@ -263,7 +263,7 @@ bool RestoreStreamer::ShouldWrite(const journal::JournalItem& item) const { // On FLUSH* we restart the migration CHECK(dest_ != nullptr); cntx_->ReportError("FLUSH command during migration"); - dest_->Shutdown(SHUT_RDWR); + std::ignore = dest_->Shutdown(SHUT_RDWR); return false; }