DeepSeek/3FS
1
0
Fork 0
mirror of https://github.com/deepseek-ai/3FS synced 2025-06-26 18:16:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 2b8ad231ba into 2db69ced80

Browse Source
This commit is contained in:
Arnav Balyan 2025-06-17 20:30:12 +08:00 committed by GitHub
commit 6cebc5b5aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/storage/store/ChunkMetaStore.cc
View File

@ -72,6 +72,8 @@ constexpr auto kMinKey = std::string_view{kMinIns, 1};
constexpr char kMaxIns[] = {(char)MetaKeyType::MAX, '\0'}; constexpr char kMaxIns[] = {(char)MetaKeyType::MAX, '\0'};
constexpr auto kMaxKey = std::string_view{kMaxIns, 1}; constexpr auto kMaxKey = std::string_view{kMaxIns, 1};
constexpr uint32_t kKeyValueLogBytes = 64;
// target version list: // target version list:
// 1. fix removed and recycled count. // 1. fix removed and recycled count.
constexpr uint32_t kTargetVersion = 1u; constexpr uint32_t kTargetVersion = 1u;
@ -125,7 +127,7 @@ inline auto serializeKey(const auto &o) {
Result<Void> deserializeKey(std::string_view view, auto &o) { Result<Void> deserializeKey(std::string_view view, auto &o) {
if (UNLIKELY(view.empty() || view[0] != static_cast<char>(o.type))) { if (UNLIKELY(view.empty() || view[0] != static_cast<char>(o.type))) {
auto msg = fmt::format("deserialize meta key prefix failed: {:02X}", fmt::join(view.substr(0, 64), ",")); auto msg = fmt::format("deserialize meta key prefix failed: {:02X}", fmt::join(view.substr(0, kKeyValueLogBytes), ","));
XLOG(DBG, msg); XLOG(DBG, msg);
return makeError(StorageCode::kChunkMetadataGetError, std::move(msg)); return makeError(StorageCode::kChunkMetadataGetError, std::move(msg));
} }
@ -291,10 +293,10 @@ Result<Void> ChunkMetaStore::migrate(const kv::KVStore::Config &config, const Ph
for (oldIt->seekToFirst(), newIt->seekToFirst(); oldIt->valid() && newIt->valid(); oldIt->next(), newIt->next()) { for (oldIt->seekToFirst(), newIt->seekToFirst(); oldIt->valid() && newIt->valid(); oldIt->next(), newIt->next()) {
if (UNLIKELY(oldIt->key() != newIt->key() || oldIt->value() != newIt->value())) { if (UNLIKELY(oldIt->key() != newIt->key() || oldIt->value() != newIt->value())) {
auto msg = fmt::format("meta store migrate failed old {:02X}:{:02X} != new {:02X}:{:02X}", auto msg = fmt::format("meta store migrate failed old {:02X}:{:02X} != new {:02X}:{:02X}",
fmt::join(oldIt->key().substr(0, 64), ","), fmt::join(oldIt->key().substr(0, kKeyValueLogBytes), ","),
fmt::join(oldIt->value().substr(0, 64), ","), fmt::join(oldIt->value().substr(0, kKeyValueLogBytes), ","),
fmt::join(newIt->key().substr(0, 64), ","), fmt::join(newIt->key().substr(0, kKeyValueLogBytes), ","),
fmt::join(newIt->value().substr(0, 64), ",")); fmt::join(newIt->value().substr(0, kKeyValueLogBytes), ","));
XLOG(ERR, msg); XLOG(ERR, msg);
return makeError(StorageCode::kMetaStoreInvalidIterator, msg); return makeError(StorageCode::kMetaStoreInvalidIterator, msg);
} }
@ -305,8 +307,8 @@ Result<Void> ChunkMetaStore::migrate(const kv::KVStore::Config &config, const Ph
auto &it = oldIt->valid() ? oldIt : newIt; auto &it = oldIt->valid() ? oldIt : newIt;
auto msg = fmt::format("meta store migrate failed {} {:02X}:{:02X}", auto msg = fmt::format("meta store migrate failed {} {:02X}:{:02X}",
oldIt->valid() ? "old" : "new", oldIt->valid() ? "old" : "new",
fmt::join(it->key().substr(0, 64), ","), fmt::join(it->key().substr(0, kKeyValueLogBytes), ","),
fmt::join(it->value().substr(0, 64), ",")); fmt::join(it->value().substr(0, kKeyValueLogBytes), ","));
XLOG(ERR, msg); XLOG(ERR, msg);
return makeError(StorageCode::kMetaStoreInvalidIterator, msg); return makeError(StorageCode::kMetaStoreInvalidIterator, msg);
} }