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

Agency bugfixes.

This commit is contained in:
Max Neunhoeffer 2016-06-08 14:59:13 +02:00
parent 418aef7fc0
commit c1fc27c585
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arangod/Agency/Agent.h
View File

@ -182,7 +182,7 @@ class Agent : public arangodb::Thread {
}; };
inline arangodb::consensus::write_ret_t transact ( inline arangodb::consensus::write_ret_t transact (
Agent* _agent, Builder const& transaction) { Agent* _agent, Builder const& transaction, bool waitForCommit = true) {
query_t envelope = std::make_shared<Builder>(); query_t envelope = std::make_shared<Builder>();
@ -195,8 +195,15 @@ inline arangodb::consensus::write_ret_t transact (
LOG_TOPIC(ERR, Logger::AGENCY) << e.what(); LOG_TOPIC(ERR, Logger::AGENCY) << e.what();
} }
LOG_TOPIC(DEBUG, Logger::AGENCY) << envelope->toJson(); LOG_TOPIC(INFO, Logger::AGENCY) << envelope->toJson();
return _agent->write(envelope); auto ret = _agent->write(envelope);
if (waitForCommit) {
auto maximum = *std::max_element(ret.indices.begin(), ret.indices.end());
if (maximum > 0) { // some baby has worked
_agent->waitFor(maximum);
}
}
return ret;
} }

2
arangod/Agency/CleanOutServer.cpp
View File

@ -245,7 +245,7 @@ bool CleanOutServer::scheduleMoveShards() const {
"Range error picking destination for shard " + shard.first; "Range error picking destination for shard " + shard.first;
} }
// Shedule move // Schedule move
MoveShard ( MoveShard (
_snapshot, _agent, _jobId + "-" + std::to_string(sub++), _jobId, _snapshot, _agent, _jobId + "-" + std::to_string(sub++), _jobId,
_agencyPrefix, database.first, collptr.first, shard.first, _server, _agencyPrefix, database.first, collptr.first, shard.first, _server,

15
arangod/Agency/Node.cpp
View File

@ -114,8 +114,13 @@ Node::Node(Node const& other) :
_node_name(other._node_name), _node_name(other._node_name),
_parent(nullptr), _parent(nullptr),
_store(nullptr), _store(nullptr),
_children(other._children), _value(other._value) {
_value(other._value) {}
for (auto const& p : other._children) {
auto copy = std::make_shared<Node>(*p.second);
_children.insert(std::make_pair(p.first, copy));
}
}
// Assignment of rhs slice // Assignment of rhs slice
Node& Node::operator=(VPackSlice const& slice) { Node& Node::operator=(VPackSlice const& slice) {
@ -152,7 +157,11 @@ Node& Node::operator=(Node const& rhs) {
// Must not move rhs's _parent, _ttl, _observers // Must not move rhs's _parent, _ttl, _observers
removeTimeToLive(); removeTimeToLive();
_node_name = rhs._node_name; _node_name = rhs._node_name;
_children = rhs._children; _children.clear();
for (auto const& p : rhs._children) {
auto copy = std::make_shared<Node>(*p.second);
_children.insert(std::make_pair(p.first, copy));
}
_value = rhs._value; _value = rhs._value;
return *this; return *this;
} }

4
arangod/Agency/Supervision.cpp
View File

@ -268,7 +268,6 @@ void Supervision::run() {
void Supervision::workJobs() { void Supervision::workJobs() {
Node::Children const todos = _snapshot(toDoPrefix).children(); Node::Children const todos = _snapshot(toDoPrefix).children();
Node::Children const pends = _snapshot(pendingPrefix).children();
for (auto const& todoEnt : todos) { for (auto const& todoEnt : todos) {
Node const& job = *todoEnt.second; Node const& job = *todoEnt.second;
@ -285,6 +284,9 @@ void Supervision::workJobs() {
} catch (std::exception const&) {} } catch (std::exception const&) {}
} }
_snapshot = _agent->readDB().get(_agencyPrefix);
Node::Children const pends = _snapshot(pendingPrefix).children();
for (auto const& pendEnt : pends) { for (auto const& pendEnt : pends) {
Node const& job = *pendEnt.second; Node const& job = *pendEnt.second;