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

do not mange errors in ClusterCommResult (#5933)

This commit is contained in:
Jan 2018-08-17 08:44:45 +02:00 committed by GitHub
parent d78adb7ae1
commit 10800572d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arangod/Cluster/ClusterComm.cpp
View File

@ -187,15 +187,19 @@ int ClusterCommResult::getErrorCode() const {
return TRI_ERROR_CLUSTER_TIMEOUT;
case CL_COMM_ERROR:
return TRI_ERROR_INTERNAL;
case CL_COMM_DROPPED:
if (errorCode != TRI_ERROR_NO_ERROR) {
return errorCode;
}
return TRI_ERROR_INTERNAL;
case CL_COMM_BACKEND_UNAVAILABLE:
return TRI_ERROR_CLUSTER_BACKEND_UNAVAILABLE;
}
if (errorCode != TRI_ERROR_NO_ERROR) {
return errorCode;
}
return TRI_ERROR_INTERNAL;
}

14
arangod/Cluster/ClusterComm.h
View File

@ -176,6 +176,8 @@ struct ClusterCommResult {
ServerID serverID; // the actual server ID of the recipient, can be empty
std::string endpoint; // the actual endpoint of the recipient, always set
std::string errorMessage;
// error code as returned by the other side in "errorNum" attribute
int errorCode;
ClusterCommOpStatus status;
bool dropped; // this is set to true, if the operation
// is dropped whilst in state CL_COMM_SENDING
@ -205,6 +207,7 @@ struct ClusterCommResult {
ClusterCommResult()
: coordTransactionID(0),
operationID(0),
errorCode(TRI_ERROR_NO_ERROR),
status(CL_COMM_BACKEND_UNAVAILABLE),
dropped(false),
single(false),
@ -228,6 +231,7 @@ struct ClusterCommResult {
void fromError(int errorCode, std::unique_ptr<GeneralResponse> response) {
errorMessage = TRI_errno_string(errorCode);
this->errorCode = errorCode;
switch (errorCode) {
case TRI_SIMPLE_CLIENT_COULD_NOT_CONNECT:
status = CL_COMM_BACKEND_UNAVAILABLE;
@ -254,6 +258,7 @@ struct ClusterCommResult {
void fromResponse(std::unique_ptr<GeneralResponse> response) {
sendWasComplete = true;
errorCode = TRI_ERROR_NO_ERROR;
// mop: simulate the old behaviour where the original request
// was sent to the recipient and was simply accepted. Then the backend would
// do its work and send a request to the target containing the result of
@ -288,6 +293,15 @@ struct ClusterCommResult {
// result was available in different status code situations :S
if (single) {
status = result->wasHttpError() ? CL_COMM_ERROR : CL_COMM_SENT;
if (status == CL_COMM_ERROR) {
try {
auto body = result->getBodyVelocyPack(VPackOptions());
if (body->slice().isObject() && body->slice().hasKey("errorMessage")) {
errorMessage = body->slice().get("errorMessage").copyString();
errorCode = body->slice().get("errorNum").getNumber<int>();
}
} catch (...) {}
}
} else {
// mop: actually it will never be an ERROR here...this is and was a dirty
// hack :S