1
0
Fork 0
Commit Graph

44511 Commits

Author SHA1 Message Date
Heiko bc609af868
Merge branch '3.4' into bug-fix-3.4/fix-internal-issue-4451 2019-12-02 15:34:11 +01:00
Wilfried Goesgens 4ad2ff1f75 Bug fix 3.4/cleanup view (#10590)
* cleanup after test

* Update upgrade-data-views-msv3.2.1.js

* Update upgrade-data-views-msv3.2.1.js

* Update upgrade-data-views-msv3.2.1.js
2019-11-29 14:14:23 +01:00
KVS85 a59b240e63 Updated arangosync to 0.7.1 2019-11-28 22:37:19 +01:00
Heiko db0fcbd05b Bug fix 3.4/issue 10470 (#10498)
* fixing issue #10470

* changelog
2019-11-27 16:37:44 +01:00
hkernbach e0ffabf490 changed the order of index creation during restore for _users collection 2019-11-26 11:44:11 +01:00
hkernbach c903bc1e3a merge 3.4 into feature branch 2019-11-26 11:39:30 +01:00
KVS85 195c7de5e5
Updated arangosync to 0.7.0 (#10535) 2019-11-26 10:41:25 +01:00
Jan Christoph Uhde 06cb81be3d Bug fix 3.4/little weekend fix (#10526)
* create arena before using it

* try to avoid oom situation
2019-11-26 10:13:52 +01:00
hkernbach 67ddb787f2 changelog 2019-11-25 16:35:08 +01:00
hkernbach fd91f44869 fixed foxx restore test 2019-11-25 16:33:35 +01:00
hkernbach d7c51d9063 properly reload user permissions after _users collection restore 2019-11-25 16:33:23 +01:00
hkernbach 6ec0a7ff67 user the correct attribute name 2019-11-25 16:33:08 +01:00
KVS85 883f02163d Fix dump_authentication suite 2019-11-22 11:36:41 +01:00
Max Neunhöffer c4a4f6154d Fix vst network traffic accounting. (#10324) 2019-11-20 20:06:40 +03:00
Jan 9b5d75071d make replication timeouts configurable via startup options (#10472)
* make replication timeouts configurable via startup options

The following options are available (for active failover
and master-slave replication):

    --replication.connect-timeout
    --replication.request-timeout

Values can be specified in seconds. If these options are used, they will
be used for replication requests, overriding any hard-coded defaults or
explicitly configured timeouts.

Additionally, this change increases the default request timeout
for replication from 10 minutes to 20 minutes.

* do *not* change timeouts

* make tests work again
2019-11-19 19:45:40 +03:00
Lars Maier d2d0c2c5da Store a removed server with date in the agency. (#10361) 2019-11-06 15:40:04 +03:00
Dronplane e670249d8c Fix ArangoSearch consolidation results commit (3.4 backport) (#10369)
* Fix ported from upstream

* Update CHANGELOG
2019-11-06 15:36:06 +03:00
KVS85 3810a3e2b1
Enable OpenSSL strict version to separate ArangoDB and build it in oskar (Windows) (#10327) 2019-10-29 08:42:43 +03:00
Frank Celler 2206f62bfd make ccache optional (#10310) 2019-10-24 11:50:39 +02:00
Jan 69747bc86f Bug fix 3.4/disallow subqueries in prune (#10266)
* backport of #10231

* added derived files
2019-10-16 19:19:57 +03:00
Heiko ae508c71ba Bug fix 3.4/eslint proper settings (#10249)
* several eslint settings

* disable some rules

* sort order
2019-10-16 13:53:05 +03:00
KVS85 fee2a05d16
Back to old CMake requirement 2019-10-15 14:34:59 +03:00
KVS85 29679b14af
Increase required CMake version to 3.10 2019-10-15 13:14:35 +03:00
Heiko 72a21487b6 Bug fix 3.4/aardvark document search (#10228)
* Quickfix: map ace searchbox ext path to file

* changelog

* changelog
2019-10-11 17:41:21 +03:00
Iurii Popov 3e7879600d Bug fix 3.4/issue #10090 (#10211)
* Fixed repeatable seek to the same document (#10164)

* Fixed repeatable seek to the same document

* Fix. Multiple conjuncts in conjunction.

* Add tests for issue #10090 (#10203)

* Add tests for issue #10090

* Remove spaces

* Added CHANGELOG for the issue #10090.

* Fixed doc_limits error

* Fixed approx_ error
2019-10-10 18:27:49 +03:00
Wilfried Goesgens 629f1f9695 Fix windows path handling not to slip into UNC lookup (#10073) (#10085)
* Fix windows path handling not to slip into UNC lookup (#10073)

* make sure that we don't get more than one leading directory separator in front of the path, so windows doesn't mistakenly look it up as a UNC.

* make sure we don't build paths that start with two \'s

* fix condition
2019-10-09 18:37:21 +03:00
Wilfried Goesgens b8995c080f Bug fix 3.4/dont scan recursive for whether dir empty (#10205)
* don't scan the specified directory recursively to find out whether its empty, only look at all files directly in it.

* Update arangosh/Utils/ManagedDirectory.cpp

Co-Authored-By: Jan <jsteemann@users.noreply.github.com>

* implement review
2019-10-09 18:25:48 +03:00
Jan 6bbcb1c934 fixed issue #10193 (#10196) 2019-10-09 16:39:57 +03:00
Jan b4e56f4285 Bug fix 3.4/fix parsing unterminated strings (#10157)
* fix parsing of unterminated string literals

* added CHANGELOG entry

* added generated file
2019-10-09 16:35:29 +03:00
Max Neunhöffer 95ae2eeb11 Port latest shutdown hanger bug to 3.4. (#10122) 2019-10-09 16:34:16 +03:00
Jan 4477bd1ed1 Bug fix 3.4/issue 10078 (#10083)
* fixed issue #10078: FULLTEXT with sort on same field not working

* added test

* simplify the implementation
2019-09-27 16:59:42 +03:00
Jan e502feeea6 fixed issue #10062: AQL: Could not extract custom attribute (#10066) 2019-09-27 16:58:58 +03:00
Tobias Gödderz 45e28ec5f2 Removed erroneous noexcept specifier (#10060) 2019-09-23 13:46:43 +03:00
Heiko c989fcfc8a fixed ui behaviour when replacing a foxx app (#9877)
* release version 3.4.8

* [3.4] fix agency lockup when removing 404-ed callbacks (#9839)

* fixed ui behaviour when replacing a foxx app

* Bug fix/curb aardvark foxx cthulhu (#9867)

* Revert "fixed ui behaviour when replacing a foxx app"

This reverts commit 6092465e05d11c10e83e3424945d8bf9e8f3ddaa.

* Cleanup on aisle 3

* Typo

* Fixed param order

* Cleanup flags

* Actually use the queryParams

* currently not supported via grunt env

* changelog

* removed not needed view

* fixed wrong used function
2019-09-20 16:21:56 +03:00
Dan Larkin-York 8f9ebce0e0 [3.4] Fix issue with cache allocation statistics. (#10030)
* Fix issue with cache allocation statistics.

* updated CHANGELOG
2019-09-20 16:20:20 +03:00
Max Neunhöffer 59544d5b83 Add more strong references to pthread stuff. (#10046)
* Add more strong references to pthread stuff.
* Circumvent libgcc/libmusl mistake in multi-threaded detection.
2019-09-20 12:40:53 +03:00
Lars Maier e51bc5ca52 [3.4] Background Get Ids (#9785)
* Obtain new unique IDs via a background thread.

* Updated changelog.
2019-09-19 22:33:02 +03:00
Tobias Gödderz dc2e27db6c [3.4] Feature/rebootid notice changes, backport of #9523 (#9685)
* Feature/rebootid notice changes, backport of #9523

* Move to 3.4 and C++11-compatible code (except for test code)

* Backported tests/Mocks/Servers.{h,cpp}

* Rebuilt errorfiles

* Ported CallbackGuardTest from gtest to catch

* Ported RebootTrackerTest from gtest to catch

* Make sure the state method is called, so the overridden method is used during tests

* Fixed test to work with the old scheduler

* release version 3.4.8

* [3.4] fix agency lockup when removing 404-ed callbacks (#9839)

* Update arangod/Cluster/ServerState.cpp

Co-Authored-By: Markus Pfeiffer <markuspf@users.noreply.github.com>

* Instantiate the scheduler during ::prepare()

* Fix test crash introduced during backport

* Fix a compile error on Windows (thanks, V8)
2019-09-19 15:03:39 +03:00
KVS85 31e4f9d1dc Comment for PR9839 2019-09-19 12:31:31 +02:00
Max Neunhöffer d0d4d8d815 Fix a shutdown hanger because of a collection status lock. (#10034)
* Fix a shutdown hanger because of a collection status lock.

* Fix compilation.

* Fix logic.

* CHANGELOG:
2019-09-19 11:54:25 +03:00
Tobias Gödderz 78fad805b5 [3.4] Bug fix 3.4/allow agency ops in active failover (#9960)
* Backported #9881

* Fixed changelog

* Fixed merge
2019-09-19 11:45:49 +03:00
Max Neunhöffer 59a90f28c0 Fix a shutdown busy loop after main if two exceptions collide. (#9984) 2019-09-13 13:27:54 +03:00
KVS85 227a92dd3a
Fix jslint 2019-09-12 22:27:35 +03:00
KVS85 3b8b727d0e Add more stability to moving-shards-cluster.js 2019-09-12 18:34:08 +02:00
Frank Celler d1de4e9d28 fixed wrong defines 2019-09-12 14:51:33 +02:00
KVS85 0000a2d459 Revert "Let the server honour the keep alive timeout (#9477)"
This reverts commit 80c75af552.
2019-09-11 19:25:14 +02:00
sleto-it c1586af6a0 Changelog 3.4.8 (#9988)
* Update CHANGELOG

* Update CHANGELOG
2019-09-11 19:41:35 +03:00
Simon 80c75af552 Let the server honour the keep alive timeout (#9477)
* Fix keep alive timeout

* add changelog

* Update CHANGELOG

Co-Authored-By: Jan <jsteemann@users.noreply.github.com>
2019-09-11 13:05:14 +03:00
Jan 36614efb52 * Harden database creation against spurious "duplicate name" errors (#9949)
that were caused by other parallel operations lazily creating required
system collections in the same database.
2019-09-11 13:03:16 +03:00
KVS85 2f2c54826c
Update CHANGELOG 2019-09-11 13:02:07 +03:00