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

fix show tag/edge index status #4148

Merged
merged 2 commits into from
Apr 13, 2022
Merged

fix show tag/edge index status #4148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d950b61
fix show tag/edge index status
panda-sheep Apr 13, 2022
ea03707
Merge branch 'master' into fix_show_index_status
panda-sheep Apr 13, 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
13 changes: 9 additions & 4 deletions src/meta/processors/job/ListEdgeIndexStatusProcessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,23 @@ void ListEdgeIndexStatusProcessor::process(const cpp2::ListIndexStatusReq& req)
return a.get_job_id() > b.get_job_id();
});

std::vector<cpp2::IndexStatus> statuses;
std::unordered_map<std::string, cpp2::JobStatus> tmp;
for (auto& jobDesc : jobs) {
cpp2::IndexStatus status;
auto paras = jobDesc.get_paras();
std::string edgeIndexJobName;
if (paras.empty()) {
edgeIndexJobName = "all_edge_indexes";
} else {
edgeIndexJobName = folly::join(",", paras);
}
status.name_ref() = edgeIndexJobName;
status.status_ref() = apache::thrift::util::enumNameSafe(jobDesc.get_status());
tmp.emplace(edgeIndexJobName, jobDesc.get_status());
}

std::vector<cpp2::IndexStatus> statuses;
for (auto& kv : tmp) {
cpp2::IndexStatus status;
status.name_ref() = std::move(kv.first);
status.status_ref() = apache::thrift::util::enumNameSafe(kv.second);
statuses.emplace_back(std::move(status));
}
resp_.statuses_ref() = std::move(statuses);
Expand Down
13 changes: 9 additions & 4 deletions src/meta/processors/job/ListTagIndexStatusProcessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,23 @@ void ListTagIndexStatusProcessor::process(const cpp2::ListIndexStatusReq& req) {
return a.get_job_id() > b.get_job_id();
});

std::vector<cpp2::IndexStatus> statuses;
std::unordered_map<std::string, cpp2::JobStatus> tmp;
for (auto& jobDesc : jobs) {
cpp2::IndexStatus status;
auto paras = jobDesc.get_paras();
std::string tagIndexJobName;
if (paras.empty()) {
tagIndexJobName = "all_tag_indexes";
} else {
tagIndexJobName = folly::join(",", paras);
}
status.name_ref() = tagIndexJobName;
status.status_ref() = apache::thrift::util::enumNameSafe(jobDesc.get_status());
tmp.emplace(tagIndexJobName, jobDesc.get_status());
}

std::vector<cpp2::IndexStatus> statuses;
for (auto& kv : tmp) {
cpp2::IndexStatus status;
status.name_ref() = std::move(kv.first);
status.status_ref() = apache::thrift::util::enumNameSafe(kv.second);
statuses.emplace_back(std::move(status));
}
resp_.statuses_ref() = std::move(statuses);
Expand Down
97 changes: 97 additions & 0 deletions src/meta/test/IndexProcessorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#include "meta/processors/index/GetTagIndexProcessor.h"
#include "meta/processors/index/ListEdgeIndexesProcessor.h"
#include "meta/processors/index/ListTagIndexesProcessor.h"
#include "meta/processors/job/ListEdgeIndexStatusProcessor.h"
#include "meta/processors/job/ListTagIndexStatusProcessor.h"
#include "meta/processors/parts/CreateSpaceProcessor.h"
#include "meta/processors/schema/AlterEdgeProcessor.h"
#include "meta/processors/schema/AlterTagProcessor.h"
Expand Down Expand Up @@ -2349,6 +2351,101 @@ TEST(ProcessorTest, IndexIdInSpaceRangeTest) {
ASSERT_EQ(14, resp.get_id().get_index_id());
}
}

// Check list tag index status
TEST(IndexProcessorTest, ListTagIndexStatusTest) {
fs::TempDir rootPath("/tmp/ListTagIndexStatusTest.XXXXXX");
std::unique_ptr<kvstore::KVStore> kv(MockCluster::initMetaKV(rootPath.path()));
TestUtils::createSomeHosts(kv.get());
GraphSpaceID spaceId = 1;
TestUtils::assembleSpace(kv.get(), spaceId, 1);
std::vector<kvstore::KV> data;

for (JobID jobId = 1; jobId < 3; jobId++) {
auto jobKey = MetaKeyUtils::jobKey(spaceId, jobId);
std::vector<std::string> paras{"tag_index_name"};
cpp2::JobStatus jstatus;
if (jobId == 1) {
jstatus = cpp2::JobStatus::FAILED;
} else {
jstatus = cpp2::JobStatus::FINISHED;
}
auto jobVal = MetaKeyUtils::jobVal(
cpp2::JobType::REBUILD_TAG_INDEX, paras, jstatus, 1, 2, nebula::cpp2::ErrorCode::SUCCEEDED);
data.emplace_back(std::move(jobKey), std::move(jobVal));
}
folly::Baton<true, std::atomic> baton;
auto ret = nebula::cpp2::ErrorCode::SUCCEEDED;
kv->asyncMultiPut(
kDefaultSpaceId, kDefaultPartId, std::move(data), [&](nebula::cpp2::ErrorCode code) {
ret = code;
baton.post();
});
baton.wait();
ASSERT_EQ(ret, nebula::cpp2::ErrorCode::SUCCEEDED);

// Allow to create edge index on no fields
cpp2::ListIndexStatusReq req;
req.space_id_ref() = 1;
auto* processor = ListTagIndexStatusProcessor::instance(kv.get());
auto f = processor->getFuture();
processor->process(req);
auto resp = std::move(f).get();
ASSERT_EQ(nebula::cpp2::ErrorCode::SUCCEEDED, resp.get_code());
auto statuses = resp.get_statuses();
ASSERT_EQ(statuses.size(), 1);
ASSERT_TRUE(!(statuses[0].get_status().compare("FINISHED")));
}

// Check list edge index status
TEST(IndexProcessorTest, ListEdgeIndexStatusTest) {
fs::TempDir rootPath("/tmp/ListEdgeIndexStatusTest.XXXXXX");
std::unique_ptr<kvstore::KVStore> kv(MockCluster::initMetaKV(rootPath.path()));
TestUtils::createSomeHosts(kv.get());
GraphSpaceID spaceId = 1;
TestUtils::assembleSpace(kv.get(), spaceId, 1);
std::vector<kvstore::KV> data;

for (JobID jobId = 1; jobId < 3; jobId++) {
auto jobKey = MetaKeyUtils::jobKey(spaceId, jobId);
std::vector<std::string> paras{"edge_index_name"};
cpp2::JobStatus jstatus;
if (jobId == 1) {
jstatus = cpp2::JobStatus::FAILED;
} else {
jstatus = cpp2::JobStatus::FINISHED;
}
auto jobVal = MetaKeyUtils::jobVal(cpp2::JobType::REBUILD_EDGE_INDEX,
paras,
jstatus,
1,
2,
nebula::cpp2::ErrorCode::SUCCEEDED);
data.emplace_back(std::move(jobKey), std::move(jobVal));
}
folly::Baton<true, std::atomic> baton;
auto ret = nebula::cpp2::ErrorCode::SUCCEEDED;
kv->asyncMultiPut(
kDefaultSpaceId, kDefaultPartId, std::move(data), [&](nebula::cpp2::ErrorCode code) {
ret = code;
baton.post();
});
baton.wait();
ASSERT_EQ(ret, nebula::cpp2::ErrorCode::SUCCEEDED);

// Allow to create edge index on no fields
cpp2::ListIndexStatusReq req;
req.space_id_ref() = 1;
auto* processor = ListEdgeIndexStatusProcessor::instance(kv.get());
auto f = processor->getFuture();
processor->process(req);
auto resp = std::move(f).get();
ASSERT_EQ(nebula::cpp2::ErrorCode::SUCCEEDED, resp.get_code());
auto statuses = resp.get_statuses();
ASSERT_EQ(statuses.size(), 1);
ASSERT_TRUE(!(statuses[0].get_status().compare("FINISHED")));
}

} // namespace meta
} // namespace nebula

Expand Down