tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix macro bench clients common rethrow

Browse Source 
Summary:
I think the rethrow as it was done in `.../clientes/common.hpp` is not
correct as it could have caught any exception type descending from
`BasicException`, copied it into `optional<BasicException>` and thus
losing exact type and members of the original exception. I think that
the proposed formulation of a rethrow in the `catch` does it properly.
I made a small test for this behavior, see P11.

Reviewers: teon.banek, mferencevic, mislav.bradac

Reviewed By: teon.banek

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D1298
This commit is contained in:
florijan 2018-03-13 15:27:49 +01:00
parent 95f1b6fe56
commit 0b2d0b0d61
1 changed files with 9 additions and 7 deletions

16
tests/macro_benchmark/clients/common.hpp
View File

@ -59,17 +59,20 @@ template <typename TClient>
std::pair<communication::bolt::QueryData, int> ExecuteNTimesTillSuccess(
TClient &client, const std::string &query,
const std::map<std::string, communication::bolt::DecodedValue> &params,
int times) {
std::experimental::optional<utils::BasicException> last_exception;
int max_attempts) {
static thread_local std::mt19937 pseudo_rand_gen_{std::random_device{}()};
static thread_local std::uniform_int_distribution<> rand_dist_{10, 50};
for (int i = 0; i < times; ++i) {
int failed_attempts{0};
while (true) {
try {
auto ret = client.Execute(query, params);
return {ret, i};
return {ret, failed_attempts};
} catch (const utils::BasicException &e) {
VLOG(0) << "Error: " << e.what();
last_exception = e;
if (++failed_attempts == max_attempts) {
LOG(WARNING) << query << " failed " << failed_attempts << "times";
throw;
}
utils::Timer t;
std::chrono::microseconds to_sleep(rand_dist_(pseudo_rand_gen_));
while (t.Elapsed() < to_sleep) {
@ -77,7 +80,6 @@ std::pair<communication::bolt::QueryData, int> ExecuteNTimesTillSuccess(
}
}
}
LOG(WARNING) << query << " failed " << times << "times";
throw last_exception.value();
}
} // namespace