aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-07-06 10:14:27 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-07-06 10:14:27 +0000
commit2b04adf600a97aed3272ef31cbc442426b665879 (patch)
tree2a72a6c48b7e264895f43735fabc063db3c06aa1
parenta1e9de08322c03f79191d84df1586eac45c8d6b5 (diff)
Do not access object has been moved away.
-rw-r--r--build_settings.cmake2
-rw-r--r--configdefinitions/src/vespa/stor-filestor.def4
-rw-r--r--storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/build_settings.cmake b/build_settings.cmake
index d7dd26f5ee7..62253022893 100644
--- a/build_settings.cmake
+++ b/build_settings.cmake
@@ -67,7 +67,7 @@ else()
endif()
# C and C++ compiler flags
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -fno-omit-frame-pointer ${C_WARN_OPTS} -fPIC ${VESPA_CXX_ABI_FLAGS} -DXXH_INLINE_ALL -DBOOST_DISABLE_ASSERTS ${VESPA_CPU_ARCH_FLAGS} ${EXTRA_C_FLAGS}")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fno-omit-frame-pointer ${C_WARN_OPTS} -fPIC ${VESPA_CXX_ABI_FLAGS} -DXXH_INLINE_ALL -DBOOST_DISABLE_ASSERTS ${VESPA_CPU_ARCH_FLAGS} ${EXTRA_C_FLAGS}")
# AddressSanitizer/ThreadSanitizer work for both GCC and Clang
if (VESPA_USE_SANITIZER)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${VESPA_USE_SANITIZER}")
diff --git a/configdefinitions/src/vespa/stor-filestor.def b/configdefinitions/src/vespa/stor-filestor.def
index 3274f713623..8ac372c0575 100644
--- a/configdefinitions/src/vespa/stor-filestor.def
+++ b/configdefinitions/src/vespa/stor-filestor.def
@@ -29,10 +29,10 @@ num_threads int default=8 restart
## Number of threads for response processing and delivery
## 0 will give legacy sync behavior.
## Negative number will choose a good number based on # cores.
-num_response_threads int default=2
+num_response_threads int default=2 restart
## Type of sequenced thread executor use for persistence replies.
-response_sequencer_type enum {LATENCY, THROUGHPUT, ADAPTIVE} default=ADAPTIVE
+response_sequencer_type enum {LATENCY, THROUGHPUT, ADAPTIVE} default=ADAPTIVE restart
## When merging, if we find more than this number of documents that exist on all
## of the same copies, send a separate apply bucket diff with these entries
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
index 01185e452bd..65ee78f7642 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
@@ -132,7 +132,7 @@ FileStorManager::configure(std::unique_ptr<vespa::config::content::StorFilestorC
_filestorHandler = std::make_unique<FileStorHandler>(numThreads, numStripes, *this, *_metrics, _partitions, _compReg);
uint32_t numResposeThreads = computeNumResponseThreads(_config->numResponseThreads);
if (numResposeThreads > 0) {
- _sequencedExecutor = vespalib::SequencedTaskExecutor::create(numResposeThreads, 10000, selectSequencer(config->responseSequencerType));
+ _sequencedExecutor = vespalib::SequencedTaskExecutor::create(numResposeThreads, 10000, selectSequencer(_config->responseSequencerType));
}
for (uint32_t i=0; i<_component.getDiskCount(); ++i) {
if (_partitions[i].isUp()) {