diff options
| author | Tor Egge <Tor.Egge@online.no> | 2023-02-09 16:33:24 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2023-02-09 16:33:24 +0100 |
| commit | 373440ccfc44d9df2c6bd22b9bcff7b8a3dbc32b (patch) | |
| tree | c4203c967d868e5092c4a82ef845f046a244ccf7 /searchcore | |
| parent | 01bfad746b4284dfb929158d1282e2fb5dcc03f0 (diff) | |
Report config as not saved during replay.
Diffstat (limited to 'searchcore')
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/documentdb.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp index ac5efb37e21..7d63b2f4c5e 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp @@ -458,8 +458,9 @@ DocumentDB::applyConfig(DocumentDBConfig::SP configSnapshot, SerialNum serialNum auto replay_config = DocumentDBConfig::makeReplayConfig(configSnapshot); bool equalReplayConfig = (*replay_config == *DocumentDBConfig::makeReplayConfig(_activeConfigSnapshot)); bool tlsReplayDone = _feedHandler->getTransactionLogReplayDone(); + bool save_config = !equalReplayConfig && tlsReplayDone; FeedHandler::CommitResult commit_result; - if (!equalReplayConfig && tlsReplayDone) { + if (save_config) { sync(_feedHandler->getSerialNum()); serialNum = _feedHandler->inc_serial_num(); _config_store->saveConfig(*replay_config, serialNum); @@ -469,8 +470,8 @@ DocumentDB::applyConfig(DocumentDBConfig::SP configSnapshot, SerialNum serialNum commit_result = _feedHandler->storeOperationSync(op); sync(op.getSerialNum()); } - bool elidedConfigSave = equalReplayConfig && tlsReplayDone; { + bool elidedConfigSave = equalReplayConfig && tlsReplayDone; forceCommitAndWait(*_feedView.get(), elidedConfigSave ? serialNum : serialNum - 1, std::move(commit_result)); } _subDBs.complete_prepare_reconfig(*prepared_reconfig, serialNum); @@ -519,7 +520,7 @@ DocumentDB::applyConfig(DocumentDBConfig::SP configSnapshot, SerialNum serialNum auto end_time = vespalib::steady_clock::now(); auto state_string = DDBState::getStateString(_state.getState()); auto config_state_string = DDBState::getConfigStateString(_state.getConfigState()); - vespalib::string saved_string(elidedConfigSave ? "no" : "yes"); + vespalib::string saved_string(save_config ? "yes" : "no"); LOG(info, "DocumentDB(%s): Applied config, state=%s, config_state=%s, saved=%s, serialNum=%" PRIu64 ", %.3fs of %.3fs in write thread", _docTypeName.toString().c_str(), state_string.c_str(), |