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

feat(cluster): Allow appending RDB to existing store (#3505)

Browse source 
* feat(cluster): Allow appending RDB to existing store

The goal of this PR is to support the loadoing of multiple RDB files into a single server, like when migrating from a Valkey cluster to Dragonfly with a different number of nodes.

It makes the following changes:

* Removes `DEBUG LOAD`, as we already have `DFLY LOAD`
* Adds `APPEND` option to `DFLY LOAD` (i.e. `DFLY LOAD <filename> APPEND`) that loads an RDB without first flushing the data store, overriding existing keys
* Does not load keys belonging to unowned slots, if in cluster mode

Fixes #2840
This commit is contained in:
Shahar Mike 2024-08-15 14:56:40 +03:00 • committed by GitHub
parent 5b546df94d
commit ad3ebf61d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 175 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/server/rdb_test.cc
View file

@ -167,7 +167,7 @@ TEST_F(RdbTest, ComressionModeSaveDragonflyAndReload) {
ASSERT_EQ(resp, "OK");
auto save_info = service_->server_family().GetLastSaveInfo();
resp = Run({"debug", "load", save_info.file_name});
resp = Run({"dfly", "load", save_info.file_name});
ASSERT_EQ(resp, "OK");
ASSERT_EQ(50000, CheckedInt({"dbsize"}));
}
@ -182,7 +182,7 @@ TEST_F(RdbTest, RdbLoaderOnReadCompressedDataShouldNotEnterEnsureReadFlow) {
ASSERT_EQ(resp, "OK");
auto save_info = service_->server_family().GetLastSaveInfo();
resp = Run({"debug", "load", save_info.file_name});
resp = Run({"dfly", "load", save_info.file_name});
ASSERT_EQ(resp, "OK");
}
@ -265,7 +265,7 @@ TEST_F(RdbTest, ReloadExpired) {
ASSERT_EQ(resp, "OK");
auto save_info = service_->server_family().GetLastSaveInfo();
AdvanceTime(2000);
resp = Run({"debug", "load", save_info.file_name});
resp = Run({"dfly", "load", save_info.file_name});
ASSERT_EQ(resp, "OK");
resp = Run({"get", "key"});
ASSERT_THAT(resp, ArgType(RespExpr::NIL));
@ -543,4 +543,26 @@ TEST_F(RdbTest, SBF) {
EXPECT_THAT(Run({"BF.EXISTS", "k", "1"}), IntArg(1));
}
TEST_F(RdbTest, DflyLoadAppend) {
// Create an RDB with (k1,1) value in it saved as `filename`
EXPECT_EQ(Run({"set", "k1", "1"}), "OK");
EXPECT_EQ(Run({"save", "df"}), "OK");
string filename = service_->server_family().GetLastSaveInfo().file_name;
// Without APPEND option - db should be flushed
EXPECT_EQ(Run({"set", "k1", "TO-BE-FLUSHED"}), "OK");
EXPECT_EQ(Run({"set", "k2", "TO-BE-FLUSHED"}), "OK");
EXPECT_EQ(Run({"dfly", "load", filename}), "OK");
EXPECT_THAT(Run({"dbsize"}), IntArg(1));
EXPECT_EQ(Run({"get", "k1"}), "1");
// With APPEND option - db shouldn't be flushed, but k1 should be overridden
EXPECT_EQ(Run({"set", "k1", "TO-BE-OVERRIDDEN"}), "OK");
EXPECT_EQ(Run({"set", "k2", "2"}), "OK");
EXPECT_EQ(Run({"dfly", "load", filename, "append"}), "OK");
EXPECT_THAT(Run({"dbsize"}), IntArg(2));
EXPECT_EQ(Run({"get", "k1"}), "1");
EXPECT_EQ(Run({"get", "k2"}), "2");
}
} // namespace dfly