You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by sh...@apache.org on 2014/11/21 03:05:59 UTC
incubator-reef git commit: [REEF-36] Remove duplicated binding of
ManagerName
Repository: incubator-reef
Updated Branches:
refs/heads/master 622de531f -> d23004b22
[REEF-36] Remove duplicated binding of ManagerName
Currently RemoteConfiguration.ManagerName can be bound in either Client or Launcher.
For submission path that generates a static driver.config and then submits job remotely through REST api, it will cause duplicated binding.
This commit removes the binding in client and adds a default value to be safe.
JIRA: https://issues.apache.org/jira/browse/REEF-36
Author: Yingda Chen <yd...@gmail.com>
Closes #21
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/d23004b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/d23004b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/d23004b2
Branch: refs/heads/master
Commit: d23004b22efb6ae862e35fa4cacbbc1e8251a98c
Parents: 622de53
Author: Yingda Chen <yd...@gmail.com>
Authored: Tue Nov 18 13:02:16 2014 -0800
Committer: Shravan Narayanamurthy <sh...@apache.org>
Committed: Thu Nov 20 17:55:52 2014 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/reef/client/ClientConfiguration.java | 1 -
.../main/java/org/apache/reef/wake/remote/RemoteConfiguration.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d23004b2/reef-common/src/main/java/org/apache/reef/client/ClientConfiguration.java
----------------------------------------------------------------------
diff --git a/reef-common/src/main/java/org/apache/reef/client/ClientConfiguration.java b/reef-common/src/main/java/org/apache/reef/client/ClientConfiguration.java
index 3a034db..3bdb992 100644
--- a/reef-common/src/main/java/org/apache/reef/client/ClientConfiguration.java
+++ b/reef-common/src/main/java/org/apache/reef/client/ClientConfiguration.java
@@ -79,6 +79,5 @@ public final class ClientConfiguration extends ConfigurationModuleBuilder {
.bind(ResourceManagerErrorHandler.class, ON_RUNTIME_ERROR)
.bindNamedParameter(ClientPresent.class, ClientPresent.YES)
.bindNamedParameter(RemoteConfiguration.ErrorHandler.class, ON_WAKE_ERROR)
- .bindNamedParameter(RemoteConfiguration.ManagerName.class, "REEF_CLIENT")
.build();
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d23004b2/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/RemoteConfiguration.java
----------------------------------------------------------------------
diff --git a/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/RemoteConfiguration.java b/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/RemoteConfiguration.java
index 6eec4d1..f438239 100644
--- a/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/RemoteConfiguration.java
+++ b/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/RemoteConfiguration.java
@@ -28,7 +28,7 @@ import org.apache.reef.wake.remote.impl.ObjectSerializableCodec;
*/
public final class RemoteConfiguration {
- @NamedParameter(short_name = "rm_name", doc = "The name of the remote manager.")
+ @NamedParameter(short_name = "rm_name", doc = "The name of the remote manager.", default_value = "REEF_CLIENT")
public static final class ManagerName implements Name<String> {
// Intentionally empty
}