[GitHub] flink pull request: [FLINK-1415] Akka cleanups

2015-02-05 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/flink/pull/319


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] flink pull request: [FLINK-1415] Akka cleanups

2015-02-05 Thread tillrohrmann
Github user tillrohrmann commented on the pull request:

https://github.com/apache/flink/pull/319#issuecomment-73031242
  
Rebased on Stephan's latest master branch containing the subslot release 
fix and reduced memory footprint of archived ExecutionGraphs.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] flink pull request: [FLINK-1415] Akka cleanups

2015-01-26 Thread rmetzger
Github user rmetzger commented on a diff in the pull request:

https://github.com/apache/flink/pull/319#discussion_r23526978
  
--- Diff: 
flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java ---
@@ -329,6 +330,15 @@ public void unregisterMemoryManager(MemoryManager 
memoryManager) {
}
}
 
+   protected void notifyExecutionStateChange(ExecutionState executionState,
+   
Throwable optionalError) {
--- End diff --

This also seems weird 


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] flink pull request: [FLINK-1415] Akka cleanups

2015-01-26 Thread rmetzger
Github user rmetzger commented on a diff in the pull request:

https://github.com/apache/flink/pull/319#discussion_r23526836
  
--- Diff: 
flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/SlotSharingGroupAssignment.java
 ---
@@ -42,86 +44,82 @@
 public class SlotSharingGroupAssignment implements Serializable {
 
static final long serialVersionUID = 42L;
-   
+
private static final Logger LOG = Scheduler.LOG;
-   
+
private transient final Object lock = new Object();
-   
+
/** All slots currently allocated to this sharing group */
private final SetSharedSlot allSlots = new 
LinkedHashSetSharedSlot();
-   
+
/** The slots available per vertex type (jid), keyed by instance, to 
make them locatable */
private final MapAbstractID, MapInstance, ListSharedSlot 
availableSlotsPerJid = new LinkedHashMapAbstractID, MapInstance, 
ListSharedSlot();
-   
-   
+
// 

-   
-   
-   public SubSlot addNewSlotWithTask(AllocatedSlot slot, ExecutionVertex 
vertex) {
-   JobVertexID id = vertex.getJobvertexId();
-   return addNewSlotWithTask(slot, id, id);
-   }
-   
-   public SubSlot addNewSlotWithTask(AllocatedSlot slot, ExecutionVertex 
vertex, CoLocationConstraint constraint) {
-   AbstractID groupId = constraint.getGroupId();
-   return addNewSlotWithTask(slot, groupId, null);
-   }
-   
-   private SubSlot addNewSlotWithTask(AllocatedSlot slot, AbstractID 
groupId, JobVertexID vertexId) {
-   
-   final SharedSlot sharedSlot = new SharedSlot(slot, this);
-   final Instance location = slot.getInstance();
-   
+
+   public SimpleSlot addSharedSlotAndAllocateSubSlot(SharedSlot 
sharedSlot, Locality locality,
+   
AbstractID groupId, CoLocationConstraint constraint) {
--- End diff --

indentation?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] flink pull request: [FLINK-1415] Akka cleanups

2015-01-26 Thread rmetzger
Github user rmetzger commented on a diff in the pull request:

https://github.com/apache/flink/pull/319#discussion_r23526787
  
--- Diff: 
flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/SlotAvailabilityListener.java
 ---
@@ -21,7 +21,7 @@
 import org.apache.flink.runtime.instance.Instance;
 
 /**
- * A SlotAvailabilityListener can be notified when new {@link 
org.apache.flink.runtime.instance.AllocatedSlot}s become available
+ * A SlotAvailabilityListener can be notified when new {@link 
org.apache.flink.runtime.instance.AllocatedSlot2}s become available
--- End diff --

I guess `AllocatedSlot2` is an automatic rename leftover


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] flink pull request: [FLINK-1415] Akka cleanups

2015-01-26 Thread uce
Github user uce commented on the pull request:

https://github.com/apache/flink/pull/319#issuecomment-71458216
  
I think @StephanEwen is reviewing the critical part.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] flink pull request: [FLINK-1415] Akka cleanups

2015-01-26 Thread tillrohrmann
Github user tillrohrmann commented on a diff in the pull request:

https://github.com/apache/flink/pull/319#discussion_r23537586
  
--- Diff: 
flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/SlotAvailabilityListener.java
 ---
@@ -21,7 +21,7 @@
 import org.apache.flink.runtime.instance.Instance;
 
 /**
- * A SlotAvailabilityListener can be notified when new {@link 
org.apache.flink.runtime.instance.AllocatedSlot}s become available
+ * A SlotAvailabilityListener can be notified when new {@link 
org.apache.flink.runtime.instance.AllocatedSlot2}s become available
--- End diff --

You are right. Good catch. I'll correct it.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] flink pull request: [FLINK-1415] Akka cleanups

2015-01-26 Thread tillrohrmann
Github user tillrohrmann commented on a diff in the pull request:

https://github.com/apache/flink/pull/319#discussion_r23537642
  
--- Diff: 
flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/SlotSharingGroupAssignment.java
 ---
@@ -42,86 +44,82 @@
 public class SlotSharingGroupAssignment implements Serializable {
 
static final long serialVersionUID = 42L;
-   
+
private static final Logger LOG = Scheduler.LOG;
-   
+
private transient final Object lock = new Object();
-   
+
/** All slots currently allocated to this sharing group */
private final SetSharedSlot allSlots = new 
LinkedHashSetSharedSlot();
-   
+
/** The slots available per vertex type (jid), keyed by instance, to 
make them locatable */
private final MapAbstractID, MapInstance, ListSharedSlot 
availableSlotsPerJid = new LinkedHashMapAbstractID, MapInstance, 
ListSharedSlot();
-   
-   
+
// 

-   
-   
-   public SubSlot addNewSlotWithTask(AllocatedSlot slot, ExecutionVertex 
vertex) {
-   JobVertexID id = vertex.getJobvertexId();
-   return addNewSlotWithTask(slot, id, id);
-   }
-   
-   public SubSlot addNewSlotWithTask(AllocatedSlot slot, ExecutionVertex 
vertex, CoLocationConstraint constraint) {
-   AbstractID groupId = constraint.getGroupId();
-   return addNewSlotWithTask(slot, groupId, null);
-   }
-   
-   private SubSlot addNewSlotWithTask(AllocatedSlot slot, AbstractID 
groupId, JobVertexID vertexId) {
-   
-   final SharedSlot sharedSlot = new SharedSlot(slot, this);
-   final Instance location = slot.getInstance();
-   
+
+   public SimpleSlot addSharedSlotAndAllocateSubSlot(SharedSlot 
sharedSlot, Locality locality,
+   
AbstractID groupId, CoLocationConstraint constraint) {
--- End diff --

I must have fallen asleep on the space button.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---