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

Jump to bottom

Meta upgrade #5174

Merged
merged 6 commits into from
Jan 5, 2023
Merged

Meta upgrade #5174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a0c1e9
Meta upgrade
cangfengzhs Dec 30, 2022
35b6231
Merge branch 'master' into meta-upgrade
cangfengzhs Dec 30, 2022
1b0627d
Merge branch 'master' into meta-upgrade
cangfengzhs Jan 3, 2023
4f68e5c
fix bug
cangfengzhs Jan 3, 2023
3e7844c
Merge branch 'master' into meta-upgrade
Sophie-Xie Jan 5, 2023
9419522
Merge branch 'master' into meta-upgrade
Sophie-Xie Jan 5, 2023
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
2 changes: 1 addition & 1 deletion src/clients/meta/MetaClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ class MetaClient : public BaseMetaClient {
std::atomic<int64_t> metadLastUpdateTime_{0};

int64_t metaServerVersion_{-1};
static constexpr int64_t EXPECT_META_VERSION = 3;
static constexpr int64_t EXPECT_META_VERSION = 4;

// leadersLock_ is used to protect leadersInfo
folly::SharedMutex leadersLock_;
Expand Down
12 changes: 7 additions & 5 deletions src/daemons/MetaDaemonInit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,18 @@ std::unique_ptr<nebula::kvstore::KVStore> initKV(std::vector<nebula::HostAddr> p
LOG(ERROR) << "Meta version is invalid";
return nullptr;
} else if (version == nebula::meta::MetaVersion::V1) {
LOG(ERROR) << "Can't upgrade meta from V1 to V3";
LOG(ERROR) << "Can't upgrade meta from V1 to V3_4";
return nullptr;
} else if (version == nebula::meta::MetaVersion::V2) {
auto ret = nebula::meta::MetaVersionMan::updateMetaV2ToV3(engine);
LOG(ERROR) << "Can't upgrade meta from V2 to V3_4";
return nullptr;
} else if (version == nebula::meta::MetaVersion::V3) {
auto ret = nebula::meta::MetaVersionMan::updateMetaV3ToV3_4(engine);
if (!ret.ok()) {
LOG(ERROR) << "Update meta from V2 to V3 failed " << ret;
LOG(ERROR) << "Update meta from V3 to V3_4 failed " << ret;
return nullptr;
}

nebula::meta::MetaVersionMan::setMetaVersionToKV(engine, nebula::meta::MetaVersion::V3);
nebula::meta::MetaVersionMan::setMetaVersionToKV(engine, nebula::meta::MetaVersion::V3_4);
}

LOG(INFO) << "Nebula store init succeeded, clusterId " << gClusterId;
Expand Down
104 changes: 21 additions & 83 deletions src/meta/MetaVersionMan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ MetaVersion MetaVersionMan::getVersionByHost(kvstore::KVStore* kv) {
}
if (iter->valid()) {
auto v1KeySize = hostPrefix.size() + sizeof(int64_t);
return (iter->key().size() == v1KeySize) ? MetaVersion::V1 : MetaVersion::V3;
return (iter->key().size() == v1KeySize) ? MetaVersion::V1 : MetaVersion::V3_4;
}
// No hosts exists, regard as version 3
return MetaVersion::V3;
return MetaVersion::V3_4;
}

// static
Expand All @@ -58,7 +58,7 @@ bool MetaVersionMan::setMetaVersionToKV(kvstore::KVEngine* engine, MetaVersion v
return code == nebula::cpp2::ErrorCode::SUCCEEDED;
}

Status MetaVersionMan::updateMetaV2ToV3(kvstore::KVEngine* engine) {
Status MetaVersionMan::updateMetaV3ToV3_4(kvstore::KVEngine* engine) {
CHECK_NOTNULL(engine);
auto snapshot = folly::sformat("META_UPGRADE_SNAPSHOT_{}", MetaKeyUtils::genTimestampStr());

Expand All @@ -75,7 +75,7 @@ Status MetaVersionMan::updateMetaV2ToV3(kvstore::KVEngine* engine) {
return Status::Error("Create snapshot failed");
}

auto status = doUpgradeV2ToV3(engine);
auto status = doUpgradeV3ToV3_4(engine);
if (!status.ok()) {
// rollback by snapshot
return status;
Expand All @@ -89,87 +89,25 @@ Status MetaVersionMan::updateMetaV2ToV3(kvstore::KVEngine* engine) {
return Status::OK();
}

Status MetaVersionMan::doUpgradeV2ToV3(kvstore::KVEngine* engine) {
MetaDataUpgrade upgrader(engine);
// Step 1: Upgrade HeartBeat into machine list
{
// collect all hosts association with zone
std::vector<HostAddr> zoneHosts;
const auto& zonePrefix = MetaKeyUtils::zonePrefix();
std::unique_ptr<kvstore::KVIterator> zoneIter;
auto code = engine->prefix(zonePrefix, &zoneIter);
if (code != nebula::cpp2::ErrorCode::SUCCEEDED) {
LOG(INFO) << "Get active hosts failed";
return Status::Error("Get hosts failed");
}

while (zoneIter->valid()) {
auto hosts = MetaKeyUtils::parseZoneHosts(zoneIter->val());
if (!hosts.empty()) {
zoneHosts.insert(zoneHosts.end(), hosts.begin(), hosts.end());
}
zoneIter->next();
}

const auto& prefix = MetaKeyUtils::hostPrefix();
std::unique_ptr<kvstore::KVIterator> iter;
code = engine->prefix(prefix, &iter);
if (code != nebula::cpp2::ErrorCode::SUCCEEDED) {
LOG(INFO) << "Get active hosts failed";
return Status::Error("Get hosts failed");
}

std::vector<kvstore::KV> data;
while (iter->valid()) {
auto info = HostInfo::decode(iter->val());

if (info.role_ == meta::cpp2::HostRole::STORAGE) {
// Save the machine information
auto host = MetaKeyUtils::parseHostKey(iter->key());
auto machineKey = MetaKeyUtils::machineKey(host.host, host.port);
data.emplace_back(std::move(machineKey), "");

auto hostIt = std::find(zoneHosts.begin(), zoneHosts.end(), host);
if (hostIt == zoneHosts.end()) {
// Save the zone information
auto zoneName = folly::stringPrintf("default_zone_%s_%d", host.host.c_str(), host.port);
auto zoneKey = MetaKeyUtils::zoneKey(std::move(zoneName));
auto zoneVal = MetaKeyUtils::zoneVal({host});
data.emplace_back(std::move(zoneKey), std::move(zoneVal));
}
}
iter->next();
}
auto status = upgrader.saveMachineAndZone(std::move(data));
if (!status.ok()) {
LOG(INFO) << status;
return status;
}
Status MetaVersionMan::doUpgradeV3ToV3_4(kvstore::KVEngine* engine) {
std::unique_ptr<kvstore::KVIterator> fulltextIter;
auto code = engine->prefix(MetaKeyUtils::fulltextIndexPrefix(), &fulltextIter);
if (code != nebula::cpp2::ErrorCode::SUCCEEDED) {
LOG(ERROR) << "Upgrade meta failed";
return Status::Error("Update meta failed");
}

// Step 2: Update Create space properties about Group
{
const auto& prefix = MetaKeyUtils::spacePrefix();
std::unique_ptr<kvstore::KVIterator> iter;
auto code = engine->prefix(prefix, &iter);
if (code != nebula::cpp2::ErrorCode::SUCCEEDED) {
LOG(INFO) << "Get spaces failed";
return Status::Error("Get spaces failed");
}

while (iter->valid()) {
if (FLAGS_print_info) {
upgrader.printSpacesV2(iter->val());
}
auto status = upgrader.rewriteSpacesV2ToV3(iter->key(), iter->val());
if (!status.ok()) {
LOG(INFO) << status;
return status;
}
iter->next();
}
std::vector<std::string> fulltextList;
while (fulltextIter->valid()) {
fulltextList.push_back(fulltextIter->key().toString());
fulltextIter->next();
}
if (!setMetaVersionToKV(engine, MetaVersion::V3)) {
code = engine->multiRemove(fulltextList);
if (code != nebula::cpp2::ErrorCode::SUCCEEDED) {
LOG(ERROR) << "Upgrade meta failed";
return Status::Error("Upgrade meta failed");
}

if (!setMetaVersionToKV(engine, MetaVersion::V3_4)) {
return Status::Error("Persist meta version failed");
} else {
return Status::OK();
Expand Down
5 changes: 3 additions & 2 deletions src/meta/MetaVersionMan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ enum class MetaVersion {
V1 = 1,
V2 = 2,
V3 = 3,
V3_4 = 4,
};

/**
Expand All @@ -38,12 +39,12 @@ class MetaVersionMan final {

static bool setMetaVersionToKV(kvstore::KVEngine* engine, MetaVersion version);

static Status updateMetaV2ToV3(kvstore::KVEngine* engine);
static Status updateMetaV3ToV3_4(kvstore::KVEngine* engine);

private:
static MetaVersion getVersionByHost(kvstore::KVStore* kv);

static Status doUpgradeV2ToV3(kvstore::KVEngine* engine);
static Status doUpgradeV3ToV3_4(kvstore::KVEngine* engine);
};

} // namespace meta
Expand Down
3 changes: 2 additions & 1 deletion src/tools/meta-dump/MetaDumpTool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class MetaDumper {
V1 = 1,
V2 = 2,
V3 = 3,
V3_4 = 4,
};

prefix = "__meta_version__";
Expand All @@ -60,7 +61,7 @@ class MetaDumper {
while (iter->Valid() && iter->key().starts_with(prefix)) {
found = true;
auto v1KeySize = prefix.size() + sizeof(int64_t);
auto version = (iter->key().size() == v1KeySize) ? MetaVersion::V1 : MetaVersion::V3;
auto version = (iter->key().size() == v1KeySize) ? MetaVersion::V1 : MetaVersion::V3_4;
LOG(INFO) << "Meta version=" << static_cast<int>(version);
iter->Next();
break;
Expand Down