diff options
| -rw-r--r-- | clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java index 9f570cc0d20..2edebd17700 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java @@ -825,7 +825,13 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd private ClusterStateDeriver createBucketSpaceStateDeriver() { return new MaintenanceWhenPendingGlobalMerges(stateVersionTracker.createMergePendingChecker(), - UpEdgeMaintenanceTransitionConstraint.forPreviouslyPublishedState(stateVersionTracker.getVersionedClusterState())); + createDefaultSpaceMaintenanceTransitionConstraint()); + } + + private MaintenanceTransitionConstraint createDefaultSpaceMaintenanceTransitionConstraint() { + AnnotatedClusterState currentDefaultSpaceState = stateVersionTracker.getVersionedClusterStateBundle() + .getDerivedBucketSpaceStates().getOrDefault(FixedBucketSpaces.defaultSpace(), AnnotatedClusterState.emptyState()); + return UpEdgeMaintenanceTransitionConstraint.forPreviouslyPublishedState(currentDefaultSpaceState.getClusterState()); } /** |