forked from apache/flink
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-9427] Fix registration and request slot race condition in Task…
…Executor This commit fixes a race condition between the TaskExecutor and the ResourceManager. Before, it could happen that the ResourceManager sends requestSlots message before the TaskExecutor registration was completed. Due to this, the TaskExecutor did not have all information it needed to accept task submissions. The problem was that the TaskExecutor sent the SlotReport at registration time. Due to this, t he SlotManager could already assign these slots to pending slot requests. With this commit, the registration protocol changes such that the TaskExecutor first registers at the ResourceManager and only after completing this step, it will announce the available slots to the SlotManager. This closes apache#6067.
- Loading branch information
1 parent
a5966fd
commit 47dc699
Showing
19 changed files
with
730 additions
and
244 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
...main/java/org/apache/flink/runtime/taskexecutor/EstablishedResourceManagerConnection.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/* | ||
* 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.taskexecutor; | ||
|
||
import org.apache.flink.runtime.clusterframework.types.ResourceID; | ||
import org.apache.flink.runtime.instance.InstanceID; | ||
import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway; | ||
|
||
import javax.annotation.Nonnull; | ||
|
||
/** | ||
* Container for the resource manager connection instances used by the | ||
* {@link TaskExecutor}. | ||
*/ | ||
class EstablishedResourceManagerConnection { | ||
|
||
@Nonnull | ||
private final ResourceManagerGateway resourceManagerGateway; | ||
|
||
@Nonnull | ||
private final ResourceID resourceManagerResourceId; | ||
|
||
@Nonnull | ||
private final InstanceID taskExecutorRegistrationId; | ||
|
||
EstablishedResourceManagerConnection(@Nonnull ResourceManagerGateway resourceManagerGateway, @Nonnull ResourceID resourceManagerResourceId, @Nonnull InstanceID taskExecutorRegistrationId) { | ||
this.resourceManagerGateway = resourceManagerGateway; | ||
this.resourceManagerResourceId = resourceManagerResourceId; | ||
this.taskExecutorRegistrationId = taskExecutorRegistrationId; | ||
} | ||
|
||
@Nonnull | ||
public ResourceManagerGateway getResourceManagerGateway() { | ||
return resourceManagerGateway; | ||
} | ||
|
||
@Nonnull | ||
public ResourceID getResourceManagerResourceId() { | ||
return resourceManagerResourceId; | ||
} | ||
|
||
@Nonnull | ||
public InstanceID getTaskExecutorRegistrationId() { | ||
return taskExecutorRegistrationId; | ||
} | ||
} |
Oops, something went wrong.