Simplify code according to review feedback.

1 files changed, 6 insertions, 8 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
index dffd12677df..b7935cc09ee 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
@@ -788,16 +788,14 @@ void
 AttributeVector::update_config(const Config& cfg)
 {
     commit(true);
-    bool compaction_strategy_changed = (cfg.getCompactionStrategy() != _config.getCompactionStrategy());
-    if (compaction_strategy_changed) {
-        drain_hold(1024 * 1024); // Wait until 1MiB or less on hold
-    }
     _config.setGrowStrategy(cfg.getGrowStrategy());
-    _config.setCompactionStrategy(cfg.getCompactionStrategy());
-    if (compaction_strategy_changed) {
-        commit(); // might trigger compaction
-        drain_hold(1024 * 1024); // Wait until 1MiB or less on hold
+    if (cfg.getCompactionStrategy() == _config.getCompactionStrategy()) {
+        return;
     }
+    drain_hold(1024 * 1024); // Wait until 1MiB or less on hold
+    _config.setCompactionStrategy(cfg.getCompactionStrategy());
+    commit(); // might trigger compaction
+    drain_hold(1024 * 1024); // Wait until 1MiB or less on hold
 }
 
 template bool AttributeVector::append<StringChangeData>(ChangeVectorT< ChangeTemplate<StringChangeData> > &changes, uint32_t , const StringChangeData &, int32_t, bool);