[hotfix] Add a DefaultSlotManager similar to the TestingSlotManager
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f4831c64 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f4831c64 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f4831c64 Branch: refs/heads/flip-6 Commit: f4831c64768a45f04a662b81f581dd5775d7111e Parents: f90e5ff Author: Stephan Ewen <se...@apache.org> Authored: Mon Oct 17 16:38:17 2016 +0200 Committer: Stephan Ewen <se...@apache.org> Committed: Mon Oct 17 17:02:55 2016 +0200 ---------------------------------------------------------------------- .../ResourceManagerServices.java | 2 +- .../slotmanager/DefaultSlotManager.java | 69 ++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/f4831c64/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerServices.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerServices.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerServices.java index 16d0a7d..c524604 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerServices.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerServices.java @@ -38,7 +38,7 @@ public interface ResourceManagerServices { void allocateResource(ResourceProfile resourceProfile); /** - * Gets the async excutor which executes outside of the main thread of the ResourceManager + * Gets the async executor which executes outside of the main thread of the ResourceManager */ Executor getAsyncExecutor(); http://git-wip-us.apache.org/repos/asf/flink/blob/f4831c64/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/slotmanager/DefaultSlotManager.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/slotmanager/DefaultSlotManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/slotmanager/DefaultSlotManager.java new file mode 100644 index 0000000..9508936 --- /dev/null +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/slotmanager/DefaultSlotManager.java @@ -0,0 +1,69 @@ +/* + * 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.runtime.clusterframework.types.AllocationID; +import org.apache.flink.runtime.clusterframework.types.ResourceSlot; +import org.apache.flink.runtime.clusterframework.types.SlotID; +import org.apache.flink.runtime.resourcemanager.ResourceManagerServices; +import org.apache.flink.runtime.resourcemanager.SlotRequest; + +import java.util.Iterator; +import java.util.Map; + +/** + * A slot manager that answers requests with slots without any special logic. The first slot + * in the maps to match a request is chosen. + */ +public class DefaultSlotManager extends SlotManager { + + public DefaultSlotManager(ResourceManagerServices rmServices) { + super(rmServices); + } + + @Override + protected ResourceSlot chooseSlotToUse(SlotRequest request, Map<SlotID, ResourceSlot> freeSlots) { + final Iterator<ResourceSlot> slotIterator = freeSlots.values().iterator(); + if (slotIterator.hasNext()) { + return slotIterator.next(); + } else { + return null; + } + } + + @Override + protected SlotRequest chooseRequestToFulfill(ResourceSlot offeredSlot, Map<AllocationID, SlotRequest> pendingRequests) { + final Iterator<SlotRequest> requestIterator = pendingRequests.values().iterator(); + if (requestIterator.hasNext()) { + return requestIterator.next(); + } else { + return null; + } + } + + // ------------------------------------------------------------------------ + + public static class Factory implements SlotManagerFactory { + + @Override + public SlotManager create(ResourceManagerServices rmServices) { + return new DefaultSlotManager(rmServices); + } + } +}
