1
0
Fork 0
Commit Graph

302 Commits

Author SHA1 Message Date
Jan Steemann d7f35bcc7b fixed datafile ticks issues 2014-06-13 14:46:21 +02:00
Jan Steemann d5e695e63f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/ArangoServer.h
	arangod/VocBase/server.cpp
	js/common/bootstrap/errors.js
2014-06-13 02:23:03 +02:00
Jan Steemann 41dc6a808e fixed recovery 2014-06-13 00:20:24 +02:00
Jan Steemann bc52f3408f recovery, not functional yet 2014-06-12 18:13:48 +02:00
Jan Steemann dae5a5151d call (still empty) WAL recovery procedure at startup 2014-06-12 11:28:48 +02:00
Frank Celler 299b99ed00 fixed check-version for empty directory 2014-06-11 19:30:12 +02:00
Jan Steemann cc115a2766 removed outdated upgrade methods 2014-06-11 17:38:49 +02:00
Jan Steemann 9535779916 removed lol message 2014-06-11 15:52:58 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +02:00
Jan Steemann ad1feb0ed4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-04 14:30:28 +02:00
Frank Celler eda4b0cde4 fixed dfdb 2014-06-04 11:02:42 +02:00
Jan Steemann 399a843e23 use and release databases and collections during collection 2014-06-03 17:17:41 +02:00
Jan Steemann 2c934cf1aa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
2014-06-02 09:52:05 +02:00
Frank Celler 8db4667755 cleanup of version-check, added option check-version 2014-06-01 13:37:21 +02:00
Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/VocBase/document-collection.h
2014-05-30 12:51:20 +02:00
Frank Celler c8ddff2a9b fixed shutdown for busy V8 contexts 2014-05-30 11:39:11 +02:00
Jan Steemann 06a56a7d36 removed MRuby for arangod 2014-05-21 18:11:59 +02:00
Max Neunhoeffer ff1dfdd55f Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Max Neunhoeffer 69353334eb Get rid of TRI_ENABLE_CLUSTER everywhere. 2014-05-21 14:46:47 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Jan Steemann 027ec2d3f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/V8Server/V8PeriodicTask.cpp
	arangod/V8Server/V8PeriodicTask.h
	arangod/V8Server/v8-actions.cpp
	js/common/bootstrap/module-internal.js
	js/server/server.js
	lib/Dispatcher/ApplicationDispatcher.cpp
	lib/Dispatcher/RequeueTask.cpp
	lib/GeneralServer/GeneralListenTask.h
	lib/Scheduler/ApplicationScheduler.cpp
	lib/Scheduler/PeriodicTask.cpp
	lib/Scheduler/Scheduler.cpp
	lib/Scheduler/Scheduler.h
	lib/Scheduler/Task.cpp
	lib/Scheduler/Task.h
	lib/Scheduler/TimerTask.cpp
	lib/Scheduler/TimerTask.h
2014-05-12 16:49:20 +02:00
Jan Steemann a991f0d581 disable turning down scheduler in test mode 2014-05-12 09:29:39 +02:00
Jan Steemann b6bbbd031b halt on test failure 2014-04-23 19:07:23 +02:00
Frank Celler 6cdfa029c9 added more error information, fixed try catch
Conflicts:
	CHANGELOG
	arangod/V8Server/ApplicationV8.cpp
2014-04-21 13:35:06 +02:00
Frank Celler 8e9ad58f3b added cancelation of asnyc jobs
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Rest/Handler.h
2014-04-16 20:16:22 +02:00
Jan Steemann 86398d7cde insert standalone marker 2014-04-11 13:01:00 +02:00
Jan Steemann 55f0dc5739 logfile opening/closing fixes 2014-03-28 16:45:06 +01:00
Jan Steemann e2f1d0dfb6 fixed issues in arango-dfdb 2014-03-27 12:29:32 +01:00
Jan Steemann 4ddaa74f74 logfile manager 2014-03-26 17:16:49 +01:00
Jan Steemann 92f87c1421 updated logfile manager 2014-03-25 18:21:31 +01:00
Jan Steemann 29b7250b40 initial addition for WAL 2014-03-18 17:13:11 +01:00
Max Neunhoeffer c5595799a7 Revert "Even more debug output."
This reverts commit fdc834b07f083311377a33741e6af57507fcd5fc.
2014-03-14 23:09:18 +01:00
Max Neunhoeffer f4e733bc75 Revert "Yet again more debugging output."
This reverts commit 7ecec48675c7f905024f239156d8124d27f1974f.
2014-03-14 23:09:08 +01:00
Max Neunhoeffer bf7302f245 Yet again more debugging output. 2014-03-14 11:37:50 +01:00
Max Neunhoeffer dda787ba62 Even more debug output. 2014-03-14 11:01:24 +01:00
Jan Steemann 9da8d0ddfe allow startup options `temp-path` and `default-language` to be specified from the command-line and not only from config files 2014-03-12 12:12:58 +01:00
Jan Steemann 7df402d1cd removed command line option `--database.remove-on-drop` 2014-03-10 17:03:17 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Frank Celler 9a410a5b71 added config for server state 2014-02-28 12:02:21 +01:00
Frank Celler 3afa2214f7 added disable-cluster-dispatcher 2014-02-27 11:47:26 +01:00
Frank Celler f2121ff442 cleanup 2014-02-25 15:32:07 +01:00
Frank Celler 569778ae10 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 12:07:46 +01:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +01:00
Jan Steemann 018a8390ce refactored create/drop database 2014-02-24 14:50:31 +01:00
Jan Steemann 7a0aac82e2 re-create database objects on coordinator now, and switch into them 2014-02-21 17:40:00 +01:00
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
2014-02-20 21:02:07 +01:00
Frank Celler 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Jan Steemann 4770fed362 removed dead code 2014-02-19 15:35:52 +01:00
Max Neunhoeffer 98ed29ab84 Make check for useDatabase switchable for unittests. 2014-02-14 15:33:35 +01:00
Frank Celler 739900fc2f try to force abort 2014-02-13 12:06:52 +01:00