Merge pull request #24695 from vespa-engine/balder/hold-monitor-on-reload-too

Hold monitor on reload too.

1 files changed, 6 insertions, 4 deletions

diff --git a/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingGenerator.java b/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingGenerator.java
index 6a6b6e0287b..cad69d35b55 100644
--- a/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingGenerator.java
+++ b/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingGenerator.java
@@ -58,7 +58,7 @@ public class RoutingGenerator extends AbstractComponent {
     private final ScheduledExecutorService scheduledExecutor = new ScheduledThreadPoolExecutor(1, new DaemonThreadFactory("routing-generator-maintenance"));
     private final Object monitor = new Object();
 
-    private final AtomicReference<RoutingTable> routingTable = new AtomicReference<>();
+    private volatile RoutingTable routingTable = null;
 
     @Inject
     public RoutingGenerator(ZoneConfig zoneConfig, RoutingStatus routingStatus, Metric metric) {
@@ -82,19 +82,21 @@ public class RoutingGenerator extends AbstractComponent {
 
     /** Get the currently active routing table, if any */
     public Optional<RoutingTable> routingTable() {
-        return Optional.ofNullable(routingTable.get());
+        return Optional.ofNullable(routingTable);
     }
 
     /** Reload the current routing table, if any */
     private void reload() {
-        routingTable().ifPresent(this::load);
+        synchronized (monitor) {
+            routingTable().ifPresent(this::load);
+        }
     }
 
     /** Load the given routing table */
     private void load(RoutingTable newTable) {
         synchronized (monitor) {
             router.load(newTable);
-            routingTable.set(newTable);
+            routingTable = newTable;
         }
     }