fix:compact dead lock (OpenAtomFoundation#2581)

* fix:compact dead lock --------- Co-authored-by: chejinge <[email protected]>
bigdaronlee163 · Apr 7, 2024 · 990f9a5 · 990f9a5
1 parent 7ba12d4
commit 990f9a5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/pika_command.cc b/src/pika_command.cc
@@ -54,10 +54,10 @@ void InitCmdTable(CmdTable* cmd_table) {
  cmd_table->insert(std::pair<std::string, std::unique_ptr<Cmd>>(kCmdNameBgsave, std::move(bgsaveptr)));
 
  std::unique_ptr<Cmd> compactptr =
- std::make_unique<CompactCmd>(kCmdNameCompact, -1, kCmdFlagsRead | kCmdFlagsAdmin | kCmdFlagsSlow);
+ std::make_unique<CompactCmd>(kCmdNameCompact, -1, kCmdFlagsRead | kCmdFlagsAdmin | kCmdFlagsSlow | kCmdFlagsSuspend);
  cmd_table->insert(std::pair<std::string, std::unique_ptr<Cmd>>(kCmdNameCompact, std::move(compactptr)));
 
- std::unique_ptr<Cmd> compactrangeptr = std::make_unique<CompactRangeCmd>(kCmdNameCompactRange, 5, kCmdFlagsRead | kCmdFlagsAdmin);
+ std::unique_ptr<Cmd> compactrangeptr = std::make_unique<CompactRangeCmd>(kCmdNameCompactRange, 5, kCmdFlagsRead | kCmdFlagsAdmin | kCmdFlagsSuspend);
  cmd_table->insert(std::pair<std::string, std::unique_ptr<Cmd>>(kCmdNameCompactRange, std::move(compactrangeptr)));
  std::unique_ptr<Cmd> purgelogsto =
  std::make_unique<PurgelogstoCmd>(kCmdNamePurgelogsto, -2, kCmdFlagsRead | kCmdFlagsAdmin);

diff --git a/tests/integration/server_test.go b/tests/integration/server_test.go
@@ -708,5 +708,16 @@ var _ = Describe("Server", func() {
  Expect(client.Exists(ctx, "foo").Val()).To(Equal(int64(0)))
 
  })
+ It("should Compact", func() {
+ Expect(client.Set(ctx, "foo", "bar", 0).Val()).To(Equal("OK"))
+ Expect(client.Set(ctx, "key1", "value1", 0).Val()).To(Equal("OK"))
+ Expect(client.Expire(ctx, "foo", 2*time.Second).Val()).To(Equal(true))
+ Expect(client.Expire(ctx, "key1", 2*time.Second).Val()).To(Equal(true))
+ time.Sleep(3 * time.Second)
+ Expect(client.Do(ctx, "compact").Val()).To(Equal("OK"))
+ Expect(client.Exists(ctx, "foo").Val()).To(Equal(int64(0)))
+ Expect(client.Get(ctx, "foo").Err()).To(MatchError(redis.Nil))
+ Expect(client.Get(ctx, "key1").Err()).To(MatchError(redis.Nil))
+ })
  })
 })