You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by zh...@apache.org on 2020/06/11 15:06:14 UTC
[flink] 06/10: [FLINK-17017][runtime] Enable to get allocated slots
information of a slot pool
This is an automated email from the ASF dual-hosted git repository.
zhuzh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit f6c275e26002abb42bfcc40ffbf6da54fbed4aa6
Author: Zhu Zhu <re...@gmail.com>
AuthorDate: Fri May 29 11:02:50 2020 +0800
[FLINK-17017][runtime] Enable to get allocated slots information of a slot pool
---
.../org/apache/flink/runtime/jobmaster/slotpool/SlotPool.java | 9 +++++++++
.../apache/flink/runtime/jobmaster/slotpool/SlotPoolImpl.java | 5 +++--
.../java/org/apache/flink/runtime/jobmaster/JobMasterTest.java | 5 +++++
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPool.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPool.java
index 47046d5..484e810 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPool.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPool.java
@@ -26,6 +26,7 @@ import org.apache.flink.runtime.concurrent.ComponentMainThreadExecutor;
import org.apache.flink.runtime.jobmanager.slots.TaskManagerGateway;
import org.apache.flink.runtime.jobmaster.AllocatedSlotReport;
import org.apache.flink.runtime.jobmaster.JobMasterId;
+import org.apache.flink.runtime.jobmaster.SlotInfo;
import org.apache.flink.runtime.jobmaster.SlotRequestId;
import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway;
import org.apache.flink.runtime.taskexecutor.slot.SlotOffer;
@@ -136,6 +137,14 @@ public interface SlotPool extends AllocatedSlotActions, AutoCloseable {
Collection<SlotInfoWithUtilization> getAvailableSlotsInformation();
/**
+ * Returns a list of {@link SlotInfo} objects about all slots that are currently allocated in the slot
+ * pool.
+ *
+ * @return a list of {@link SlotInfo} objects about all slots that are currently allocated in the slot pool.
+ */
+ Collection<SlotInfo> getAllocatedSlotsInformation();
+
+ /**
* Allocates the available slot with the given allocation id under the given request id. This method returns
* {@code null} if no slot with the given allocation id is available.
*
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolImpl.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolImpl.java
index cd0024a..1f1bc66 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolImpl.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/slotpool/SlotPoolImpl.java
@@ -41,10 +41,10 @@ import org.apache.flink.runtime.resourcemanager.SlotRequest;
import org.apache.flink.runtime.resourcemanager.exceptions.UnfulfillableSlotRequestException;
import org.apache.flink.runtime.taskexecutor.slot.SlotOffer;
import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
-import org.apache.flink.util.clock.Clock;
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.FlinkException;
import org.apache.flink.util.Preconditions;
+import org.apache.flink.util.clock.Clock;
import org.apache.flink.shaded.guava18.com.google.common.collect.Iterables;
@@ -166,7 +166,8 @@ public class SlotPoolImpl implements SlotPool {
// Getters
// ------------------------------------------------------------------------
- private Collection<SlotInfo> getAllocatedSlotsInformation() {
+ @Override
+ public Collection<SlotInfo> getAllocatedSlotsInformation() {
return allocatedSlots.listSlotInfo();
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java
index 5953260..724129d 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java
@@ -585,6 +585,11 @@ public class JobMasterTest extends TestLogger {
}
@Override
+ public Collection<SlotInfo> getAllocatedSlotsInformation() {
+ return Collections.emptyList();
+ }
+
+ @Override
public Optional<PhysicalSlot> allocateAvailableSlot(@Nonnull SlotRequestId slotRequestId, @Nonnull AllocationID allocationID) {
throw new UnsupportedOperationException("TestingSlotPool does not support this operation.");
}