diff options
author | Tor Brede Vekterli <vekterli@oath.com> | 2018-03-08 14:19:32 +0100 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@oath.com> | 2018-03-08 14:19:32 +0100 |
commit | 7ab8b249ff0672348bde4d801f97ef51338211a3 (patch) | |
tree | 9d5961dfd42a4c8600c6178db20f36433a78f095 /clustercontroller-core | |
parent | d35daf66bf580d4fb1d39fe840a9635a4b38bc93 (diff) |
Must use published state from default bucket space, not baseline
Diffstat (limited to 'clustercontroller-core')
-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()); } /** |