Преглед на файлове

[livy] Update spark version checker to be more liberal on version numbers

This allows for parsing versions like "1.5.0-cdh5.5.0-SNAPSHOT".
Erick Tryzelaar преди 10 години
родител
ревизия
b730df4
променени са 1 файла, в които са добавени 14 реда и са изтрити 4 реда
  1. 14 4
      apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/Main.scala

+ 14 - 4
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/Main.scala

@@ -71,12 +71,22 @@ object Main {
    */
   private def testSparkSubmit(livyConf: LivyConf) = {
     try {
-      // Ignore the version for now.
+      val versions_regex = (
+        """^(?:""" +
+          """(1\.3\.0)|""" +
+          """(1\.3\.1)|""" +
+          """(1\.4\.0)|""" +
+          """(1\.4\.1)|""" +
+          """(1\.5\.0)""" +
+        """)(-.*)?"""
+      ).r
+
       val version = sparkSubmitVersion(livyConf)
-      version match {
-        case "1.3.0" | "1.3.1" | "1.4.0" | "1.5.0" =>
+
+      versions_regex.findFirstIn(version) match {
+        case Some(_) =>
           logger.info(f"Using spark-submit version $version")
-        case _ =>
+        case None =>
           logger.warn(f"Warning, livy has not been tested with spark-submit version $version")
       }
     } catch {