This is an automated email from the ASF dual-hosted git repository. trohrmann pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit e6639901e21ddae7a64d9ea3208d980424bd0ebf Author: Till Rohrmann <[email protected]> AuthorDate: Sat Sep 22 14:13:42 2018 +0200 [hotfix] Start MesosWorkers with default ContaineredTaskManagerConfiguration --- .../flink/mesos/runtime/clusterframework/MesosResourceManager.java | 4 ++-- .../mesos/runtime/clusterframework/MesosResourceManagerTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java index e7a5c98..d826773 100644 --- a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java +++ b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java @@ -357,7 +357,7 @@ public class MesosResourceManager extends ResourceManager<RegisteredMesosWorkerN switch(worker.state()) { case Launched: workersInLaunch.put(extractResourceID(worker.taskID()), worker); - final LaunchableMesosWorker launchable = createLaunchableMesosWorker(worker.taskID(), worker.profile()); + final LaunchableMesosWorker launchable = createLaunchableMesosWorker(worker.taskID()); toAssign.add(new Tuple2<>(launchable.taskRequest(), worker.hostname().get())); break; case Released: @@ -439,7 +439,7 @@ public class MesosResourceManager extends ResourceManager<RegisteredMesosWorkerN workerStore.putWorker(worker); workersInNew.put(extractResourceID(worker.taskID()), worker); - LaunchableMesosWorker launchable = createLaunchableMesosWorker(worker.taskID(), resourceProfile); + LaunchableMesosWorker launchable = createLaunchableMesosWorker(worker.taskID()); LOG.info("Scheduling Mesos task {} with ({} MB, {} cpus).", launchable.taskID().getValue(), launchable.taskRequest().getMemory(), launchable.taskRequest().getCPUs()); diff --git a/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java b/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java index e21f0fc..5163724 100644 --- a/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java +++ b/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java @@ -242,7 +242,7 @@ public class MesosResourceManagerTest extends TestLogger { TestingMesosResourceManager resourceManager; // domain objects for test purposes - final ResourceProfile resourceProfile1 = new ResourceProfile(1.0, 1); + final ResourceProfile resourceProfile1 = ResourceProfile.UNKNOWN; Protos.FrameworkID framework1 = Protos.FrameworkID.newBuilder().setValue("framework1").build(); public Protos.SlaveID slave1 = Protos.SlaveID.newBuilder().setValue("slave1").build();
