Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid using Get interface to obtain metadata when iterating data during migration #906

Merged
merged 4 commits into from
Sep 24, 2022
Merged

Avoid using Get interface to obtain metadata when iterating data during migration #906

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db6ee10
Avoid using Get interface to obtain metadata when iterating data duri…
caipengbo Sep 22, 2022
918ccaa
Use implicit conversions
caipengbo Sep 22, 2022
5c5e07f
Use move function
caipengbo Sep 22, 2022
56514cd
Remove move function
caipengbo Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 4 additions & 18 deletions src/slot_migrate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ Status SlotMigrate::SendSnapshot(void) {

// Add key's constructed cmd to restore_cmds, send pipeline
// or not according to current_pipeline_size_
auto stat = MigrateOneKey(rocksdb::Slice(user_key), &restore_cmds);
auto stat = MigrateOneKey(user_key, iter->value(), &restore_cmds);
if (stat.IsOK()) {
if (stat.Msg() == "ok") migratedkey_cnt++;
if (stat.Msg() == "expired") expiredkey_cnt++;
Expand Down Expand Up @@ -543,29 +543,15 @@ bool SlotMigrate::CheckResponseWithCounts(int sock_fd, int total) {
return true; // Can't reach here
}

bool SlotMigrate::GetSlotKeyMetadata(const rocksdb::Slice &prefix_key, std::string *bytes) {
rocksdb::ReadOptions read_options;
read_options.snapshot = slot_snapshot_;
auto s = storage_->GetDB()->Get(read_options, storage_->GetCFHandle("metadata"), prefix_key, bytes);
if (!s.ok()) {
LOG(ERROR) << "[migrate] Failed to get metadata of key: " << prefix_key.ToString()
<< ", Err: " << s.ToString();
return false;
}
return true;
}

Status SlotMigrate::MigrateOneKey(rocksdb::Slice key, std::string *restore_cmds) {
Status SlotMigrate::MigrateOneKey(const rocksdb::Slice &key, const rocksdb::Slice &value, std::string *restore_cmds) {
std::string prefix_key;
AppendNamespacePrefix(key, &prefix_key);
std::string bytes;
bool st = GetSlotKeyMetadata(prefix_key, &bytes);
if (!st) return Status(Status::NotOK, "[migrate] Failed to get key's metadata");
std::string bytes = value.ToString();
git-hulk marked this conversation as resolved.
Show resolved Hide resolved
Metadata metadata(kRedisNone, false);
metadata.Decode(bytes);
if (metadata.Type() != kRedisString && metadata.size == 0) {
LOG(INFO) << "[migrate] No elements of key: " << prefix_key;
return Status(Status::cOK, "empty");;
return Status(Status::cOK, "empty");
}

// Construct command according to type of the key
Expand Down
3 changes: 1 addition & 2 deletions src/slot_migrate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@ class SlotMigrate : public Redis::Database {
bool CheckResponseOnce(int sock_fd);
bool CheckResponseWithCounts(int sock_fd, int total);

bool GetSlotKeyMetadata(const rocksdb::Slice &prefix_key, std::string *bytes);
Status MigrateOneKey(rocksdb::Slice key, std::string *restore_cmds);
Status MigrateOneKey(const rocksdb::Slice &key, const rocksdb::Slice &value, std::string *restore_cmds);
bool MigrateSimpleKey(const rocksdb::Slice &key, const Metadata &metadata,
const std::string &bytes, std::string *restore_cmds);
bool MigrateComplexKey(const rocksdb::Slice &key, const Metadata &metadata, std::string *restore_cmds);
Expand Down