diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java index 1bd4db7..c48a3ee 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java @@ -359,6 +359,12 @@ static void configureDebugVariablesForChildJVM(Map environmentVa environmentVariables.get(HIVE_MAIN_CLIENT_DEBUG_OPTS), environmentVariables.get(HIVE_CHILD_CLIENT_DEBUG_OPTS)); environmentVariables.put(HADOOP_CLIENT_OPTS, newHadoopClientOpts); + if(environmentVariables.containsKey(HADOOP_OPTS_KEY) + && environmentVariables.get(HADOOP_OPTS_KEY) != null){ + String newHadoopOpts = environmentVariables.get(HADOOP_OPTS_KEY) + .replace(environmentVariables.get(HIVE_MAIN_CLIENT_DEBUG_OPTS),""); + environmentVariables.put(HADOOP_OPTS_KEY, newHadoopOpts); + } } else { // remove from HADOOP_CLIENT_OPTS any debug related options String newHadoopClientOpts = hadoopClientOpts.replace(