1
0
Fork 0
Commit Graph

2069 Commits

Author SHA1 Message Date
Frank Celler b48583e68f added request-source (#2599) 2017-06-18 22:56:05 +02:00
jsteemann b334a6132c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-06-09 14:51:20 +02:00
jsteemann ad9fa2bd78 cleanup error codes a bit 2017-06-09 14:50:05 +02:00
Max Neunhoeffer 29921d32a8 Fix behaviour of synchronous replication in dropFollower case.
If we are already in shutdown, we do not drop a follower.
If we cannot drop a follower (no contact to agency), we error out.
2017-06-09 13:06:02 +02:00
Andreas Streichardt 7250ba29ee Disable communicator and abort all requests when shutting down 2017-06-08 11:58:15 +02:00
Andreas Streichardt cb5fc03b60 Fix windows build 2017-06-07 14:50:46 +02:00
jsteemann 3bc320513d micro optimizations 2017-06-07 13:23:37 +02:00
jsteemann f7b56e33c9 honor result of stat() call 2017-06-07 13:21:07 +02:00
Dan Larkin 8c7ba2aaa3 Changed several index/collection APIs to provide better context messages.
Addresses Issue #342.
2017-06-06 12:27:08 -04:00
jsteemann 520a315c23 removed wrong assertion 2017-06-06 15:36:47 +02:00
jsteemann c05421e1aa some small optimizations 2017-06-02 17:34:03 +02:00
Kaveh Vahedipour da0cc3490c Squashed commit of the following:
commit 3d9cf792912db1974b9ac5e00ca2b4c9245b7d34
Author: Kaveh Vahedipour <kaveh@vahedipour.de>
Date:   Fri Jun 2 15:32:43 2017 +0200

    optimise for single writes in agency log

commit 65056ab9026f9b4b211dda0f17c75602b978f2bf
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri Jun 2 15:01:15 2017 +0200

    More tests, taking agency log compaction interval into account.

commit 6600d707784e8fd5b62c0c75fd1826af09b8e13f
Merge: cf46882 02f00cc
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri Jun 2 14:50:38 2017 +0200

    Merge branch 'agency-log-compaction-overhaul' of ssh://github.com/ArangoDB/ArangoDB into agency-log-compaction-overhaul

commit 02f00cc271d027f02b0625afb76745bfa76bf833
Author: Kaveh Vahedipour <kaveh@vahedipour.de>
Date:   Fri Jun 2 14:34:41 2017 +0200

    compaction step and keep size defaults for 3.2

commit 03fc8fbff8f0ac701f7d7f94521c0c3152dd6f92
Author: Kaveh Vahedipour <kaveh@vahedipour.de>
Date:   Fri Jun 2 14:32:46 2017 +0200

    Constituent fatally exists if eletion ballot cannot be persisted

commit cf4688226fc897e74bb2d9ebdfca3ce4578c3b70
Merge: c727fc4 724bd1e
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri Jun 2 13:08:15 2017 +0200

    Merge branch 'agency-log-compaction-overhaul' of ssh://github.com/ArangoDB/ArangoDB into agency-log-compaction-overhaul

commit 724bd1efe19e2e9dbfc14cd819f180816b6d62d0
Author: Kaveh Vahedipour <kaveh@vahedipour.de>
Date:   Fri Jun 2 13:02:51 2017 +0200

    persistence success in agency state is properly evaluated

commit c727fc48bb93e7b135b3ca929c03221c7bcaddb9
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri Jun 2 12:04:55 2017 +0200

    Set default compaction step size in agency to 20000 and 10000 keep size.

commit ded16ae6945e9c1479e99bc2e7ccb4d6feca19a6
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Fri Jun 2 11:11:12 2017 +0200

    Fix help page in startStandAloneAgency.sh for --use-persistence.

commit 13ae9f40f649a8f92eeca4b16bbb5647b540722d
Merge: 834c7c9 aa3e8c1
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu Jun 1 23:41:34 2017 +0200

    Merge remote-tracking branch 'origin/devel' into agency-log-compaction-overhaul

commit 834c7c920d36db3579def66c38fb04870936f8bd
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu Jun 1 16:56:03 2017 +0200

    Handle error in recvAppendEntriesRPC properly.

commit bd9c8d03b76ad25d4078740b5bf994fdba3845d0
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu Jun 1 16:55:35 2017 +0200

    Handle errors in persist() and log() properly.

commit 5b4d2c3d9af078d6a1b5626af20dc9abf2546baa
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu Jun 1 16:25:22 2017 +0200

    Improve error reporting.

commit d60697c5f26d6592eecefc9b9a43e9b699d1773d
Author: Kaveh Vahedipour <kaveh@vahedipour.de>
Date:   Thu Jun 1 12:16:39 2017 +0200

    Agency must not responds to any requests after startup util leader has RAFT commited up to pre shutdown state

commit 92b8ede5fa022ace1596607abcf8fad1130504c8
Merge: 9340e74 d24455c
Author: Kaveh Vahedipour <kaveh@vahedipour.de>
Date:   Wed May 31 16:54:45 2017 +0200

    Merge remote-tracking branch 'origin/devel' into agency-log-compaction-overhaul

commit 9340e7461130a4783c09ad8d91e5a07f9500a045
Merge: 7b7ce9d 63a9d60
Author: Kaveh Vahedipour <kaveh@vahedipour.de>
Date:   Wed May 31 12:13:55 2017 +0200

    agency tests to cover compaction

commit 63a9d604c474eda4302032629dff1f0f69fa0813
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Wed May 31 11:59:11 2017 +0200

    Set agency.compaction-keep-size to at least 0.

commit ef842260968a4769d9502a701b7251da32647e52
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Wed May 31 11:49:34 2017 +0200

    Fix agent size 1 case (thread already gone).

commit 7b7ce9d79f6e8208c13f153b1b9a395b780d6ce1
Merge: 24e2e7e ff306bf
Author: Kaveh Vahedipour <kaveh@vahedipour.de>
Date:   Wed May 31 11:39:58 2017 +0200

    Merge branch 'agency-log-compaction-overhaul' of https://github.com/arangodb/arangodb into agency-log-compaction-overhaul

commit ff306bf547bc4f528c9b66e222271ac143029508
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Wed May 31 11:11:06 2017 +0200

    Move compaction into the future when we take a snapshot from leader.

commit 24e2e7e00f960928a79ce4008b8031d6b9b07fd9
Merge: 84034ac b3ea17a
Author: Kaveh Vahedipour <kaveh@vahedipour.de>
Date:   Wed May 31 11:01:13 2017 +0200

    Merge branch 'agency-log-compaction-overhaul' of https://github.com/arangodb/arangodb into agency-log-compaction-overhaul

commit b3ea17a219baa2abd5892819012fb59f440cdeb8
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Wed May 31 09:42:59 2017 +0200

    Get rid of double nonsense.

commit 035c8d1b34e1b73a381d5468422adf13b2ebc36a
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Wed May 31 09:25:28 2017 +0200

    Sort out Agent::load sequence.

commit 84034ac2809a77145d6b1d23bf44857b3a0c4651
Merge: eb34a2e 3180a9d
Author: Kaveh Vahedipour <kaveh@vahedipour.de>
Date:   Tue May 30 17:07:20 2017 +0200

    merging in

commit eb34a2e64e6ac8dc6571b92cb853c38b7022c833
Author: Kaveh Vahedipour <kaveh@vahedipour.de>
Date:   Tue May 30 16:58:05 2017 +0200

    keep persistence for restarts in standalone agency

commit 3180a9d9ce4a4401a55ef02606b020316d43cbe5
Merge: 5d60524 28b9580
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Tue May 30 16:56:56 2017 +0200

    Merge branch 'agency-log-compaction-overhaul' of ssh://github.com/ArangoDB/ArangoDB into agency-log-compaction-overhaul

commit 5d60524429d8ddda4491beecb931c3b9e3cc1d8a
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Tue May 30 16:56:36 2017 +0200

    Implement snapshot sending in AppendEntriesRCV.

commit 28b958054f51c9cb36706df4e4345aa0f726ed15
Author: Kaveh Vahedipour <kaveh@vahedipour.de>
Date:   Tue May 30 14:20:13 2017 +0200

    state machine should not advance _committed if empty

commit df18f326acea7f5bc2660a37e22f1503952e4b41
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Mon May 29 23:39:47 2017 +0200

    Store term with compaction snapshot, recover again.

commit 2551a48b6fb513c9ea934bce755f8c364dae2f05
Author: Kaveh Vahedipour <kaveh@vahedipour.de>
Date:   Mon May 29 17:45:26 2017 +0200

    indices renamed to closely match RAFT documentation

commit e62dcdecf6e8650cfa5725d91b809d05591b48a4
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Mon May 29 16:37:43 2017 +0200

    More cleanup.

commit 9f4787c46621375f0361138a8961431eb21ce5c0
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Mon May 29 14:50:25 2017 +0200

    Revise loadLastCompactedSnapshot to return 0 without a snapshot.

commit 13285e1d70c8a4ac8c79a08de6f8fbc0f8d242bf
Merge: 3393c43 6c5f23e
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Mon May 29 12:06:20 2017 +0200

    Merge branch 'agency-log-compaction-overhaul' of ssh://github.com/ArangoDB/ArangoDB into agency-log-compaction-overhaul

commit 3393c43c75520c74d20df09c74fbbbd8b1af5976
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Mon May 29 12:03:47 2017 +0200

    More cleanup around Store::apply and friends.

commit 4ccb41d1839748c98e11403fa04f6a7d6af5e95b
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Mon May 29 09:45:41 2017 +0200

    Document apply methods in Store with comments.

commit ea05c4880fedb6fe535e24761ac5cb3c26ccfc20
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Mon May 29 09:45:18 2017 +0200

    Intentionally keep one log entry more to prevent empty log.

commit 67fb62f2259cc3c6368319917c7257ebcc177d3f
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Mon May 29 09:44:42 2017 +0200

    Improve plausibility checks at compaction time.

commit 0bafc368785b15a94f8783c4c929f4208f87d09c
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 25 00:51:51 2017 +0200

    Sort out (re-)building of agency K/V store(s) from compaction snapshots.

    This is in case of (re-)start, becoming a leader and when serving
    /_api/agency/store.

commit 46b0750bc6c597ec388aac0cdca32082c0cc54b8
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 25 00:50:54 2017 +0200

    Set compaction interval to 200 and keep to 0.

    This is way to small but tests should run with it.
    Will later increase numbers again.

commit 024dc0846ae30248b464dd481a8bbc1134f56983
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Wed May 24 23:29:57 2017 +0200

    Add a trivial test for agency log compaction.

commit e12fd3b46833419d7b436eeadd7246304324b891
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Wed May 24 23:26:03 2017 +0200

    First part of cleanup of agency log compaction.

    Now the right compaction snapshots are taken and persisted.
    Furthermore, the right log entries and old snapshots are removed
    after compaction, both the volatile and the persisted ones.
    The readDB and spearHead stay unchanged at compaction time as it
    should be.

commit d59901aea0c3ca31ef253299d2adc3353b79e664
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Wed May 24 12:18:26 2017 +0200

    Remove unused member variable.

commit 6c5f23eb7b42d9f20d4dadb2932a63add99f9c76
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Mon May 29 09:45:41 2017 +0200

    Document apply methods in Store with comments.

commit 670899f72d215e0fcc0ca0389cea9250a291e83b
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Mon May 29 09:45:18 2017 +0200

    Intentionally keep one log entry more to prevent empty log.

commit 660f61029917bbc2ce1fae3e4fc903095b023297
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Mon May 29 09:44:42 2017 +0200

    Improve plausibility checks at compaction time.

commit e2802e4b36d1f67d8361c1d8b0c92fbff696f439
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 25 00:51:51 2017 +0200

    Sort out (re-)building of agency K/V store(s) from compaction snapshots.

    This is in case of (re-)start, becoming a leader and when serving
    /_api/agency/store.

commit 12b43f1b91284a1185390d6dcfbd1e838522d392
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Thu May 25 00:50:54 2017 +0200

    Set compaction interval to 200 and keep to 0.

    This is way to small but tests should run with it.
    Will later increase numbers again.

commit c8b9a37a690b8e7e8bfa1276a3f9ba4b6b5a9c27
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Wed May 24 23:29:57 2017 +0200

    Add a trivial test for agency log compaction.

commit cf0c8c1fff666f76411082f87efe685a412ecebb
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Wed May 24 23:26:03 2017 +0200

    First part of cleanup of agency log compaction.

    Now the right compaction snapshots are taken and persisted.
    Furthermore, the right log entries and old snapshots are removed
    after compaction, both the volatile and the persisted ones.
    The readDB and spearHead stay unchanged at compaction time as it
    should be.

commit 0a4255359a57b8686133e6014e2b82b8079f36fa
Author: Max Neunhoeffer <max@arangodb.com>
Date:   Wed May 24 12:18:26 2017 +0200

    Remove unused member variable.
2017-06-02 16:13:03 +02:00
Jan Christoph Uhde e0f608f219 check endianess when storing ints 2017-05-31 10:52:32 +02:00
Jan Christoph Uhde 868966a71a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb: (25 commits)
  Revert "Implement shardorganizer...Cluster with 1 DBServer possible again"
  remove unused variable
  Move FM.listJson into aardvark
  Remove unused legacy FM test
  Implement shardorganizer...Cluster with 1 DBServer possible again
  Make sure the bundle doesn't exist before loading it from db
  More meaningful object logging
  Response -> IncomingResponse
  Updated plain cache to properly count evictions.
  More realistic binary document test
  Simplified Foxx self healing (#2511)
  fix superfluous re-creation attempts for collections
  Made shortest path OOM test deterministic
  added documentation
  sync ENGINE file
  adjusted ui to internal cluster api
  fix usage of su
  Fixing various issues
  Fixing catch test
  fixed vertexId getter
  ...
2017-05-31 09:04:25 +02:00
Jan Christoph Uhde 5872a4c2b1 add functions for endianess conversion 2017-05-31 09:04:07 +02:00
Andreas Streichardt dded5abb6c Merge remote-tracking branch 'origin' into shardorganizer 2017-05-30 20:17:07 +02:00
Alan Plum cceccf59da Simplified Foxx self healing (#2511)
* Implement new self-heal
* Add error codes for 503, service missing/outdated
* Detect changes to service via rev
* Pretty print incoming response object in log
2017-05-30 18:27:32 +02:00
jsteemann 3dab019067 sync ENGINE file 2017-05-30 16:39:30 +02:00
jsteemann 4adbc5ef97 prevent macro redefinition 2017-05-29 17:35:20 +02:00
Frank Celler ee1c60c67a added _binaryDocument and _binaryInsert (#2506) 2017-05-27 22:49:22 +02:00
Frank Celler 4800a8b7f6 Feature/hugepages (#2497)
* enabled checks for memory management

* added MADV_NOHUGEPAGE

* added documentation about NUMA and file systems
2017-05-25 16:04:23 +02:00
Andreas Streichardt b70644440b Do not allow creation of user collection when there are not enough
servers
2017-05-24 18:04:35 +02:00
Andreas Streichardt 360f082087 GetVersion() is deprecated 2017-05-24 10:58:15 +02:00
Wilfried Goesgens 77f1c66a0f enable colors on recent enough windows versions 2017-05-23 18:18:07 +02:00
jsteemann 27a8adf9b8 moved shell colors into their own feature 2017-05-23 16:53:43 +02:00
Wilfried Goesgens 48505fba63 fix calculation of windows paths 2017-05-23 14:04:57 +02:00
Wilfried Goesgens e08c09cbdb fix calculation of windows paths 2017-05-23 13:33:22 +02:00
Wilfried Goesgens c8b6d831ed fix calculation of windows paths 2017-05-23 13:31:20 +02:00
jsteemann bbdb191797 remove unused error code 2017-05-22 13:53:10 +02:00
jsteemann a91c54f6b3 avoid double-copying of shared ptrs 2017-05-22 11:28:18 +02:00
jsteemann 7b924d8f33 pass by const reference to avoid copying 2017-05-22 11:27:55 +02:00
jsteemann 8858b81e2b fixed issue #2490 2017-05-22 09:40:08 +02:00
Andreas Streichardt 9bfb16e4d5 Carrot fix to allow foreground logging on windows 2017-05-19 17:44:24 +02:00
Andreas Streichardt d68aa00ed4 On windows do not allow standard input on external processes without pipes
dfdb test can now be executed on windows
2017-05-19 14:23:33 +02:00
jsteemann adbe81d45d fix adler32 function 2017-05-18 15:40:35 +02:00
jsteemann 61854bb73d adjust error code from lock timeout to conflict 2017-05-18 10:34:41 +02:00
jsteemann 226920d7fa optimizations 2017-05-17 23:41:16 +02:00
Andreas Streichardt b5365c5003 Windows warning 2017-05-17 14:53:58 +02:00
Alan Plum 819a1194ba
Throw correct errors in Foxx management internals 2017-05-17 12:22:16 +02:00
Alan Plum 5d017d733c Improve Foxx cluster resilience (#2479)
* Improve Foxx cluster resilience

Fixes #2083
Fixes #2384
Fixes #2408
Addresses #1892

* Port old Foxx API

* Implement single-file services

* Add console.errorStack/warnStack/infoStack helpers

* Simplify serviceInfo validation

* Extract github/upload logic into Aardvark and old FM API
* Move generator logic into Aardvark
* Move zip/js buffer logic into FM core

* Add Foxxmanager tests

* Send empty response when no README

* Disambiguate script arg format

Historically we allow passing an array of positional arguments or an arbitrary first argument.
This is surprising behaviour, so we should just always treat the value as a first argument.

* Rebuild bundle in development mode

* Nicer HTTP docs formatting

* Create Foxx HTTP docs

* Simplify service upload handling

* Remove inline swagger docs

* Implement public download route

* Consistency

* Rebuild aardvark

* Move bundle route into /_api/foxx/_local

* Rebuild Swagger API docs

* Add changes to CHANGELOG

* More docs
2017-05-16 17:41:29 +02:00
Andreas Streichardt 365de45f07 Add bye bye messages 2017-05-12 17:59:36 +02:00
jsteemann b848030818 enable rocksdb logger 2017-05-12 12:03:54 +02:00
Simon Grätzer c21bd1eeb8 Rocksb: index locking issue 2017-05-11 15:12:05 +02:00
Simon Grätzer f101e21328 Geo index update, renaming 2017-05-11 13:19:51 +02:00
jsteemann 6a12272673 cppcheck 2017-05-10 18:24:34 +02:00
Simon Grätzer d8053a9bcf Fixing fulltext deduplication 2017-05-10 16:17:46 +02:00
jsteemann 488e4be485 preparation for RocksDB logger 2017-05-09 12:42:25 +02:00
jsteemann 1bfc52d800 suppress non-error warnings on shutdown 2017-05-09 12:40:45 +02:00
jsteemann 51b5dbbe57 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-09 10:25:53 +02:00
jsteemann 217d41f6f5 fix shutdown races 2017-05-09 10:24:40 +02:00
jsteemann 7db04133dd move RocksDBLogger code into cpp file 2017-05-08 23:53:04 +02:00
Andreas Streichardt 6ffd2f6da2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-08 20:33:20 +02:00
jsteemann 7577fed6fb added logger 2017-05-08 18:24:40 +02:00
jsteemann 37a6dd2a81 remove unnecessary includes 2017-05-08 15:59:33 +02:00
jsteemann 5e5aa50bb7 remove obsolete comment 2017-05-08 15:57:20 +02:00
jsteemann d47a506bcc slightly improve error messages 2017-05-04 23:17:26 +02:00
Andreas Streichardt f72b0eac05 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-03 23:32:02 +02:00
jsteemann dae15d774c honor unaligned memory access issues 2017-05-03 11:05:51 +02:00
jsteemann e58dddd566 debugging 2017-05-02 17:19:38 +02:00
Kaveh Vahedipour cb2420d7f5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 11:57:28 +02:00
Kaveh Vahedipour c51e144678 ASAN runtime errors 2017-04-28 11:57:20 +02:00
jsteemann 8d5248932b lock unification 2017-04-28 09:12:31 +02:00
Jan Christoph Uhde 5fa2cffc63 fix warning 2017-04-27 15:51:19 +02:00
Jan Christoph Uhde 837763097a fix windows warning 2017-04-27 15:12:30 +02:00
jsteemann 8b7fe79ebb added isLocked() flag for ConditionLocker 2017-04-27 13:01:30 +02:00
Simon Grätzer fa15b43088 Fixed typedefs 2017-04-26 19:27:11 +02:00
Simon Grätzer 29286a9c1b RocksDB WAL entries for transactions 2017-04-26 18:54:55 +02:00
Frank Celler 33fda9275c Merge pull request #2451 from arangodb/feature/ldap-auth
Feature/ldap auth
2017-04-26 14:12:32 +02:00
Simon Grätzer d228a94462 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/Replication/InitialSyncer.cpp
2017-04-26 11:06:09 +02:00
baslr f45a7f07b1 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-26 10:52:50 +02:00
jsteemann 4289105eb3 fix shutdown issue 2017-04-25 16:09:01 +02:00
jsteemann 7344a03623 fix crashes 2017-04-25 15:47:11 +02:00
jsteemann bd5737c5e7 try to fix shutdown issues when collection opening thread is waiting forever for scheduler to finish 2017-04-25 14:20:00 +02:00
baslr 579718ad37 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-25 11:18:07 +02:00
Frank Celler f94df236a3 added 'x-content-type-options: nosniff' to avoid MSIE bug 2017-04-24 18:47:56 +02:00
baslr 9a78fc650b Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-24 15:37:18 +02:00
Kaveh Vahedipour c9c4f6ccef Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-24 15:13:52 +02:00
Kaveh Vahedipour ccc388a940 more dictributeShardsLike code mergedfrom 3.1 2017-04-24 15:13:40 +02:00
Wilfried Goesgens ea3075e817 comment out the windows unhandled exception handler 2017-04-24 15:13:40 +02:00
Kaveh Vahedipour c099c6daa9 more dictributeShardsLike code mergedfrom 3.1 2017-04-24 15:12:38 +02:00
baslr 3d9f58bb70 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-24 12:45:35 +02:00
jsteemann 1df46f8923 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 16:59:32 +02:00
Kaveh Vahedipour 1f81ce28b0 merge in cpp & js from 3.1.18 yet to do tests 2017-04-21 15:41:05 +02:00
jsteemann c5854d050b fix shutdown issue, modernize thread creation a bit 2017-04-19 16:57:53 +02:00
baslr 42ad1a8480 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-19 16:08:14 +02:00
jsteemann bda09ab9bd Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-19 08:34:57 +02:00
jsteemann 5f8d9c4eb8 attempt to fix synchronization 2017-04-18 15:33:56 +02:00
Michael Hackstein 1087065ea5 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
baslr d4ae94f937 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-10 17:14:37 +02:00
Jan Christoph Uhde c82fadc863 prepare limitation of transaction size 2017-04-10 14:00:55 +02:00
Frank Celler 50cfd9883e added missing nullptr check 2017-04-10 09:23:30 +02:00
Wilfried Goesgens 6ab23bd56d better detect cygwin i/o 2017-04-07 14:00:35 +02:00
Wilfried Goesgens 2da0e41466 add detection for cygwin/ssh ttys 2017-04-06 18:57:19 +02:00
Jan Christoph Uhde 60956dc09c fix windows build 2017-04-06 10:17:17 +02:00
Michael Hackstein 039c6fbd16 Moved all logic of lib/Basics/PathFinder into seperated files in arangod/Graph. Preparation to detemplatify this code as we need some arangodb interna in it for Slice mangement 2017-04-05 15:31:44 +02:00
jsteemann 9f330881a2 constify method 2017-04-05 09:00:06 +02:00
jsteemann e0ec315d38 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 13:20:02 +02:00
baslr d18428561d Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-03 13:12:50 +02:00
jsteemann dd9ea4b781 fix parsing for URLs starting with ldap:// 2017-04-03 13:06:31 +02:00
Jan Christoph Uhde 95007fe28e Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api-arango-result
* 'engine-api' of https://github.com/arangodb/arangodb: (46 commits)
  Merged RocksDBPathBasedIndex into RocksDBVPackIndex.
  fix handling of externals
  fix toArray()
  fix returning documents
  Added hash-, skip list, persistent indexes
  harmonize filtering - filter on full filename.
  mini modifications
  standardize starting of servers for replication tests
  Edge index compliant with design doc
  another fix for #2404
  Moved „removeLargeRange“ method to commons
  Added length byte to IndexValue keys.
  fixed issue #2404
  Added drop to primary index
  Added drop() to indexes
  Fixes a coordinator crash in Clustered Traversal. In case of failover during query planning.
  Fixed edge index
  Expand on CORS documentation
  Let ArangoDB handle the allow-credentials header
  make the authentication tests run on directories
  ...
2017-03-30 19:46:17 +02:00
Jan Christoph Uhde 13d83da06f improve arangodb::Result 2017-03-30 14:58:58 +02:00
baslr f669fd4b9e LDAP: more options 2017-03-30 11:03:13 +02:00
Jan Christoph Uhde b83ae2ab82 refactor some code to make use of arangodb::Result 2017-03-30 09:39:21 +02:00
jsteemann 3ff4f15a19 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 17:50:55 +02:00
jsteemann e73417aef1 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 17:50:49 +02:00
Simon Grätzer cd9e9a13cf Path based enumerator 2017-03-29 17:33:02 +02:00
baslr 352ad60589 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-29 15:56:56 +02:00
jsteemann 2a6eade215 added LDAP url parser 2017-03-29 15:34:49 +02:00
baslr 0713099acc Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-29 15:13:24 +02:00
jsteemann bd4a2eb6b6 make @dothebart happier 2017-03-29 15:04:54 +02:00
jsteemann f04f6e7cd4 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 12:53:26 +02:00
Jan Christoph Uhde 408d7cab12 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  fixed serialization bug
  warn before we run out of file descriptors
  updated CHANGELOG
  slightly simplify logging
2017-03-29 11:22:18 +02:00
jsteemann d99945e962 use ReadWriteLockCPP11 instead of ReadWriteLock
ReadWriteLock is now a typedef for ReadWriteLockCPP11
one of the classes will finally be removed when it is known which locking concept is superior
2017-03-29 11:13:50 +02:00
Jan Christoph Uhde 796c32a341 improve error handling in some places 2017-03-29 11:04:04 +02:00
jsteemann bf6e3bddbe fix MSVC warning 2017-03-29 10:11:46 +02:00
jsteemann 383239a14f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 09:17:44 +02:00
jsteemann f728fcdbb8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 02:41:00 +02:00
jsteemann e3ca787992 warn before we run out of file descriptors 2017-03-29 02:35:46 +02:00
jsteemann f8a01fae54 comments 2017-03-29 01:06:47 +02:00
baslr 7f92c26774 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-29 00:29:16 +02:00
jsteemann e1aef394d8 delete useless DEV_TIMERS, fix rwlockcpp11 2017-03-28 22:38:27 +02:00
mpv1989 4b8c880486 added OPTIONS to cors methods header 2017-03-28 16:18:53 +02:00
Simon Grätzer 1a50029592 Edge Index work 2017-03-28 00:55:59 +02:00
Dan Larkin fcb3c2f91e Added method to convert RocksDB Status to ArangoDB Result. 2017-03-24 13:19:34 -04:00
jsteemann 2aa2fd65a4 more startup 2017-03-24 14:20:51 +01:00
baslr fef40e3c9d merge with devel 2017-03-24 12:07:29 +01:00
baslr e78da3d85f LDAP: added additional errors 2017-03-23 23:51:48 +01:00
jsteemann 2eeccd5f09 small simplifications for error handling 2017-03-23 21:18:53 +01:00
jsteemann 02c0dcc689 properly report error locations 2017-03-23 20:18:33 +01:00
jsteemann b87cc95038 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-23 19:42:10 +01:00
jsteemann 8e4e463239 don't call throwing functions in dtor 2017-03-23 19:40:13 +01:00
jsteemann 45da5ffe9c more diagnostic output for "not implemented" 2017-03-23 14:10:00 +01:00
baslr 8c2b951884 LDAP: additional error codes 2017-03-23 01:26:51 +01:00
baslr f593561438 introduce LDAP errors 2017-03-20 16:14:29 +01:00
baslr 90341c5efb Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-18 04:14:39 +01:00
baslr bc14d53ff5 ldap authwork 2017-03-18 04:14:15 +01:00
jsteemann fa26d8ca6c this time fix the leak properly 2017-03-17 14:45:55 +01:00
jsteemann 650d1afad5 fix leaks during cleanup 2017-03-17 13:38:23 +01:00
jsteemann e3d8ae142e some fixes for view handling 2017-03-17 11:18:46 +01:00
jsteemann 67c1770f3e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 09:29:03 +01:00
jsteemann 8a69f5716f show collection load time in slow queries 2017-03-17 09:28:53 +01:00
Simon Grätzer 3f29cf356b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-16 17:03:45 +01:00
Simon Grätzer 70401fe5db Fixed JS_KillExternal 2017-03-16 17:03:29 +01:00
jsteemann a87b8c4f25 generalize usleep argument 2017-03-16 16:27:40 +01:00
Simon Grätzer 876bbb98f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-13 23:27:11 +01:00
jsteemann 894a558367 try to un-mess windows build 2017-03-13 17:28:46 +01:00
Simon Grätzer 7b35f75b23 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/GeneralServer/GeneralServerFeature.cpp
2017-03-13 12:25:28 +01:00
jsteemann 94e1a92f6f added comment 2017-03-09 16:32:27 +01:00
jsteemann 537757d9a3 added EnumIterator 2017-03-08 23:40:57 +01:00
Simon Grätzer 67066c64ad Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-08 18:20:44 +01:00