8000 APM-164: Add basic overload control to arangod. by jsteemann · Pull Request #14796 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

APM-164: Add basic overload control to arangod. #14796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Sep 23, 2021
Merged

APM-164: Add basic overload control to arangod. #14796

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6f02ef5
Add basic overload control to arangod.
jsteemann Sep 19, 2021
8540a88
make dequeue time decrease smoother
jsteemann Sep 19, 2021
f29c93a
Merge branch 'devel' of github.com:arangodb/arangodb into feature/APM…
jsteemann Sep 20, 2021
6d37569
fix test
jsteemann Sep 20, 2021
d29aaec
Update CHANGELOG
kvahed Sep 22, 2021
65cac54
Update arangod/GeneralServer/CommTask.cpp
jsteemann Sep 22, 2021
398a40a
Update arangod/GeneralServer/CommTask.cpp
jsteemann Sep 22, 2021
02fe39d
Update tests/js/client/server_parameters/test-return-queue-time-heade…
jsteemann Sep 22, 2021
a83853c
Update tests/js/client/server_parameters/test-return-queue-time-heade…
jsteemann Sep 22, 2021
9bb8a5a
Merge branch 'devel' into feature/APM-164
jsteemann Sep 22, 2021
a6caf93
Update tests/js/client/server_parameters/test-return-queue-time-heade…
jsteemann Sep 22, 2021
133a524
Update tests/js/client/server_parameters/test-return-queue-time-heade…
jsteemann Sep 22, 2021
f05726b
address comments
jsteemann Sep 22, 2021
1d373e9
Merge branch 'devel' into feature/APM-164
jsteemann Sep 22, 2021
44a4444
Merge branch 'devel' into feature/APM-164
jsteemann Sep 23, 2021
fdf8560
Merge branch 'devel' into feature/APM-164
jsteemann Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix test
  • Loading branch information
@jsteemann
jsteemann committed Sep 20, 2021
commit 6d375693d4c1447b76cec0cb3d00830fe7f6a42b
< 8000 span class="sr-only"> 12 changes: 6 additions & 6 deletions tests/js/client/shell/shell-foxx-cors-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ const basePath = fs.makeAbsolute(fs.join(internal.pathForTesting('common'), 'tes
const isVst = (arango.getEndpoint().search('vst') >= 0) || (arango.getEndpoint().search('vpp') >= 0);
const origin = arango.getEndpoint().replace(/\+vpp/, '').replace(/^tcp:/, 'http:').replace(/^ssl:/, 'https:').replace(/^vst:/, 'http:').replace(/^h2:/, 'http:');

const irrelevantHeaders = ['http/1.1', 'connection', 'content-type', 'content-length', 'keep-alive', 'server', 'allow'];
function filterIrelevant(header) {
const irrelevantHeaders = ['http/1.1', 'connection', 'content-type', 'content-length', 'keep-alive', 'server', 'allow', 'x-arango-queue-time-seconds'];
function filterIrrelevant(header) {
return !header.startsWith('x-content-type-options') &&
!header.startsWith('access-control-') &&
!irrelevantHeaders.includes(header);
Expand Down Expand Up @@ -54,11 +54,11 @@ describe('HTTP headers in Foxx services', function () {
const irrelevantHeaders = ['http/1.1', 'connection', 'content-type', 'keep-alive', 'server'];
expect(result.headers['access-control-expose-headers'].
split(', ').
filter(filterIrelevant).
filter(filterIrrelevant).
join(', ')
).to.equal(
Object.keys(result.headers).
filter(filterIrelevant).
filter(filterIrrelevant).
sort().
join(', '));
if (!isVst) {
Expand Down Expand Up @@ -95,11 +95,11 @@ describe('HTTP headers in Foxx services', function () {
var result = arango.POST_RAW("/unittest/headers/header-empty", "", opts);
expect(result.headers['access-control-expose-headers'].
split(', ').
filter(filterIrelevant).
filter(filterIrrelevant).
join(', ')
).to.equal(
Object.keys(result.headers).
filter(filterIrelevant).
filter(filterIrrelevant).
sort().
join(', '));
if (!isVst) {
Expand Down
0