diff --git a/packages/geo/geo.cpp b/packages/geo/geo.cpp index 34bc88b97..20f4e6696 100644 --- a/packages/geo/geo.cpp +++ b/packages/geo/geo.cpp @@ -183,12 +183,8 @@ static void configGDAL(void) * which is not supported by a majority of servers (including AWS S3 or Google GCS). * SERIAL means that each range will be requested sequentially. * YES means that each range will be requested in parallel, using HTTP/2 multiplexing or several HTTP connections. - * - * NOTE: if set to YES, multirange reads cause errors when multiple reader threads read their data sets. - * Perfromed tests with 200 reader threads each reading 16MB and on average 14 to 16 readers failed. - * setting it to SERIAL fixed the problem. */ - CPLSetConfigOption("GDAL_HTTP_MULTIRANGE", "SERIAL"); + CPLSetConfigOption("GDAL_HTTP_MULTIRANGE", "YES"); /* * Tells GDAL to merge consecutive range GET requests. @@ -196,7 +192,7 @@ static void configGDAL(void) * Only applies when GDAL_HTTP_MULTIRANGE is YES. * Defines if ranges of a single ReadMultiRange() request that are consecutive should be merged into a single request. */ - CPLSetConfigOption("GDAL_HTTP_MERGE_CONSECUTIVE_RANGES", "NO"); + CPLSetConfigOption("GDAL_HTTP_MERGE_CONSECUTIVE_RANGES", "YES"); /* * When set to YES, this attempts to download multiple range requests in parallel, reusing the same TCP connection. diff --git a/targets/slideruleearth-aws/docker-compose.yml b/targets/slideruleearth-aws/docker-compose.yml index b32a4b729..ff854b91f 100644 --- a/targets/slideruleearth-aws/docker-compose.yml +++ b/targets/slideruleearth-aws/docker-compose.yml @@ -8,6 +8,9 @@ services: entrypoint: /usr/local/bin/sliderule /usr/local/etc/sliderule/server.lua /usr/local/etc/sliderule/config.json stdin_open: true # docker run -i tty: true # docker run -t + ulimits: + nofile: + soft: "8192" volumes: - /etc/ssl/certs:/etc/ssl/certs - /data:/data diff --git a/targets/slideruleearth-aws/terraform/cluster/docker-compose-sliderule.yml b/targets/slideruleearth-aws/terraform/cluster/docker-compose-sliderule.yml index 3fcf0dcd2..d65d7e197 100644 --- a/targets/slideruleearth-aws/terraform/cluster/docker-compose-sliderule.yml +++ b/targets/slideruleearth-aws/terraform/cluster/docker-compose-sliderule.yml @@ -8,6 +8,9 @@ services: entrypoint: /usr/local/bin/sliderule /usr/local/etc/sliderule/server.lua /usr/local/etc/sliderule/config.json stdin_open: true # docker run -i tty: true # docker run -t + ulimits: + nofile: + soft: "8192" volumes: - /etc/ssl/certs:/etc/ssl/certs - /data:/data