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

Merge

This commit is contained in:
Heiko Kernbach 2014-10-10 12:01:12 +02:00
parent 144c8b43e1 684604d8f6
commit 42f12d0ac6
6 changed files with 87 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/Aql/Query.cpp
View File

@ -454,7 +454,10 @@ QueryResult Query::prepare (QueryRegistry* registry) {
auto otherJsonString =
otherPlan->toJson(parser->ast(), TRI_UNKNOWN_MEM_ZONE, true).toString();
std::cout << "deserialised plan: \n" << otherJsonString << "\n";
TRI_ASSERT(otherJsonString == JsonString); */
//TRI_ASSERT(otherJsonString == JsonString); */
// varsUsedLater and varsValid are unordered_sets and so their orders
// are not the same in the serialised and deserialised plans
enterState(EXECUTION);
ExecutionEngine* engine(ExecutionEngine::instanciateFromPlan(registry, this, plan.get(), planRegisters));

5
js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
View File

@ -690,11 +690,6 @@
delete SYS_EXECUTE_EXTERNAL;
}
if (typeof SYS_EXECUTE_EXTERNAL_AND_WAIT !== "undefined") {
exports.executeExternalAndWait = SYS_EXECUTE_EXTERNAL_AND_WAIT;
delete SYS_EXECUTE_EXTERNAL_AND_WAIT;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief executeExternalAndWait - instantly waits for the exit, returns
/// joint result.

39
js/server/modules/org/arangodb/testing.js
View File

@ -424,6 +424,7 @@ function executeAndWait (cmd, args) {
var startTime = time();
var res = executeExternalAndWait(cmd, args);
var deltaTime = time() - startTime;
var errorMessage = ' - ';
if (res.status === "TERMINATED") {
print("Finished: " + res.status + " Exitcode: " + res.exit + " Time Elapsed: " + deltaTime);
@ -435,30 +436,26 @@ function executeAndWait (cmd, args) {
}
}
else if (res.status === "ABORTED") {
var toppid = executeExternal("/usr/bin/top", ["-b", "-n1"]);
statusExternal(toppid, true);
print("Finished: " + res.status + " Signal: " + res.signal + " Time Elapsed: " + deltaTime);
if (res.signal === 10) {
return {
status: true,
message: "irregular termination: " + res.status + " Exit-Signal: " + res.signal +
" Handling Signal 10 as non-error.",
duration: deltaTime
};
// var toppid = executeExternal("/usr/bin/top", ["-b", "-n1"]);
if (typeof(res.errorMessage) !== 'undefined') {
errorMessage += res.errorMessage;
}
else {
return {
status: false,
message: "irregular termination: " + res.status + " Exit-Signal: " + res.signal,
duration: deltaTime
};
}
}
else {
print("Finished: " + res.status + " Exitcode: " + res.exit + " Time Elapsed: " + deltaTime);
// statusExternal(toppid, true);
print("Finished: " + res.status + " Signal: " + res.signal + " Time Elapsed: " + deltaTime + errorMessage);
return {
status: false,
message: "irregular termination: " + res.status + " Exit-Code: " + res.exit,
message: "irregular termination: " + res.status + " Exit-Signal: " + res.signal + errorMessage,
duration: deltaTime
};
}
else {
if (typeof(res.errorMessage) !== 'undefined') {
errorMessage += res.errorMessage;
}
print("Finished: " + res.status + " Exitcode: " + res.exit + " Time Elapsed: " + deltaTime + errorMessage);
return {
status: false,
message: "irregular termination: " + res.status + " Exit-Code: " + res.exit + errorMessage,
duration: deltaTime
};
}

57
lib/Basics/process-utils.cpp
View File

@ -57,6 +57,8 @@
#include "Basics/string-buffer.h"
#include "Basics/locks.h"
#include "Basics/logging.h"
#include "Basics/StringUtils.h"
// -----------------------------------------------------------------------------
// --SECTION-- private types
@ -975,6 +977,10 @@ TRI_external_status_t TRI_CheckExternalProcess (TRI_external_id_t pid,
if (i == ExternalProcesses._length) {
TRI_UnlockMutex(&ExternalProcessesLock);
status._errorMessage =
std::string("the pid you're looking for is not in our list: ") +
triagens::basics::StringUtils::itoa(external->_pid);
status._status = TRI_EXT_NOT_FOUND;
return status;
}
@ -993,12 +999,41 @@ TRI_external_status_t TRI_CheckExternalProcess (TRI_external_id_t pid,
}
res = waitpid(external->_pid, &loc, opts);
if (res == 0) {
external->_exitStatus = 0;
if (wait) {
status._errorMessage =
std::string("waitpid returned 0 for pid while it shouldn't ") +
triagens::basics::StringUtils::itoa(external->_pid);
if (WIFEXITED(loc)) {
external->_status = TRI_EXT_TERMINATED;
external->_exitStatus = WEXITSTATUS(loc);
}
else if (WIFSIGNALED(loc)) {
external->_status = TRI_EXT_ABORTED;
external->_exitStatus = WTERMSIG(loc);
}
else if (WIFSTOPPED(loc)) {
external->_status = TRI_EXT_STOPPED;
external->_exitStatus = 0;
}
else {
external->_status = TRI_EXT_ABORTED;
external->_exitStatus = 0;
}
}
else {
external->_exitStatus = 0;
}
}
else if (res == -1) {
int err = errno;
LOG_WARNING("waitpid returned error for pid %d: %s",
(int) external->_pid,
TRI_errno_string(errno));
TRI_errno_string(err));
status._errorMessage =
std::string("waitpid returned error for pid ") +
triagens::basics::StringUtils::itoa(external->_pid) +
std::string(": ") +
std::string(TRI_errno_string(err));
}
else if (static_cast<TRI_pid_t>(external->_pid) == static_cast<TRI_pid_t>(res)) {
if (WIFEXITED(loc)) {
@ -1025,6 +1060,11 @@ TRI_external_status_t TRI_CheckExternalProcess (TRI_external_id_t pid,
fprintf(stderr, "unexpected waitpid result for pid %d: %d",
(int) external->_pid,
(int) res);
status._errorMessage =
std::string("unexpected waitpid result for pid ") +
triagens::basics::StringUtils::itoa(external->_pid) +
std::string(": ") +
triagens::basics::StringUtils::itoa(res);
}
#else
if (wait) {
@ -1033,12 +1073,20 @@ TRI_external_status_t TRI_CheckExternalProcess (TRI_external_id_t pid,
if (result == WAIT_FAILED) {
LOG_WARNING("could not wait for subprocess with PID '%ud'",
external->_pid);
external->_errorMessage =
std::string("could not wait for subprocess with PID '",) +
triagens::basics::StringUtils::itoa(external->_pid) +
std::string("'");
}
}
DWORD exitCode = STILL_ACTIVE;
if (! GetExitCodeProcess(external->_process , &exitCode)) {
LOG_WARNING("exit status could not be determined for PID '%ud'",
external->_pid);
status._errorMessage =
std::string("exit status could not be determined for PID '") +
triagens::basics::StringUtils::itoa(external->_pid) +
std::string("'");
}
else {
if (exitCode == STILL_ACTIVE) {
@ -1058,6 +1106,11 @@ TRI_external_status_t TRI_CheckExternalProcess (TRI_external_id_t pid,
fprintf(stderr, "unexpected process status %d: %d",
(int) external->_status,
(int) external->_exitStatus);
status._errorMessage =
std::string("unexpected process status ") +
triagens::basics::StringUtils::itoa(external->_status) +
std::string(": ") +
triagens::basics::StringUtils::itoa(external->_exitStatus);
}
status._status = external->_status;

1
lib/Basics/process-utils.h
View File

@ -134,6 +134,7 @@ TRI_external_t;
typedef struct TRI_external_status_s {
TRI_external_status_e _status;
int _exitStatus;
std::string _errorMessage;
}
TRI_external_status_t;

11
lib/V8/v8-utils.cpp
View File

@ -3011,7 +3011,10 @@ static v8::Handle<v8::Value> JS_StatusExternal (v8::Arguments const& argv) {
else if (external._status == TRI_EXT_ABORTED) {
result->Set(v8::String::New("signal"), v8::Number::New(external._exitStatus));
}
if (external._errorMessage.length() > 0) {
result->Set(v8::String::New("errorMessage"), v8::String::New(external._errorMessage.c_str(),
external._errorMessage.size()));
}
// return the result
return scope.Close(result);
}
@ -3154,7 +3157,11 @@ static v8::Handle<v8::Value> JS_ExecuteAndWaitExternal (v8::Arguments const& arg
else if (external_status._status == TRI_EXT_ABORTED) {
result->Set(v8::String::New("signal"), v8::Number::New(external_status._exitStatus));
}
if (external_status._errorMessage.length() > 0) {
result->Set(v8::String::New("errorMessage"),
v8::String::New(external_status._errorMessage.c_str(),
external_status._errorMessage.size()));
}
// return the result
return scope.Close(result);
}