diff options
2 files changed, 6 insertions, 11 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AnnotatedClusterState.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AnnotatedClusterState.java index 7654f9bc5a4..a7602bbfd41 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AnnotatedClusterState.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AnnotatedClusterState.java @@ -44,11 +44,10 @@ public class AnnotatedClusterState implements Cloneable { public AnnotatedClusterState(ClusterState clusterState, Optional<ClusterStateReason> clusterStateReason, - Map<Node, NodeStateReason> nodeStateReasons) - { - this.clusterState = clusterState; - this.clusterStateReason = clusterStateReason; - this.nodeStateReasons = nodeStateReasons; + Map<Node, NodeStateReason> nodeStateReasons) { + this.clusterState = Objects.requireNonNull(clusterState, "Cluster state cannot be null"); + this.clusterStateReason = Objects.requireNonNull(clusterStateReason, "Cluster state reason cannot be null"); + this.nodeStateReasons = Objects.requireNonNull(nodeStateReasons, "Node state reasons cannot be null"); } public static AnnotatedClusterState emptyState() { 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 5f2a6daf39e..6876ac8cf56 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 @@ -207,15 +207,11 @@ public class FleetController implements NodeListener, SlobrokListener, SystemSta public void addSystemStateListener(SystemStateListener listener) { systemStateListeners.add(listener); // Always give cluster state listeners the current state, in case acceptable state has come before listener is registered. - com.yahoo.vdslib.state.ClusterState state = getSystemState(); - if (state == null) { - throw new NullPointerException("Cluster state should never be null at this point"); - } + var state = getSystemState(); listener.handleNewPublishedState(ClusterStateBundle.ofBaselineOnly(AnnotatedClusterState.withoutAnnotations(state))); ClusterStateBundle convergedState = systemStateBroadcaster.getLastClusterStateBundleConverged(); - if (convergedState != null) { + if (convergedState != null) listener.handleStateConvergedInCluster(convergedState); - } } public FleetControllerOptions getOptions() { |