zentol commented on a change in pull request #13508: URL: https://github.com/apache/flink/pull/13508#discussion_r500087274
########## File path: flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/slotmanager/DefaultSlotTracker.java ########## @@ -0,0 +1,251 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.runtime.resourcemanager.slotmanager; + +import org.apache.flink.annotation.VisibleForTesting; +import org.apache.flink.api.common.JobID; +import org.apache.flink.runtime.clusterframework.types.ResourceProfile; +import org.apache.flink.runtime.clusterframework.types.SlotID; +import org.apache.flink.runtime.resourcemanager.registration.TaskExecutorConnection; +import org.apache.flink.runtime.taskexecutor.SlotStatus; +import org.apache.flink.util.Preconditions; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.Nullable; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.function.BiConsumer; +import java.util.function.Consumer; + +/** + * Default SlotTracker implementation. + */ +class DefaultSlotTracker implements SlotTracker { + private static final Logger LOG = LoggerFactory.getLogger(DefaultSlotTracker.class); + + /** + * Map for all registered slots. + */ + private final Map<SlotID, DeclarativeTaskManagerSlot> slots = new HashMap<>(); + + /** + * Index of all currently free slots. + */ + private final Map<SlotID, DeclarativeTaskManagerSlot> freeSlots = new LinkedHashMap<>(); + + private final SlotStatusUpdateListener slotStatusUpdateListener; + + private final SlotStatusStateReconciler slotStatusStateReconciler = new SlotStatusStateReconciler(this::transitionSlotToFree, this::transitionSlotToPending, this::transitionSlotToAllocated); + + public DefaultSlotTracker(SlotStatusUpdateListener slotStatusUpdateListener) { + this.slotStatusUpdateListener = Preconditions.checkNotNull(slotStatusUpdateListener); + } + + @Override + public void addSlot( + SlotID slotId, + ResourceProfile resourceProfile, + TaskExecutorConnection taskManagerConnection, + @Nullable JobID assignedJob) { + Preconditions.checkNotNull(slotId); + Preconditions.checkNotNull(resourceProfile); + Preconditions.checkNotNull(taskManagerConnection); + + if (slots.containsKey(slotId)) { + // remove the old slot first + LOG.debug("A slot was added with an already tracked slot ID {}. Removing previous entry.", slotId); + removeSlot(slotId); + } + + DeclarativeTaskManagerSlot slot = new DeclarativeTaskManagerSlot(slotId, resourceProfile, taskManagerConnection); + slots.put(slotId, slot); + freeSlots.put(slotId, slot); + slotStatusStateReconciler.executeStateTransition(slot, assignedJob); + } + + @Override + public void removeSlots(Iterable<SlotID> slotsToRemove) { + Preconditions.checkNotNull(slotsToRemove); + + for (SlotID slotId : slotsToRemove) { + removeSlot(slotId); + } + } + + private void removeSlot(SlotID slotId) { + DeclarativeTaskManagerSlot slot = slots.remove(slotId); + + if (slot != null) { + if (slot.getState() != SlotState.FREE) { + transitionSlotToFree(slot); + } + freeSlots.remove(slotId); + } else { + LOG.debug("There was no slot registered with slot id {}.", slotId); + } + } + + // --------------------------------------------------------------------------------------------- + // ResourceManager slot status API - optimistically trigger transitions, but they may not represent true state on task executors + // --------------------------------------------------------------------------------------------- + + @Override + public void notifyFree(SlotID slotId) { + Preconditions.checkNotNull(slotId); + transitionSlotToFree(slots.get(slotId)); + } + + @Override + public void notifyAllocationStart(SlotID slotId, JobID jobId) { + Preconditions.checkNotNull(slotId); + Preconditions.checkNotNull(jobId); + transitionSlotToPending(slots.get(slotId), jobId); + } + + @Override + public void notifyAllocationComplete(SlotID slotId, JobID jobId) { + Preconditions.checkNotNull(slotId); + Preconditions.checkNotNull(jobId); + transitionSlotToAllocated(slots.get(slotId), jobId); + } + + // --------------------------------------------------------------------------------------------- + // TaskExecutor slot status API - acts as source of truth + // --------------------------------------------------------------------------------------------- + + @Override + public void notifySlotStatus(Iterable<SlotStatus> slotStatuses) { + Preconditions.checkNotNull(slotStatuses); + for (SlotStatus slotStatus : slotStatuses) { + slotStatusStateReconciler.executeStateTransition(slots.get(slotStatus.getSlotID()), slotStatus.getJobID()); + } + } + + // --------------------------------------------------------------------------------------------- + // Core state transitions + // --------------------------------------------------------------------------------------------- + + private void transitionSlotToFree(DeclarativeTaskManagerSlot slot) { + Preconditions.checkNotNull(slot); + Preconditions.checkState(slot.getState() != SlotState.FREE); + + // remember the slots current job and state for the notification, as this information will be cleared from + // the slot upon freeing + final JobID jobId = slot.getJobId(); + final SlotState state = slot.getState(); + + slot.freeSlot(); + freeSlots.put(slot.getSlotId(), slot); + slotStatusUpdateListener.notifySlotStatusChange(slot, state, SlotState.FREE, jobId); + } + + private void transitionSlotToPending(DeclarativeTaskManagerSlot slot, JobID jobId) { + Preconditions.checkNotNull(slot); + Preconditions.checkState(slot.getState() == SlotState.FREE); + + slot.startAllocation(jobId); + freeSlots.remove(slot.getSlotId()); + slotStatusUpdateListener.notifySlotStatusChange(slot, SlotState.FREE, SlotState.PENDING, jobId); + } + + private void transitionSlotToAllocated(DeclarativeTaskManagerSlot slot, JobID jobId) { + Preconditions.checkNotNull(slot); + Preconditions.checkState(slot.getState() == SlotState.PENDING); + Preconditions.checkState(jobId.equals(slot.getJobId())); + + slotStatusUpdateListener.notifySlotStatusChange(slot, SlotState.PENDING, SlotState.ALLOCATED, jobId); + slot.completeAllocation(); Review comment: the notification should always be fired *after* the state transition to ensure that any component reacting to it, e.g., by querying the tracker, is in a consistent state with the tracker. In an earlier version the notification was sent before the update for convenience (don't have to remember stuff in transition to free). ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
