diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-11-18 15:48:52 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-11-18 15:48:52 +0100 |
commit | 415ac2a8a2cc2dcc49344ef2756ab61ddb51342f (patch) | |
tree | aa461bc3810d41550246fa24cf40a47487a46671 | |
parent | 03a9910b8a6a60066fcf8dc9ee157ac872e5995c (diff) |
Rename method
2 files changed, 10 insertions, 19 deletions
diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java index 4091363128e..b04f04abfb6 100644 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java +++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java @@ -58,7 +58,7 @@ public class ClusterController extends AbstractComponent if (controller == null) { StatusHandler.ContainerStatusPageServer statusPageServer = new StatusHandler.ContainerStatusPageServer(); - controller = FleetController.createForContainer(options, statusPageServer, metricWrapper); + controller = FleetController.create(options, statusPageServer, metricWrapper); controllers.put(clusterName, controller); status.put(clusterName, statusPageServer); } else { 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 1830bd1efd9..f2ee626b60f 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 @@ -67,7 +67,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd private final DatabaseHandler database; private final MasterElectionHandler masterElectionHandler; private Thread runner = null; - private AtomicBoolean running = new AtomicBoolean(true); + private final AtomicBoolean running = new AtomicBoolean(true); private FleetControllerOptions options; private FleetControllerOptions nextOptions; private final List<SystemStateListener> systemStateListeners = new CopyOnWriteArrayList<>(); @@ -78,12 +78,12 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd private Long controllerThreadId = null; private boolean waitingForCycle = false; - private StatusPageServer.PatternRequestRouter statusRequestRouter = new StatusPageServer.PatternRequestRouter(); + private final StatusPageServer.PatternRequestRouter statusRequestRouter = new StatusPageServer.PatternRequestRouter(); private final List<ClusterStateBundle> newStates = new ArrayList<>(); private final List<ClusterStateBundle> convergedStates = new ArrayList<>(); private long configGeneration = -1; private long nextConfigGeneration = -1; - private Queue<RemoteClusterControllerTask> remoteTasks = new LinkedList<>(); + private final Queue<RemoteClusterControllerTask> remoteTasks = new LinkedList<>(); private final MetricUpdater metricUpdater; private boolean isMaster = false; @@ -91,9 +91,9 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd private long firstAllowedStateBroadcast = Long.MAX_VALUE; private long tickStartTime = Long.MAX_VALUE; - private List<RemoteClusterControllerTask> tasksPendingStateRecompute = new ArrayList<>(); + private final List<RemoteClusterControllerTask> tasksPendingStateRecompute = new ArrayList<>(); // Invariant: queued task versions are monotonically increasing with queue position - private Queue<VersionDependentTaskCompletion> taskCompletionQueue = new ArrayDeque<>(); + private final Queue<VersionDependentTaskCompletion> taskCompletionQueue = new ArrayDeque<>(); // Legacy behavior is an empty set of explicitly configured bucket spaces, which means that // only a baseline cluster state will be sent from the controller and no per-space state @@ -165,19 +165,10 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd propagateOptions(); } - public static FleetController createForContainer(FleetControllerOptions options, - StatusPageServerInterface statusPageServer, - MetricReporter metricReporter) throws Exception { + public static FleetController create(FleetControllerOptions options, + StatusPageServerInterface statusPageServer, + MetricReporter metricReporter) throws Exception { Timer timer = new RealTimer(); - return create(options, timer, statusPageServer, null, metricReporter); - } - - private static FleetController create(FleetControllerOptions options, - Timer timer, - StatusPageServerInterface statusPageServer, - RpcServer rpcServer, - MetricReporter metricReporter) throws Exception - { MetricUpdater metricUpdater = new MetricUpdater(metricReporter, options.fleetControllerIndex); EventLog log = new EventLog(timer, metricUpdater); ContentCluster cluster = new ContentCluster( @@ -201,7 +192,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd SystemStateBroadcaster stateBroadcaster = new SystemStateBroadcaster(timer, timer); MasterElectionHandler masterElectionHandler = new MasterElectionHandler(options.fleetControllerIndex, options.fleetControllerCount, timer, timer); FleetController controller = new FleetController( - timer, log, cluster, stateGatherer, communicator, statusPageServer, rpcServer, lookUp, database, stateGenerator, stateBroadcaster, masterElectionHandler, metricUpdater, options); + timer, log, cluster, stateGatherer, communicator, statusPageServer, null, lookUp, database, stateGenerator, stateBroadcaster, masterElectionHandler, metricUpdater, options); controller.start(); return controller; } |