Remove usage of org.apache.hadoop.util.Shell

witgo · Apr 15, 2014 · bc0926f · bc0926f
1 parent be89fa7
commit bc0926f
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala
@@ -28,7 +28,6 @@ import org.apache.hadoop.io.Text
 import org.apache.hadoop.mapred.JobConf
 import org.apache.hadoop.security.Credentials
 import org.apache.hadoop.security.UserGroupInformation
-import org.apache.hadoop.util.Shell
 import org.apache.hadoop.util.StringInterner
 import org.apache.hadoop.yarn.conf.YarnConfiguration
 import org.apache.hadoop.yarn.api.ApplicationConstants
@@ -103,7 +102,7 @@ object YarnSparkHadoopUtil {
       classPathSeparator: String) = {
     if (envString != null && envString.length() > 0) {
       var childEnvs = envString.split(",")
-      var p = Pattern.compile(Shell.getEnvironmentVariableRegex())
+      var p = Pattern.compile(getEnvironmentVariableRegex())
       for (cEnv <- childEnvs) {
         var parts = cEnv.split("=") // split on '='
         var m = p.matcher(parts(1))
@@ -130,4 +129,13 @@ object YarnSparkHadoopUtil {
     }
   }
 
+  private def getEnvironmentVariableRegex() : String = {
+    val osName = System.getProperty("os.name")
+    if (osName startsWith "Windows") {
+      "%([A-Za-z_][A-Za-z0-9_]*?)%"
+    } else {
+      "\\$([A-Za-z_][A-Za-z0-9_]*)"
+    }
+  }
+
 }