Repository: reef
Updated Branches:
  refs/heads/master f91b09bd2 -> 20369d4d4


[REEF-1179] Pass Mesos Integration Tests

This fixes the following missing parts from the previous commits:
  * Mesos needs to replace RemoteConfiguration.ManagerName.
    Do not use the given injector having `REEF_LAUNCHER`.
    - [REEF-991] Remove deprecated RangeTcpPortProvider.Default
      and DefaultRemoteManagerImplementation constructor
  * Adds Runtime Identifier to Mesos Runtime.
    - [REEF-983] Add Runtime Identifier to the EvaluatorDescriptor
  * Removes TempFileCreator binding.
    - [REEF-1013] C# Evaluator does not work on HDInsight

Pull Request:
  This closes #818


Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/20369d4d
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/20369d4d
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/20369d4d

Branch: refs/heads/master
Commit: 20369d4d4736553269b2d44b1fa2ed352bdfc286
Parents: f91b09b
Author: Dongjoon Hyun <[email protected]>
Authored: Tue Feb 2 13:58:08 2016 -0800
Committer: Yunseong Lee <[email protected]>
Committed: Thu Feb 11 02:34:58 2016 +0900

----------------------------------------------------------------------
 .../reef/runtime/mesos/driver/MesosResourceLaunchHandler.java  | 3 ---
 .../org/apache/reef/runtime/mesos/driver/REEFScheduler.java    | 1 +
 .../apache/reef/wake/remote/DefaultRemoteManagerFactory.java   | 6 +++---
 3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/reef/blob/20369d4d/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceLaunchHandler.java
----------------------------------------------------------------------
diff --git 
a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceLaunchHandler.java
 
b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceLaunchHandler.java
index f73ac62..5aae7e0 100644
--- 
a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceLaunchHandler.java
+++ 
b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceLaunchHandler.java
@@ -21,8 +21,6 @@ package org.apache.reef.runtime.mesos.driver;
 import org.apache.reef.annotations.audience.DriverSide;
 import org.apache.reef.annotations.audience.Private;
 import org.apache.reef.driver.evaluator.EvaluatorProcess;
-import org.apache.reef.io.TempFileCreator;
-import org.apache.reef.io.WorkingDirectoryTempFileCreator;
 import org.apache.reef.runtime.common.driver.api.ResourceLaunchEvent;
 import org.apache.reef.runtime.common.driver.api.ResourceLaunchHandler;
 import org.apache.reef.runtime.common.files.ClasspathProvider;
@@ -85,7 +83,6 @@ final class MesosResourceLaunchHandler implements 
ResourceLaunchHandler {
 
       final Configuration evaluatorConfiguration = Tang.Factory.getTang()
           .newConfigurationBuilder(resourceLaunchEvent.getEvaluatorConf())
-          .bindImplementation(TempFileCreator.class, 
WorkingDirectoryTempFileCreator.class)
           .build();
 
       final File configurationFile = new File(

http://git-wip-us.apache.org/repos/asf/reef/blob/20369d4d/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java
----------------------------------------------------------------------
diff --git 
a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java
 
b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java
index 7387d3c..574ad44 100644
--- 
a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java
+++ 
b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java
@@ -395,6 +395,7 @@ final class REEFScheduler implements Scheduler {
         .setNodeId(taskStatus.getSlaveId().getValue())
         .setResourceMemory(resourceRequestProto.getMemorySize().get())
         .setVirtualCores(resourceRequestProto.getVirtualCores().get())
+        .setRuntimeName(RuntimeIdentifier.RUNTIME_NAME)
         .build();
     reefEventHandlers.onResourceAllocation(alloc);
 

http://git-wip-us.apache.org/repos/asf/reef/blob/20369d4d/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/DefaultRemoteManagerFactory.java
----------------------------------------------------------------------
diff --git 
a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/DefaultRemoteManagerFactory.java
 
b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/DefaultRemoteManagerFactory.java
index 442d4fa..1e097b6 100644
--- 
a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/DefaultRemoteManagerFactory.java
+++ 
b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/DefaultRemoteManagerFactory.java
@@ -19,6 +19,7 @@
 package org.apache.reef.wake.remote;
 
 import org.apache.reef.tang.Injector;
+import org.apache.reef.tang.Tang;
 import org.apache.reef.tang.annotations.Parameter;
 import org.apache.reef.tang.exceptions.InjectionException;
 import org.apache.reef.wake.EventHandler;
@@ -53,9 +54,8 @@ final class DefaultRemoteManagerFactory implements 
RemoteManagerFactory {
       @Parameter(RemoteConfiguration.RetryTimeout.class) final int 
retryTimeout,
       final LocalAddressProvider localAddressProvider,
       final TransportFactory tpFactory,
-      final TcpPortProvider tcpPortProvider,
-      final Injector injector) {
-    this.injector = injector.forkInjector();
+      final TcpPortProvider tcpPortProvider) {
+    this.injector = Tang.Factory.getTang().newInjector();
     this.codec = codec;
     this.errorHandler = errorHandler;
     this.orderingGuarantee = orderingGuarantee;

Reply via email to