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

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Kaveh Vahedipour 2016-03-24 14:14:45 +01:00
parent 1bdfe53ec2 7b758efaeb
commit 9d43d4b708
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Cluster/ClusterComm.h
View File

@ -92,7 +92,6 @@ struct ClusterCommResult {
// is dropped whilst in state CL_COMM_SENDING // is dropped whilst in state CL_COMM_SENDING
// it is then actually dropped when it has // it is then actually dropped when it has
// been sent // been sent
bool invalid; // can only explicitly be set
bool single; // operation only needs a single round trip (and no request/ bool single; // operation only needs a single round trip (and no request/
// response in the opposite direction // response in the opposite direction
@ -110,7 +109,6 @@ struct ClusterCommResult {
ClusterCommResult() ClusterCommResult()
: dropped(false), : dropped(false),
invalid(false),
single(false), single(false),
answer_code(rest::HttpResponse::PROCESSING) {} answer_code(rest::HttpResponse::PROCESSING) {}

19
arangod/Cluster/v8-cluster.cpp
View File

@ -1745,10 +1745,7 @@ static void Return_PrepareClusterCommResultForJS(
TRI_V8_CURRENT_GLOBALS_AND_SCOPE; TRI_V8_CURRENT_GLOBALS_AND_SCOPE;
v8::Handle<v8::Object> r = v8::Object::New(isolate); v8::Handle<v8::Object> r = v8::Object::New(isolate);
if (res.invalid) { if (res.dropped) {
TRI_GET_GLOBAL_STRING(ErrorMessageKey);
r->Set(ErrorMessageKey, TRI_V8_ASCII_STRING("out of memory"));
} else if (res.dropped) {
TRI_GET_GLOBAL_STRING(ErrorMessageKey); TRI_GET_GLOBAL_STRING(ErrorMessageKey);
r->Set(ErrorMessageKey, TRI_V8_ASCII_STRING("operation was dropped")); r->Set(ErrorMessageKey, TRI_V8_ASCII_STRING("operation was dropped"));
} else { } else {
@ -1830,8 +1827,13 @@ static void Return_PrepareClusterCommResultForJS(
TRI_GET_GLOBAL_STRING(ErrorMessageKey); TRI_GET_GLOBAL_STRING(ErrorMessageKey);
r->Set(ErrorMessageKey, r->Set(ErrorMessageKey,
TRI_V8_ASCII_STRING("request dropped whilst waiting for answer")); TRI_V8_ASCII_STRING("request dropped whilst waiting for answer"));
} else { // Everything is OK } else if (res.status == CL_COMM_BACKEND_UNAVAILABLE) {
TRI_ASSERT(res.status == CL_COMM_RECEIVED); TRI_GET_GLOBAL_STRING(StatusKey);
r->Set(StatusKey, TRI_V8_ASCII_STRING("BACKEND_UNAVAILABLE"));
TRI_GET_GLOBAL_STRING(ErrorMessageKey);
r->Set(ErrorMessageKey,
TRI_V8_ASCII_STRING("required backend was not available"));
} else if (res.status == CL_COMM_RECEIVED) { // Everything is OK
// The headers: // The headers:
v8::Handle<v8::Object> h = v8::Object::New(isolate); v8::Handle<v8::Object> h = v8::Object::New(isolate);
TRI_GET_GLOBAL_STRING(StatusKey); TRI_GET_GLOBAL_STRING(StatusKey);
@ -1850,6 +1852,9 @@ static void Return_PrepareClusterCommResultForJS(
TRI_V8_PAIR_STRING(res.answer->body(), TRI_V8_PAIR_STRING(res.answer->body(),
(int)res.answer->bodySize())); (int)res.answer->bodySize()));
} }
} else {
TRI_V8_THROW_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL,
"unknown ClusterComm result status");
} }
} }
@ -1901,7 +1906,7 @@ static void JS_AsyncRequest(v8::FunctionCallbackInfo<v8::Value> const& args) {
clientTransactionID, coordTransactionID, destination, reqType, path, body, clientTransactionID, coordTransactionID, destination, reqType, path, body,
headerFields, 0, timeout, singleRequest); headerFields, 0, timeout, singleRequest);
if (res.invalid) { if (res.status == CL_COMM_ERROR) {
TRI_V8_THROW_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, TRI_V8_THROW_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL,
"couldn't queue async request"); "couldn't queue async request");
} }