8000 Bug fix 3.8/allow for long supervision job runtimes by kvahed · Pull Request #14742 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Bug fix 3.8/allow for long supervision job runtimes #14742

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

Merged
merged 21 commits into from
Sep 11, 2021
Merged

Bug fix 3.8/allow for long supervision job runtimes #14742

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b6eb49d
[3.8] Lower priority of AQL lanes (#14699)
goedderz Aug 26, 2021
fc248f7
added a test for statistics behavior (#14703)
jsteemann Aug 26, 2021
24bc4c2
properly rename test file (#14705)
jsteemann Aug 26, 2021
ae8e806
Merge branch '3.8' of https://github.com/arangodb/arangodb into 3.8
kvahed Sep 7, 2021
e0f237a
fix hard time limits on move shard and cleanout server
kvahed Sep 7, 2021
38499ed
cleaner
kvahed Sep 7, 2021
9deb4da
allow for long supervision job runtimes
kvahed Sep 7, 2021
8ecf549
revert unfug in change log
kvahed Sep 7, 2021
cd2c8d6
fix 412 response
kvahed Sep 7, 2021
8c29836
fix 412 response
kvahed Sep 7, 2021
1ce1d69
Result constructors
kvahed Sep 7, 2021
967416a
integration tests
kvahed Sep 8, 2021
0878397
integration tests
kvahed Sep 8, 2021
4d1a1d7
integration tests
kvahed Sep 8, 2021
5d299fe
integration tests cleanout server
kvahed Sep 8, 2021
595cad3
cleanoutserver integration tests
kvahed Sep 8, 2021
8bc6118
fixing test
kvahed Sep 8, 2021
7b26f31
3.8 merge
kvahed Sep 8, 2021
1643021
3.8 cleanout server abort -> moveshard failed
kvahed Sep 9, 2021
57c3b98
same error over?
kvahed Sep 9, 2021
f78a185
Update CHANGELOG
KVS85 Sep 11, 2021
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
Prev Previous commit
Next Next commit
cleanoutserver integration tests
  • Loading branch information
@kvahed
kvahed committed Sep 8, 2021
commit 595cad3868280eb6c7e81c55ec5c988928a4d5f5
73 changes: 39 additions & 34 deletions arangod/RestHandler/RestAdminClusterHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ RestStatus RestAdminClusterHandler::handleCancelJob() {
LOG_TOPIC("eb139", INFO, Logger::SUPERVISION)
<< "Attempting to abort supervision job " << job.toJson();
auto type = job.get("type").stringView();
// only moveshard and cleanoutserver may be aborted
// only moveshard and cleanoutserver may be aborted
if (type != "moveShard" && type != "cleanOutServer") {
generateError(Result{TRI_ERROR_HTTP_BAD_PARAMETER,
"Only MoveShard and CleanOutServer jobs can be aborted"});
Expand All @@ -962,64 +962,69 @@ RestStatus RestAdminClusterHandler::handleCancelJob() {
// A todo job could be pending in the meantime however a pending
// job can never be todo again. Response ist evaluated in 412 result
// below.
VPackBuffer<uint8_t> trxBody;
{ VPackBuilder builder(trxBody);
{ VPackArrayBuilder trxs(&builder);
if (path[2] == "ToDo") {
auto sendTransaction = [&] {
VPackBuffer<uint8_t> trxBody;
{ VPackBuilder builder(trxBody);
{ VPackArrayBuilder trxs(&builder);
if (path[2] == "ToDo") {
VPackArrayBuilder trx(&builder);
{ VPackObjectBuilder op(&builder);
builder.add("arango/Target/ToDo/" + jobId + "/abort", VPackValue(true)); }
{ VPackObjectBuilder pre(&builder);
builder.add(VPackValue("arango/Target/ToDo/" + jobId));
{ VPackObjectBuilder val(&builder);
builder.add("oldEmpty", VPackValue(false)); }}
}
VPackArrayBuilder trx(&builder);
{ VPackObjectBuilder op(&builder);
builder.add("arango/Target/ToDo/" + jobId + "/abort", VPackValue(true)); }
builder.add("arango/Target/Pending/" + jobId + "/abort", VPackValue(true)); }
{ VPackObjectBuilder pre(&builder);
builder.add(VPackValue("arango/Target/ToDo/" + jobId));
builder.add(VPackValue("arango/Target/Pending/" + jobId));
{ VPackObjectBuilder val(&builder);
builder.add("oldEmpty", VPackValue(false)); }}
}
VPackArrayBuilder trx(&builder);
{ VPackObjectBuilder op(&builder);
builder.add("arango/Target/Pending/" + jobId + "/abort", VPackValue(true)); }
{ VPackObjectBuilder pre(&builder);
builder.add(VPackValue("arango/Target/Pending/" + jobId));
{ VPackObjectBuilder val(&builder);
builder.add("oldEmpty", VPackValue(false)); }}
}
}
return AsyncAgencyComm().sendWriteTransaction(60s, std::move(trxBody));
};

waitForFuture(
AsyncAgencyComm().sendWriteTransaction(60s, std::move(trxBody))
.thenValue([this](AsyncAgencyCommResult&& wr) {
return waitForFuture(
sendTransaction()
.thenValue([this, &jobId](AsyncAgencyCommResult&& wr) {
if (!wr.ok()) {
// Only if no longer pending or todo.
if (wr.statusCode() == 412) {
auto results = wr.slice().get("results");
if (results[0].getNumber<int64_t>() == 0 &&
results[1].getNumber<int64_t>() == 0) {
generateError(Result{TRI_ERROR_HTTP_PRECONDITION_FAILED,
"Job is no longer pending or to do"});
if (results[0].getNumber<uint64_t>() == 0 &&
results[1].getNumber<uint64_t>() == 0) {
generateError(
Result{TRI_ERROR_HTTP_PRECONDITION_FAILED, "Job is no longer pending or to do"});
}
} else {
generateError(wr.asResult());
}
}
return futures::makeFuture();

VPackBuffer<uint8_t> payload;
{
VPackBuilder builder(payload);
VPackObjectBuilder ob(&builder);
builder.add("job", VPackValue(jobId));
builder.add("status", VPackValue("aborted"));
builder.add("error", VPackValue(false));
}
resetResponse(rest::ResponseCode::OK);
response()->setPayload(std::move(payload));
return futures::makeFuture(RestStatus::DONE);
})
.thenError<VPackException>([this](VPackException const& e) {
generateError(Result{TRI_ERROR_HTTP_SERVER_ERROR, e.what()});
return futures::makeFuture(RestStatus::DONE);
})
.thenError<std::exception>([this](std::exception const& e) {
generateError(rest::ResponseCode::SERVER_ERROR,
TRI_ERROR_HTTP_SERVER_ERROR, e.what());
return futures::makeFuture(RestStatus::DONE);
}));
VPackBuffer<uint8_t> payload;
{
VPackBuilder builder(payload);
VPackObjectBuilder ob(&builder);
builder.add("job", VPackValue(jobId));
builder.add("status", VPackValue("aborted"));
builder.add("error", VPackValue(false));
}
resetResponse(rest::ResponseCode::OK);
response()->setPayload(std::move(payload));
return RestStatus::DONE;
}
}

Expand Down
0