You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by af...@apache.org on 2015/11/09 19:56:30 UTC
incubator-reef git commit: [REEF-899] Make JobSubmissionDirectory in
REEF-Runtime-YARN
Repository: incubator-reef
Updated Branches:
refs/heads/master 43b233e89 -> 2515c5377
[REEF-899] Make JobSubmissionDirectory in REEF-Runtime-YARN
To move JobSubmissionDirectory from 'org.apache.reef.driver.parameters'
into 'org.apache.reef.runtime.yarn.driver.parameters' package, this PR
* Rename the package of existing one in reef-runtime-yarn
* Make a new *deprecated* o.a.r.d.p.JobSubmissionDirectory in reef-common
* Add 'TODO[JIRA REEF-904]'s
JIRA:
[REEF-899](https://issues.apache.org/jira/browse/REEF-899)
Pull request:
This closes #606
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/2515c537
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/2515c537
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/2515c537
Branch: refs/heads/master
Commit: 2515c5377ee97e3dfcde54ef49cf3446ea209881
Parents: 43b233e
Author: Dongjoon Hyun <do...@apache.org>
Authored: Mon Nov 2 02:04:10 2015 +0900
Committer: Andrew Chung <af...@gmail.com>
Committed: Mon Nov 9 10:55:53 2015 -0800
----------------------------------------------------------------------
...ocalRuntimeDriverConfigurationGenerator.java | 2 +-
.../bridge/client/LocalSubmissionFromCS.java | 2 +-
.../parameters/JobSubmissionDirectory.java | 31 ++++++++++++++++++++
.../client/HDInsightDriverConfiguration.java | 9 ++++--
.../yarn/driver/UploaderToJobfolder.java | 2 +-
.../yarn/driver/YarnContainerManager.java | 2 +-
.../yarn/driver/YarnDriverConfiguration.java | 9 ++++--
.../parameters/JobSubmissionDirectory.java | 2 +-
8 files changed, 48 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2515c537/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalRuntimeDriverConfigurationGenerator.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalRuntimeDriverConfigurationGenerator.java b/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalRuntimeDriverConfigurationGenerator.java
index 5aa04a6..70d4ae3 100644
--- a/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalRuntimeDriverConfigurationGenerator.java
+++ b/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalRuntimeDriverConfigurationGenerator.java
@@ -19,11 +19,11 @@
package org.apache.reef.bridge.client;
import org.apache.reef.client.parameters.DriverConfigurationProviders;
-import org.apache.reef.driver.parameters.JobSubmissionDirectory;
import org.apache.reef.runtime.common.driver.parameters.ClientRemoteIdentifier;
import org.apache.reef.runtime.common.files.REEFFileNames;
import org.apache.reef.runtime.local.client.DriverConfigurationProvider;
import org.apache.reef.runtime.local.client.PreparedDriverFolderLauncher;
+import org.apache.reef.runtime.yarn.driver.parameters.JobSubmissionDirectory;
import org.apache.reef.tang.*;
import org.apache.reef.tang.annotations.Parameter;
import org.apache.reef.tang.exceptions.InjectionException;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2515c537/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalSubmissionFromCS.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalSubmissionFromCS.java b/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalSubmissionFromCS.java
index a5a80d5..7e926ea 100644
--- a/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalSubmissionFromCS.java
+++ b/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalSubmissionFromCS.java
@@ -20,11 +20,11 @@ package org.apache.reef.bridge.client;
import org.apache.commons.lang.Validate;
import org.apache.reef.client.parameters.DriverConfigurationProviders;
-import org.apache.reef.driver.parameters.JobSubmissionDirectory;
import org.apache.reef.io.TcpPortConfigurationProvider;
import org.apache.reef.runtime.common.files.REEFFileNames;
import org.apache.reef.runtime.common.launch.parameters.DriverLaunchCommandPrefix;
import org.apache.reef.runtime.local.client.LocalRuntimeConfiguration;
+import org.apache.reef.runtime.yarn.driver.parameters.JobSubmissionDirectory;
import org.apache.reef.tang.Configuration;
import org.apache.reef.tang.Configurations;
import org.apache.reef.tang.Tang;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2515c537/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/JobSubmissionDirectory.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/JobSubmissionDirectory.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/JobSubmissionDirectory.java
new file mode 100644
index 0000000..344bafa
--- /dev/null
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/JobSubmissionDirectory.java
@@ -0,0 +1,31 @@
+/*
+ * 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.reef.driver.parameters;
+
+import org.apache.reef.tang.annotations.NamedParameter;
+import org.apache.reef.tang.annotations.Name;
+
+/**
+ * @deprecated in 0.14. Use org.apache.reef.runtime.yarn.driver.parameters.JobSubmissionDirectory.
+ */
+// TODO[JIRA REEF-904]: Act on deprecated JobSubmissionDirectory and JOB_SUBMISSION_DIRECTORY
+@NamedParameter(doc = "The job submission directory.")
+public final class JobSubmissionDirectory implements Name<String> {
+}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2515c537/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/HDInsightDriverConfiguration.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/HDInsightDriverConfiguration.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/HDInsightDriverConfiguration.java
index f14c15e..133d33e 100644
--- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/HDInsightDriverConfiguration.java
+++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/HDInsightDriverConfiguration.java
@@ -35,7 +35,7 @@ import org.apache.reef.runtime.common.parameters.JVMHeapSlack;
import org.apache.reef.runtime.hdinsight.HDInsightClasspathProvider;
import org.apache.reef.runtime.hdinsight.HDInsightJVMPathProvider;
import org.apache.reef.runtime.yarn.driver.*;
-import org.apache.reef.driver.parameters.JobSubmissionDirectory;
+import org.apache.reef.runtime.yarn.driver.parameters.JobSubmissionDirectory;
import org.apache.reef.runtime.yarn.driver.parameters.YarnHeartbeatPeriod;
import org.apache.reef.runtime.yarn.util.YarnConfigurationConstructor;
import org.apache.reef.tang.formats.ConfigurationModule;
@@ -54,6 +54,7 @@ public final class HDInsightDriverConfiguration extends ConfigurationModuleBuild
* @see org.apache.reef.driver.parameters.JobSubmissionDirectory
*/
public static final RequiredParameter<String> JOB_SUBMISSION_DIRECTORY = new RequiredParameter<>();
+
/**
* @see org.apache.reef.runtime.yarn.driver.parameters.YarnHeartbeatPeriod
*/
@@ -90,11 +91,13 @@ public final class HDInsightDriverConfiguration extends ConfigurationModuleBuild
.bindConstructor(YarnConfiguration.class, YarnConfigurationConstructor.class)
.bindImplementation(TempFileCreator.class, WorkingDirectoryTempFileCreator.class)
- // Bind the YARN Configuration parameters
+ // Bind the YARN Configuration parameters
+ // TODO[JIRA REEF-904]: Act on deprecated JobSubmissionDirectory and JOB_SUBMISSION_DIRECTORY
+ .bindNamedParameter(org.apache.reef.driver.parameters.JobSubmissionDirectory.class, JOB_SUBMISSION_DIRECTORY)
.bindNamedParameter(JobSubmissionDirectory.class, JOB_SUBMISSION_DIRECTORY)
.bindNamedParameter(YarnHeartbeatPeriod.class, YARN_HEARTBEAT_INTERVAL)
- // Bind the fields bound in AbstractDriverRuntimeConfiguration
+ // Bind the fields bound in AbstractDriverRuntimeConfiguration
.bindNamedParameter(JobIdentifier.class, JOB_IDENTIFIER)
.bindNamedParameter(LaunchID.class, JOB_IDENTIFIER)
.bindNamedParameter(ClientRemoteIdentifier.class, CLIENT_REMOTE_IDENTIFIER)
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2515c537/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/UploaderToJobfolder.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/UploaderToJobfolder.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/UploaderToJobfolder.java
index b8467d5..c6d8291 100644
--- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/UploaderToJobfolder.java
+++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/UploaderToJobfolder.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.util.ConverterUtils;
import org.apache.hadoop.yarn.util.Records;
-import org.apache.reef.driver.parameters.JobSubmissionDirectory;
+import org.apache.reef.runtime.yarn.driver.parameters.JobSubmissionDirectory;
import org.apache.reef.tang.annotations.Parameter;
import javax.inject.Inject;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2515c537/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java
index ad3c498..a056983 100644
--- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java
+++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java
@@ -32,7 +32,6 @@ import org.apache.hadoop.yarn.client.api.async.impl.NMClientAsyncImpl;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.reef.driver.ProgressProvider;
-import org.apache.reef.driver.parameters.JobSubmissionDirectory;
import org.apache.reef.proto.ReefServiceProtos;
import org.apache.reef.runtime.common.driver.DriverStatusManager;
import org.apache.reef.runtime.common.driver.resourcemanager.NodeDescriptorEventImpl;
@@ -40,6 +39,7 @@ import org.apache.reef.runtime.common.driver.resourcemanager.ResourceEventImpl;
import org.apache.reef.runtime.common.driver.resourcemanager.ResourceStatusEventImpl;
import org.apache.reef.runtime.common.driver.resourcemanager.RuntimeStatusEventImpl;
import org.apache.reef.runtime.common.files.REEFFileNames;
+import org.apache.reef.runtime.yarn.driver.parameters.JobSubmissionDirectory;
import org.apache.reef.runtime.yarn.driver.parameters.YarnHeartbeatPeriod;
import org.apache.reef.tang.InjectionFuture;
import org.apache.reef.tang.annotations.Parameter;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2515c537/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnDriverConfiguration.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnDriverConfiguration.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnDriverConfiguration.java
index c1192e6..6259a7f 100644
--- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnDriverConfiguration.java
+++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnDriverConfiguration.java
@@ -30,7 +30,7 @@ import org.apache.reef.runtime.common.launch.parameters.ErrorHandlerRID;
import org.apache.reef.runtime.common.launch.parameters.LaunchID;
import org.apache.reef.runtime.common.parameters.JVMHeapSlack;
import org.apache.reef.runtime.yarn.YarnClasspathProvider;
-import org.apache.reef.driver.parameters.JobSubmissionDirectory;
+import org.apache.reef.runtime.yarn.driver.parameters.JobSubmissionDirectory;
import org.apache.reef.runtime.yarn.driver.parameters.YarnHeartbeatPeriod;
import org.apache.reef.runtime.yarn.util.YarnConfigurationConstructor;
import org.apache.reef.tang.formats.*;
@@ -43,6 +43,7 @@ public class YarnDriverConfiguration extends ConfigurationModuleBuilder {
* @see org.apache.reef.driver.parameters.JobSubmissionDirectory
*/
public static final RequiredParameter<String> JOB_SUBMISSION_DIRECTORY = new RequiredParameter<>();
+
/**
* @see org.apache.reef.runtime.yarn.driver.parameters.YarnHeartbeatPeriod
*/
@@ -84,11 +85,13 @@ public class YarnDriverConfiguration extends ConfigurationModuleBuilder {
.bindConstructor(YarnConfiguration.class, YarnConfigurationConstructor.class)
.bindImplementation(TempFileCreator.class, WorkingDirectoryTempFileCreator.class)
- // Bind the YARN Configuration parameters
+ // Bind the YARN Configuration parameters
+ // TODO[JIRA REEF-904]: Act on deprecated JobSubmissionDirectory and JOB_SUBMISSION_DIRECTORY
+ .bindNamedParameter(org.apache.reef.driver.parameters.JobSubmissionDirectory.class, JOB_SUBMISSION_DIRECTORY)
.bindNamedParameter(JobSubmissionDirectory.class, JOB_SUBMISSION_DIRECTORY)
.bindNamedParameter(YarnHeartbeatPeriod.class, YARN_HEARTBEAT_INTERVAL)
- // Bind the fields bound in AbstractDriverRuntimeConfiguration
+ // Bind the fields bound in AbstractDriverRuntimeConfiguration
.bindNamedParameter(JobIdentifier.class, JOB_IDENTIFIER)
.bindNamedParameter(LaunchID.class, JOB_IDENTIFIER)
.bindNamedParameter(EvaluatorTimeout.class, EVALUATOR_TIMEOUT)
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2515c537/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/parameters/JobSubmissionDirectory.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/parameters/JobSubmissionDirectory.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/parameters/JobSubmissionDirectory.java
index 6213bf9..0bcef82 100644
--- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/parameters/JobSubmissionDirectory.java
+++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/parameters/JobSubmissionDirectory.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.reef.driver.parameters;
+package org.apache.reef.runtime.yarn.driver.parameters;
import org.apache.reef.tang.annotations.NamedParameter;
import org.apache.reef.tang.annotations.Name;