diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/src/main/java/org/apache/hadoop/applications/mawo/server/common/MawoConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/src/main/java/org/apache/hadoop/applications/mawo/server/common/MawoConfiguration.java index 774c269ada2..4f1be53a645 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/src/main/java/org/apache/hadoop/applications/mawo/server/common/MawoConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/src/main/java/org/apache/hadoop/applications/mawo/server/common/MawoConfiguration.java @@ -59,7 +59,7 @@ private static final String JOB_BUILDER_CLASS_DEFAULT = "org.apache.hadoop.applications.mawo.server.master.job.SimpleTaskJobBuilder"; - private static final String WORKER_WORK_SPACE = "worker.workspace"; + private static final String WORKER_WORK_SPACE = "worker_workspace"; private static final String WORKER_WORK_SPACE_DEFAULT = "/tmp"; public static final String CLUSTER_MANAGER_URL = "ycloud.url"; @@ -67,10 +67,10 @@ public static final String AUTO_SHUTDOWN_WORKERS = "mawo.master.auto-shutdown-workers"; - private static final boolean DEFAULT_AUTO_SHUTDOWN_WORKERS = false; + private static final boolean DEFAULT_AUTO_SHUTDOWN_WORKERS = true; public static final String MASTER_TASKS_STATUS_LOG_PATH - = "master.tasks-status.log.path"; + = "master_tasks_status_log_path"; private static final String MASTER_TASKS_STATUS_LOG_PATH_DEFAULT = "/tmp"; private static final String MASTER_DRAIN_EVENTS_TIMEOUT = @@ -123,16 +123,22 @@ private MawoConfiguration(Properties properties) { configsMap.put(WORKER_NUM_TASKS, properties.getProperty(WORKER_NUM_TASKS, WORKER_NUM_TASKS_DEFAULT)); + /** + configsMap.put(WORKER_WORK_SPACE, + properties.getProperty(WORKER_WORK_SPACE, WORKER_WORK_SPACE_DEFAULT));**/ configsMap.put(WORKER_WORK_SPACE, - properties.getProperty(WORKER_WORK_SPACE, WORKER_WORK_SPACE_DEFAULT)); + getEnv_var(WORKER_WORK_SPACE, WORKER_WORK_SPACE_DEFAULT)); configsMap.put(AUTO_SHUTDOWN_WORKERS, properties.getProperty( AUTO_SHUTDOWN_WORKERS, String.valueOf(DEFAULT_AUTO_SHUTDOWN_WORKERS))); - + /** configsMap.put(MASTER_TASKS_STATUS_LOG_PATH, properties.getProperty( MASTER_TASKS_STATUS_LOG_PATH, - String.valueOf(MASTER_TASKS_STATUS_LOG_PATH_DEFAULT))); + String.valueOf(MASTER_TASKS_STATUS_LOG_PATH_DEFAULT)));**/ + + configsMap.put(MASTER_TASKS_STATUS_LOG_PATH, getEnv_var(MASTER_TASKS_STATUS_LOG_PATH, + MASTER_TASKS_STATUS_LOG_PATH_DEFAULT)); configsMap.put(MASTER_DRAIN_EVENTS_TIMEOUT, properties.getProperty(MASTER_DRAIN_EVENTS_TIMEOUT, @@ -271,4 +277,18 @@ public long getTeardownWorkerValidityInterval() { return Long.parseLong(configsMap.get( MASTER_TEARDOWN_WORKER_VALIDITY_INTERVAL_MS)); } + + public String getEnv_var(String env_var, String default_var) { + String value = System.getenv(env_var); + if (value != null) { + System.out.print("Value found from env"); + System.out.print(env_var + "=" + value); + return value; + } + else { + System.out.print("Value found from default"); + return default_var; + } + + } }