You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2014/09/21 04:13:13 UTC

[49/63] [abbrv] git commit: Fix serializability for SlotSharingGroup

Fix serializability for SlotSharingGroup


Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/e56d883f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/e56d883f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/e56d883f

Branch: refs/heads/master
Commit: e56d883faa6b94b9b2895643f818679fd242d7fe
Parents: ef7957f
Author: Stephan Ewen <se...@apache.org>
Authored: Mon Sep 15 16:54:14 2014 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sat Sep 20 20:02:50 2014 +0200

----------------------------------------------------------------------
 .../flink/runtime/jobmanager/scheduler/SlotSharingGroup.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/e56d883f/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/SlotSharingGroup.java
----------------------------------------------------------------------
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 b8b2ed1..30fe7c8 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
@@ -29,11 +29,15 @@ import org.apache.flink.runtime.jobgraph.JobVertexID;
  * deployed together within a slot. This is a soft permission, in contrast to the hard constraint
  * defined by a co-location hint.
  */
-public class SlotSharingGroup {
+public class SlotSharingGroup implements java.io.Serializable {
 	
+	private static final long serialVersionUID = 1L;
+	
+
 	private final Set<JobVertexID> ids = new TreeSet<JobVertexID>();
 	
-	private SlotSharingGroupAssignment taskAssignment;
+	/** Mapping of tasks to subslots. This field is only needed inside the JobManager, and is not RPCed. */
+	private transient SlotSharingGroupAssignment taskAssignment;
 	
 	
 	public SlotSharingGroup() {}