Explorar o código

[livy] Move the spark-shell script

Erick Tryzelaar %!s(int64=10) %!d(string=hai) anos
pai
achega
e4c00dc

+ 27 - 0
apps/spark/java/bin/spark-shell

@@ -0,0 +1,27 @@
+#!/bin/bash
+# Licensed to Cloudera, Inc. under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  Cloudera, Inc. licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Runs spark shell server.
+
+set -e
+
+export LIVY_HOME=$(cd $(dirname $0)/.. && pwd)
+
+exec java \
+	-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006 \
+	-cp "$LIVY_HOME/livy-repl/target/lib/*:$LIVY_HOME/livy-repl/target/livy-repl-3.7.0-SNAPSHOT.jar" \
+	com.cloudera.hue.livy.repl.Main -usejavacp "$@"

+ 1 - 1
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/SparkProcessSession.scala

@@ -6,7 +6,7 @@ import scala.io.Source
 
 object SparkProcessSession {
   val LIVY_HOME = System.getenv("LIVY_HOME")
-  val SPARK_SHELL = LIVY_HOME + "/spark-shell"
+  val SPARK_SHELL = LIVY_HOME + "/bin/spark-shell"
 
   def create(id: String): Session = {
     val (process, port) = startProcess()

+ 0 - 8
apps/spark/spark-shell

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-cd `dirname $0`
-
-exec java \
-	-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006 \
-	-cp "java/livy-repl/target/lib/*:java/livy-repl/target/livy-repl-3.7.0-SNAPSHOT.jar" \
-	com.cloudera.hue.livy.repl.Main -usejavacp "$@" 2>/dev/null