1
0
Fork 0
Commit Graph

12366 Commits

Author SHA1 Message Date
Simon Grätzer c985c00d26 Fixing recovery operations 2017-01-14 16:46:18 +01:00
Simon Grätzer 6f5aa8e264 Fixed agency callback 2017-01-13 20:02:12 +01:00
Simon Grätzer 27dcb11af3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-13 15:00:59 +01:00
Simon Grätzer 7b46af7e67 Better logging 2017-01-13 14:41:54 +01:00
Mark bfceb038fa fixed windows compile error 2017-01-12 17:03:01 +01:00
jsteemann c6c070b53b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-12 16:33:11 +01:00
Andreas Streichardt 9e721e77f6 Finally fix the useless "Expecting item" error 2017-01-12 16:26:55 +01:00
jsteemann ce461f347b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-12 15:59:04 +01:00
Andreas Streichardt 81ef303948 Add info about requested startup role
currently it is hard to grasp what startup options exactly are required
to start up arango. for example you can say --agency.size 3 but the
agency will only start if agency.activate is set...same is true for
coordinator,primary mode. So simply output the role during startup
2017-01-12 15:33:13 +01:00
jsteemann ac7d9af48f attempt to validate utf8 sequences in vst 2017-01-12 13:22:19 +01:00
jsteemann feb954ca45 issue #2256 2017-01-12 12:20:11 +01:00
jsteemann 842a07b7c8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-12 11:38:03 +01:00
jsteemann 8e18617e29 simplifications 2017-01-12 11:37:52 +01:00
Jan Christoph Uhde 5921a172fc Merge branch 'obi-async' into devel
* obi-async:
  clean up code
  try to fix a bug in server that surfaced on heavy load
2017-01-12 10:31:32 +01:00
Jan Christoph Uhde d92101d74c clean up code 2017-01-12 10:28:48 +01:00
Michael Hackstein ce4d255669 Removed dead code. Cleaned Compilerror non enterprise 2017-01-11 18:38:34 +01:00
Michael Hackstein 72209cd7aa Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-11 18:01:37 +01:00
Michael Hackstein 1902b571fa Unified restore handler in cluster and local 2017-01-11 18:01:21 +01:00
Andreas Streichardt 4458f04e46 More specific error codes for the cluster 2017-01-11 17:54:45 +01:00
Kaveh Vahedipour fe48bcb982 fixed for short names in frontend shard view 2017-01-11 16:31:19 +01:00
Simon Grätzer ab6163350c Clearer log messages 2017-01-11 16:17:45 +01:00
Jan Christoph Uhde 4858469bfa try to fix a bug in server that surfaced on heavy load 2017-01-11 15:27:53 +01:00
Simon Grätzer 0b5a1f6b70 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-11 14:47:00 +01:00
Simon Grätzer c64f61f3ec Fixing Heartbeat Thread 2017-01-11 14:46:31 +01:00
jsteemann 1a2d31d4cb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-11 13:12:33 +01:00
jsteemann 45be1c94a6 dont readd the same index 2017-01-11 13:12:10 +01:00
jsteemann ac3309ce5d some simplifications 2017-01-11 13:10:42 +01:00
Wilfried Goesgens 071b6c199e remove unused headers 2017-01-11 11:54:15 +01:00
Simon Grätzer d857f01d6a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-11 11:29:54 +01:00
Jan Christoph Uhde 62eda019c2 Revert "switch immediately to async writes when socket would block during write"
This reverts commit 96067a9315.

The change resulted in a stackoverflow instead of a "hanging" connection
we might need to use something like TCP Keep Alive to handle
disconnected clients. The bug we are currently working on might not be
fixed by TCP Keep Alive as we are in a heavy load situation. Still the
socket should not block during write. It could do so if the client does
not receive the data form the network and the server side networkbuffer
runs full at some point. There might be other situations we are not
aware of.
2017-01-11 10:45:18 +01:00
Kaveh Vahedipour 0f3023cfcc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-11 08:58:40 +01:00
Kaveh Vahedipour 169cf88c0b too short timeouts for load situations 2017-01-11 08:58:31 +01:00
jsteemann dec7e084e5 added diagnostic output 2017-01-11 08:25:17 +01:00
Kaveh Vahedipour f34796b432 move resilience should now be correct as a test 2017-01-10 17:30:09 +01:00
Kaveh Vahedipour d30458b011 Supervision should not exit of empty plan collection 2017-01-10 16:53:24 +01:00
Simon Grätzer 9c9d0a6a20 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 16:30:32 +01:00
Simon Grätzer d001199450 Better debugging messages 2017-01-10 16:30:15 +01:00
Kaveh Vahedipour 331d074ebe more information from ClusterInfo's dropCollectionCoordinator 2017-01-10 16:25:00 +01:00
Kaveh Vahedipour 168ed22657 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 16:21:08 +01:00
Kaveh Vahedipour f699117133 more information from ClusterInfo's dropCollectionCoordinator 2017-01-10 16:19:10 +01:00
Michael Hackstein 0365363090 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-10 15:39:12 +01:00
Michael Hackstein fe7a829592 trx crud with empty arrays now short-circuit and return success with empty array. This lead to errors in cluster, band now is consistent with single-server. 2017-01-10 15:15:15 +01:00
Simon Grätzer df462412c5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 14:25:07 +01:00
Mark 8875afc1d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 14:10:30 +01:00
Mark 697962cb6c fixed windows compile errors 2017-01-10 14:10:14 +01:00
Kaveh Vahedipour 90c18e4914 waitFor will report more paranoid 2017-01-10 13:53:31 +01:00
Kaveh Vahedipour 43f7078ded Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 13:51:42 +01:00
Kaveh Vahedipour fffba306a1 waitFor will report more paranoid 2017-01-10 13:51:31 +01:00
Simon Grätzer 790ba7d0f1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 13:49:43 +01:00
Jan Christoph Uhde 96067a9315 switch immediately to async writes when socket would block during write 2017-01-10 13:47:31 +01:00