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

added diagnostics for #2203

This commit is contained in:
jsteemann 2016-12-01 14:01:30 +01:00
parent fd327413ba
commit 07706fa40c
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arangod/VocBase/replication-dump.cpp
View File

@ -313,6 +313,7 @@ static int StringifyMarker(TRI_replication_dump_t* dump,
default: { default: {
TRI_ASSERT(false); TRI_ASSERT(false);
LOG(ERR) << "got invalid marker of type " << static_cast<int>(type);
return TRI_ERROR_INTERNAL; return TRI_ERROR_INTERNAL;
} }
} }
@ -436,6 +437,7 @@ static int SliceifyMarker(TRI_replication_dump_t* dump,
default: { default: {
TRI_ASSERT(false); TRI_ASSERT(false);
LOG(ERR) << "got invalid marker of type " << static_cast<int>(type);
return TRI_ERROR_INTERNAL; return TRI_ERROR_INTERNAL;
} }
} }
@ -582,8 +584,13 @@ static int DumpCollection(TRI_replication_dump_t* dump,
return TRI_ERROR_NO_ERROR; return TRI_ERROR_NO_ERROR;
} catch (basics::Exception const& ex) { } catch (basics::Exception const& ex) {
LOG(ERR) << "caught exception during dump of collection '" << collection->name() << "': " << ex.what();
return ex.code(); return ex.code();
} catch (std::exception const& ex) {
LOG(ERR) << "caught exception during dump of collection '" << collection->name() << "': " << ex.what();
return TRI_ERROR_INTERNAL;
} catch (...) { } catch (...) {
LOG(ERR) << "caught unknown exception during dump of collection '" << collection->name() << "'";
return TRI_ERROR_INTERNAL; return TRI_ERROR_INTERNAL;
} }
} }
@ -789,8 +796,13 @@ int TRI_DumpLogReplication(
Append(dump, "]"); Append(dump, "]");
} }
} catch (arangodb::basics::Exception const& ex) { } catch (arangodb::basics::Exception const& ex) {
LOG(ERR) << "caught exception while dumping replication log: " << ex.what();
res = ex.code(); res = ex.code();
} catch (std::exception const& ex) {
LOG(ERR) << "caught exception while dumping replication log: " << ex.what();
res = TRI_ERROR_INTERNAL;
} catch (...) { } catch (...) {
LOG(ERR) << "caught unknown exception while dumping replication log";
res = TRI_ERROR_INTERNAL; res = TRI_ERROR_INTERNAL;
} }
@ -958,8 +970,13 @@ int TRI_DetermineOpenTransactionsReplication(TRI_replication_dump_t* dump,
dump->_slices.push_back(std::move(buffer)); dump->_slices.push_back(std::move(buffer));
} catch (arangodb::basics::Exception const& ex) { } catch (arangodb::basics::Exception const& ex) {
LOG(ERR) << "caught exception while determining open transactions: " << ex.what();
res = ex.code(); res = ex.code();
} catch (std::exception const& ex) {
LOG(ERR) << "caught exception while determining open transactions: " << ex.what();
res = TRI_ERROR_INTERNAL;
} catch (...) { } catch (...) {
LOG(ERR) << "caught unknown exception while determining open transactions";
res = TRI_ERROR_INTERNAL; res = TRI_ERROR_INTERNAL;
} }