diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-08-31 13:17:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-31 13:17:28 +0200 |
commit | 0be069b2eafba58bc9b69fe79b345a062bc4bac0 (patch) | |
tree | b58f10fa05b6f8b20a21451f1565d098b23b72f9 /configserver | |
parent | 861307b411c5fa663181719d8568be1f3d63a2b7 (diff) | |
parent | 5a9181309ecad2de2e3175454a1d7a0bdd2f45b8 (diff) |
Merge pull request #14206 from vespa-engine/hmusum/use-lockAndMaintain
Take lock when running maintainers in bootstrap code
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java index 4e44b9cae33..7a08ef93946 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java @@ -61,8 +61,8 @@ public class ConfigServerMaintenance extends AbstractComponent { } public void runBeforeBootstrap() { - fileDistributionMaintainer.maintain(); - sessionsMaintainer.maintain(); + fileDistributionMaintainer.lockAndMaintain(); + sessionsMaintainer.lockAndMaintain(); } } |