From 4b5249dc5eba9288545e50c930026cc99c3b9aa4 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Mon, 29 Aug 2016 09:34:23 +0200 Subject: [PATCH 1/2] issue #2022: double max allowed request body size, cap --batch-size value in arangoimp --- arangod/GeneralServer/HttpCommTask.cpp | 6 +++--- arangosh/Import/ImportFeature.cpp | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/arangod/GeneralServer/HttpCommTask.cpp b/arangod/GeneralServer/HttpCommTask.cpp index 0e37faa2bc..9546236694 100644 --- a/arangod/GeneralServer/HttpCommTask.cpp +++ b/arangod/GeneralServer/HttpCommTask.cpp @@ -47,9 +47,9 @@ class HttpResponse; namespace rest { class GeneralServer; -size_t const HttpCommTask::MaximalHeaderSize = 1 * 1024 * 1024; // 1 MB -size_t const HttpCommTask::MaximalBodySize = 512 * 1024 * 1024; // 512 MB -size_t const HttpCommTask::MaximalPipelineSize = 512 * 1024 * 1024; // 512 MB +size_t const HttpCommTask::MaximalHeaderSize = 2 * 1024 * 1024; // 1 MB +size_t const HttpCommTask::MaximalBodySize = 1024 * 1024 * 1024; // 1024 MB +size_t const HttpCommTask::MaximalPipelineSize = 1024 * 1024 * 1024; // 512 MB size_t const HttpCommTask::RunCompactEvery = 500; HttpCommTask::HttpCommTask(GeneralServer* server, TRI_socket_t sock, diff --git a/arangosh/Import/ImportFeature.cpp b/arangosh/Import/ImportFeature.cpp index 5ce571a610..b1fb92ef79 100644 --- a/arangosh/Import/ImportFeature.cpp +++ b/arangosh/Import/ImportFeature.cpp @@ -161,6 +161,16 @@ void ImportFeature::validateOptions( StringUtils::join(positionals, ", "); FATAL_ERROR_EXIT(); } + + static unsigned const MaxBatchSize = 768 * 1024 * 1024; + + if (_chunkSize > MaxBatchSize) { + // it's not sensible to raise the batch size beyond this value + // because the server has a built-in limit for the batch size too + // and will reject bigger HTTP request bodies + LOG(WARN) << "capping --batch-size value to " << MaxBatchSize; + _chunkSize = MaxBatchSize; + } } void ImportFeature::start() { From 524492c75d7ec00b957e36851e0756e01bf6eb27 Mon Sep 17 00:00:00 2001 From: jsteemann Date: Mon, 29 Aug 2016 11:12:14 +0200 Subject: [PATCH 2/2] fixed cluster start --- scripts/startLocalCluster.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/startLocalCluster.sh b/scripts/startLocalCluster.sh index d0924bc501..fe83e3ed53 100755 --- a/scripts/startLocalCluster.sh +++ b/scripts/startLocalCluster.sh @@ -96,6 +96,7 @@ start() { PORT=$2 mkdir cluster/data$PORT echo Starting $TYPE on port $PORT + mkdir -p cluster/apps$PORT build/bin/arangod -c none \ --database.directory cluster/data$PORT \ --cluster.agency-endpoint tcp://127.0.0.1:$BASE \