Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix cleanupEngines, add another sanity check (#10344)

This commit is contained in:
Simon 2019-10-31 19:08:26 +01:00 committed by KVS85
parent 3f1ed16e9e
commit 583c8b883e
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arangod/Aql/EngineInfoContainerDBServer.cpp
View File

@ -1200,19 +1200,26 @@ struct NoopCb final : public arangodb::ClusterCommCallback {
void EngineInfoContainerDBServer::cleanupEngines(std::shared_ptr<ClusterComm> cc, void EngineInfoContainerDBServer::cleanupEngines(std::shared_ptr<ClusterComm> cc,
int errorCode, std::string const& dbname, int errorCode, std::string const& dbname,
MapRemoteToSnippet& queryIds) const { MapRemoteToSnippet& queryIds) const {
constexpr double shortTimeout = 10.0; // Picked arbitrarily
auto cb = std::make_shared<::NoopCb>();
std::unordered_map<std::string, std::string> headers;
CoordTransactionID coordinatorTransactionID = TRI_NewTickServer();
// Shutdown query snippets // Shutdown query snippets
std::string url("/_db/" + arangodb::basics::StringUtils::urlEncode(dbname) + std::string url("/_db/" + arangodb::basics::StringUtils::urlEncode(dbname) +
"/_api/aql/shutdown/"); "/_api/aql/shutdown/");
std::vector<ClusterCommRequest> requests;
auto body = std::make_shared<std::string>( auto body = std::make_shared<std::string>(
"{\"code\":" + std::to_string(errorCode) + "}"); "{\"code\":" + std::to_string(errorCode) + "}");
for (auto const& it : queryIds) { for (auto const& it : queryIds) {
// it.first == RemoteNodeId, we don't need this // it.first == RemoteNodeId, we don't need this
// it.second server -> [snippets] // it.second server -> [snippets]
for (auto const& serToSnippets : it.second) { for (auto const& serToSnippets : it.second) {
auto server = serToSnippets.first; ServerID const& server = serToSnippets.first;
for (auto const& shardId : serToSnippets.second) { for (auto const& shardId : serToSnippets.second) {
requests.emplace_back(server, rest::RequestType::PUT, url + shardId, body); cc->asyncRequest(coordinatorTransactionID, server, rest::RequestType::PUT,
url + shardId, body, headers, cb,
shortTimeout, false, 2.0);
} }
} }
} }
@ -1220,13 +1227,8 @@ void EngineInfoContainerDBServer::cleanupEngines(std::shared_ptr<ClusterComm> cc
// Shutdown traverser engines // Shutdown traverser engines
url = "/_db/" + arangodb::basics::StringUtils::urlEncode(dbname) + url = "/_db/" + arangodb::basics::StringUtils::urlEncode(dbname) +
"/_internal/traverser/"; "/_internal/traverser/";
std::unordered_map<std::string, std::string> headers;
std::shared_ptr<std::string> noBody; std::shared_ptr<std::string> noBody;
CoordTransactionID coordinatorTransactionID = TRI_NewTickServer();
auto cb = std::make_shared<::NoopCb>();
constexpr double shortTimeout = 10.0; // Picked arbitrarily
for (auto const& gn : _graphNodes) { for (auto const& gn : _graphNodes) {
auto allEngines = gn->engines(); auto allEngines = gn->engines();
for (auto const& engine : *allEngines) { for (auto const& engine : *allEngines) {

2
arangod/Cluster/ClusterTrxMethods.cpp
View File

@ -457,6 +457,8 @@ void ClusterTrxMethods::addAQLTransactionHeader(transaction::Methods const& trx,
TRI_ASSERT(false); TRI_ASSERT(false);
} }
state.addKnownServer(server); // remember server state.addKnownServer(server); // remember server
} else if (state.hasHint(transaction::Hints::Hint::FROM_TOPLEVEL_AQL)) {
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, "illegal AQL transaction state");
} }
headers.emplace(arangodb::StaticStrings::TransactionId, std::move(value)); headers.emplace(arangodb::StaticStrings::TransactionId, std::move(value));
} }