diff --git a/doc/sfschunkserver.cfg.5.adoc b/doc/sfschunkserver.cfg.5.adoc index 32f5eea94..cb0c61b0c 100644 --- a/doc/sfschunkserver.cfg.5.adoc +++ b/doc/sfschunkserver.cfg.5.adoc @@ -137,10 +137,10 @@ in a single write job. If possible, will try to make a single pwrite call *MAX_BLOCKS_PER_HDD_READ_JOB*:: maximum number of blocks read from the device in a single read job. If possible, will try to make a single pread call -(default is 8, minimum is 1) +(default is 16, minimum is 1) *MAX_PARALLEL_HDD_READ_JOBS_PER_CS_ENTRY*:: maximum number of read jobs processed -in parallel per client connection (default is 16) +in parallel per client connection (default is 1) *READ_AHEAD_KB*:: additional number of kilobytes which should be passed to posix_fadvise(POSIX_FADV_WILLNEED) before reading data from a chunk (default is diff --git a/src/admin/dump_config_command.cc b/src/admin/dump_config_command.cc index 0549fbd4b..3021222d0 100644 --- a/src/admin/dump_config_command.cc +++ b/src/admin/dump_config_command.cc @@ -166,8 +166,8 @@ const static std::unordered_map defaultOptionsCS = { {"NR_OF_HDD_WORKERS_PER_NETWORK_WORKER", "16"}, {"BGJOBSCNT_PER_NETWORK_WORKER", "4000"}, {"MAX_BLOCKS_PER_HDD_WRITE_JOB", "16"}, - {"MAX_BLOCKS_PER_HDD_READ_JOB", "8"}, - {"MAX_PARALLEL_HDD_READ_JOBS_PER_CS_ENTRY", "16"}, + {"MAX_BLOCKS_PER_HDD_READ_JOB", "16"}, + {"MAX_PARALLEL_HDD_READ_JOBS_PER_CS_ENTRY", "1"}, {"MAX_READ_BEHIND_KB", "0"}, {"PERFORM_FSYNC", "1"}, {"STAT_CHUNKS_AT_DISK_SCAN", "1"}, diff --git a/src/chunkserver/network_worker_thread.h b/src/chunkserver/network_worker_thread.h index e650d131b..33f909cf7 100644 --- a/src/chunkserver/network_worker_thread.h +++ b/src/chunkserver/network_worker_thread.h @@ -40,8 +40,8 @@ class NetworkWorkerThread { static constexpr uint32_t kDefaultNumberOfHddWorkersPerNetworkWorker = 16; static constexpr uint32_t kDefaultMaxBackgroundJobsPerNetworkWorker = 4000; - static constexpr uint16_t kDefaultMaxParallelHddReadJobsPerCsEntry = 16; - static constexpr uint16_t kDefaultMaxBlocksPerHddReadJob = 8; + static constexpr uint16_t kDefaultMaxParallelHddReadJobsPerCsEntry = 1; + static constexpr uint16_t kDefaultMaxBlocksPerHddReadJob = 16; static constexpr uint16_t kDefaultMaxBlocksPerHddWriteJob = 16; static constexpr uint16_t kMinBlocksPerHddWriteJob = 1; diff --git a/src/data/sfschunkserver.cfg.in b/src/data/sfschunkserver.cfg.in index 9e6f9a3f0..b38f25741 100644 --- a/src/data/sfschunkserver.cfg.in +++ b/src/data/sfschunkserver.cfg.in @@ -156,12 +156,12 @@ # MAX_BLOCKS_PER_HDD_WRITE_JOB = 16 ## Maximum number of blocks read from the device in a single read job. If possible, -## will try to make a single pread call. (Default: 8, Minimum: 1) -# MAX_BLOCKS_PER_HDD_READ_JOB = 8 +## will try to make a single pread call. (Default: 16, Minimum: 1) +# MAX_BLOCKS_PER_HDD_READ_JOB = 16 ## Maximum number of read jobs processed in parallel per client connection. -## (Default: 16) -# MAX_PARALLEL_HDD_READ_JOBS_PER_CS_ENTRY = 16 +## (Default: 1) +# MAX_PARALLEL_HDD_READ_JOBS_PER_CS_ENTRY = 1 ## additional number of kilobytes which should be passed to ## posix_fadvise(POSIX_FADV_WILLNEED) before reading data from a chunk