[flink] 01/02: [FLINK-21269][runtime] Add ResourceProfile field to SlotSharingGroup

[xt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xtsong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit ed57637e1ab4713af31f55cd7c7d8265e84a9728
Author: Yangze Guo <ka...@gmail.com>
AuthorDate: Fri Nov 20 14:26:50 2020 +0800

    [FLINK-21269][runtime] Add ResourceProfile field to SlotSharingGroup
---
 .../runtime/jobmanager/scheduler/SlotSharingGroup.java    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/SlotSharingGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/SlotSharingGroup.java
index 3e9432d..bcddc51 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/SlotSharingGroup.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/SlotSharingGroup.java
@@ -19,6 +19,7 @@
 package org.apache.flink.runtime.jobmanager.scheduler;
 
 import org.apache.flink.api.common.operators.ResourceSpec;
+import org.apache.flink.runtime.clusterframework.types.ResourceProfile;
 import org.apache.flink.runtime.instance.SlotSharingGroupId;
 import org.apache.flink.runtime.jobgraph.JobVertexID;
 
@@ -45,7 +46,10 @@ public class SlotSharingGroup implements java.io.Serializable {
      * Represents resources of all tasks in the group. Default to be zero. Any task with UNKNOWN
      * resources will turn it to be UNKNOWN.
      */
-    private ResourceSpec resourceSpec = ResourceSpec.ZERO;
+    @Deprecated private ResourceSpec resourceSpec = ResourceSpec.ZERO;
+
+    // Represents resources of all tasks in the group. Default to be UNKNOWN.
+    private ResourceProfile resourceProfile = ResourceProfile.UNKNOWN;
 
     // --------------------------------------------------------------------------------------------
 
@@ -67,6 +71,15 @@ public class SlotSharingGroup implements java.io.Serializable {
         return slotSharingGroupId;
     }
 
+    public void setResourceProfile(ResourceProfile resourceProfile) {
+        this.resourceProfile = checkNotNull(resourceProfile);
+    }
+
+    public ResourceProfile getResourceProfile() {
+        return resourceProfile;
+    }
+
+    @Deprecated
     public ResourceSpec getResourceSpec() {
         return resourceSpec;
     }