From 5ee2f5c4837f0098282d93c85e606e1a3af40dd6 Mon Sep 17 00:00:00 2001
From: Mridul Muralidharan <mridul@gmail.com>
Date: Wed, 17 Apr 2013 23:13:34 +0530
Subject: [PATCH] Cache pattern, add (commented out) alternatives for check*
apis
---
core/src/main/scala/spark/Utils.scala | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/core/src/main/scala/spark/Utils.scala b/core/src/main/scala/spark/Utils.scala
index 14bb153d54..3e54fa7a7e 100644
--- a/core/src/main/scala/spark/Utils.scala
+++ b/core/src/main/scala/spark/Utils.scala
@@ -13,6 +13,7 @@ import com.google.common.io.Files
import com.google.common.util.concurrent.ThreadFactoryBuilder
import spark.serializer.SerializerInstance
import spark.deploy.SparkHadoopUtil
+import java.util.regex.Pattern
/**
* Various utility methods used by Spark.
@@ -337,9 +338,11 @@ private object Utils extends Logging {
}
// Used by DEBUG code : remove when all testing done
+ private val ipPattern = Pattern.compile("^[0-9]+(\\.[0-9]+)*$")
def checkHost(host: String, message: String = "") {
// Currently catches only ipv4 pattern, this is just a debugging tool - not rigourous !
- if (host.matches("^[0-9]+(\\.[0-9]+)*$")) {
+ // if (host.matches("^[0-9]+(\\.[0-9]+)*$")) {
+ if (ipPattern.matcher(host).matches()) {
Utils.logErrorWithStack("Unexpected to have host " + host + " which matches IP pattern. Message " + message)
}
if (Utils.parseHostPort(host)._2 != 0){
@@ -356,6 +359,12 @@ private object Utils extends Logging {
}
}
+ // Once testing is complete in various modes, replace with this ?
+ /*
+ def checkHost(host: String, message: String = "") {}
+ def checkHostPort(hostPort: String, message: String = "") {}
+ */
+
def getUserNameFromEnvironment(): String = {
SparkHadoopUtil.getUserNameFromEnvironment
}
--
GitLab