Repository: incubator-predictionio Updated Branches: refs/heads/develop 02a5655fc -> c508c791d
Remove upgrade check Apart from not being implemented, upgrade check was causing SSL Handshake exceptions during the engine building. See also: #243 Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/3b872758 Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/3b872758 Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/3b872758 Branch: refs/heads/develop Commit: 3b8727582394a203aeaa6ad95d7055b715a03e5f Parents: ec79f20 Author: Marcin ZiemiÅski <[email protected]> Authored: Thu Jul 14 15:53:27 2016 -0700 Committer: Marcin ZiemiÅski <[email protected]> Committed: Thu Jul 14 15:53:27 2016 -0700 ---------------------------------------------------------------------- .../io/prediction/workflow/CoreWorkflow.scala | 3 -- .../io/prediction/workflow/CreateServer.scala | 18 ----------- .../io/prediction/workflow/WorkflowUtils.scala | 32 -------------------- .../io/prediction/tools/console/Console.scala | 9 +----- 4 files changed, 1 insertion(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/3b872758/core/src/main/scala/io/prediction/workflow/CoreWorkflow.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/io/prediction/workflow/CoreWorkflow.scala b/core/src/main/scala/io/prediction/workflow/CoreWorkflow.scala index ad93b1a..8cd0b4b 100644 --- a/core/src/main/scala/io/prediction/workflow/CoreWorkflow.scala +++ b/core/src/main/scala/io/prediction/workflow/CoreWorkflow.scala @@ -47,7 +47,6 @@ object CoreWorkflow { params: WorkflowParams = WorkflowParams()) { logger.debug("Starting SparkContext") val mode = "training" - WorkflowUtils.checkUpgrade(mode, engineInstance.engineFactory) val batch = if (params.batch.nonEmpty) { s"{engineInstance.engineFactory} (${params.batch}})" @@ -111,8 +110,6 @@ object CoreWorkflow { val mode = "evaluation" - WorkflowUtils.checkUpgrade(mode, engine.getClass.getName) - val batch = if (params.batch.nonEmpty) { s"{evaluation.getClass.getName} (${params.batch}})" } else { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/3b872758/core/src/main/scala/io/prediction/workflow/CreateServer.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/io/prediction/workflow/CreateServer.scala b/core/src/main/scala/io/prediction/workflow/CreateServer.scala index a664187..6c224bf 100644 --- a/core/src/main/scala/io/prediction/workflow/CreateServer.scala +++ b/core/src/main/scala/io/prediction/workflow/CreateServer.scala @@ -107,7 +107,6 @@ case class StartServer() case class BindServer() case class StopServer() case class ReloadServer() -case class UpgradeCheck() object CreateServer extends Logging { @@ -183,14 +182,6 @@ object CreateServer extends Logging { engineInstance.engineVersion) engineManifests.get(engineId, engineVersion) map { manifest => val engineFactoryName = engineInstance.engineFactory - val upgrade = actorSystem.actorOf(Props( - classOf[UpgradeActor], - engineFactoryName)) - actorSystem.scheduler.schedule( - 0.seconds, - 1.days, - upgrade, - UpgradeCheck()) val master = actorSystem.actorOf(Props( classOf[MasterActor], sc, @@ -272,15 +263,6 @@ object CreateServer extends Logging { } } -class UpgradeActor(engineClass: String) extends Actor { - val log = Logging(context.system, this) - implicit val system = context.system - def receive: Actor.Receive = { - case x: UpgradeCheck => - WorkflowUtils.checkUpgrade("deployment", engineClass) - } -} - class MasterActor ( sc: ServerConfig, engineInstance: EngineInstance, http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/3b872758/core/src/main/scala/io/prediction/workflow/WorkflowUtils.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/io/prediction/workflow/WorkflowUtils.scala b/core/src/main/scala/io/prediction/workflow/WorkflowUtils.scala index d93b9eb..f612678 100644 --- a/core/src/main/scala/io/prediction/workflow/WorkflowUtils.scala +++ b/core/src/main/scala/io/prediction/workflow/WorkflowUtils.scala @@ -41,7 +41,6 @@ import org.json4s.MappingException import org.json4s._ import org.json4s.native.JsonMethods._ -import scala.io.Source import scala.language.existentials import scala.reflect.runtime.universe @@ -211,13 +210,6 @@ object WorkflowUtils extends Logging { */ def javaObjectToJValue(params: AnyRef): JValue = parse(gson.toJson(params)) - private[prediction] def checkUpgrade( - component: String = "core", - engine: String = ""): Unit = { - val runner = new Thread(new UpgradeCheckRunner(component, engine)) - runner.start() - } - // Extract debug string by recursively traversing the data. def debugString[D](data: D): String = { val s: String = data match { @@ -384,30 +376,6 @@ object SparkWorkflowUtils extends Logging { } } -class UpgradeCheckRunner( - val component: String, - val engine: String) extends Runnable with Logging { - val version = BuildInfo.version - val versionsHost = "https://direct.prediction.io/"; - - def run(): Unit = { - val url = if (engine == "") { - s"$versionsHost$version/$component.json" - } else { - s"$versionsHost$version/$component/$engine.json" - } - try { - val upgradeData = Source.fromURL(url) - } catch { - case e: FileNotFoundException => - debug(s"Update metainfo not found. $url") - case e: java.net.UnknownHostException => - debug(s"${e.getClass.getName}: {e.getMessage}") - } - // TODO: Implement upgrade logic - } -} - class WorkflowInterruption() extends Exception case class StopAfterReadInterruption() extends WorkflowInterruption http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/3b872758/tools/src/main/scala/io/prediction/tools/console/Console.scala ---------------------------------------------------------------------- diff --git a/tools/src/main/scala/io/prediction/tools/console/Console.scala b/tools/src/main/scala/io/prediction/tools/console/Console.scala index 81e2d7a..e19de08 100644 --- a/tools/src/main/scala/io/prediction/tools/console/Console.scala +++ b/tools/src/main/scala/io/prediction/tools/console/Console.scala @@ -942,14 +942,7 @@ object Console extends Logging { "pioVersion := \"" + BuildInfo.version + "\"")) } implicit val formats = Utils.json4sDefaultFormats - try { - val engineFactory = - (parse(Source.fromFile("engine.json").mkString) \ "engineFactory"). - extract[String] - WorkflowUtils.checkUpgrade("build", engineFactory) - } catch { - case e: Throwable => WorkflowUtils.checkUpgrade("build") - } + val sbt = detectSbt(ca) info(s"Using command '${sbt}' at the current working directory to build.") info("If the path above is incorrect, this process will fail.")
