From bde8b51fc40a02e6e8514ff428a748a133502c34 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Sat, 18 Jul 2020 16:47:32 +0200
Subject: Default to local Spark instance

---
 docker-compose.yml                                 | 42 ----------------------
 .../kotlin/com/atlarge/opendc/runner/web/Main.kt   |  4 +--
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ecd2fceb..d4954f58 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,11 +39,8 @@ services:
     restart: on-failure
     networks:
       - backend
-      - spark
     depends_on:
       - mongo
-      - spark-master
-      - spark-worker
     volumes:
       - type: bind
         source: ./traces
@@ -59,44 +56,6 @@ services:
      - OPENDC_DB_PASSWORD
      - OPENDC_DB_HOST=mongo
      - OPENDC_OUTPUT=/results
-     - OPENDC_SPARK=spark://spark-master:7077
-
-  spark-master:
-    image: docker.io/bitnami/spark:3-debian-10
-    networks:
-      - spark
-    environment:
-      - SPARK_MODE=master
-      - SPARK_RPC_AUTHENTICATION_ENABLED=no
-      - SPARK_RPC_ENCRYPTION_ENABLED=no
-      - SPARK_LOCAL_STORAGE_ENCRYPTION_ENABLED=no
-      - SPARK_SSL_ENABLED=no
-    # Comment out for public deployment
-    ports:
-      - "8080:8080"
-      - "7077:7077"
-
-  spark-worker:
-    image: docker.io/bitnami/spark:3-debian-10
-    networks:
-      - spark
-    depends_on:
-      - spark-master
-    volumes:
-      - type: volume
-        source: results-volume
-        target: /results
-    environment:
-      - SPARK_MODE=worker
-      - SPARK_MASTER_URL=spark://spark-master:7077
-      - SPARK_WORKER_MEMORY=2G
-      - SPARK_WORKER_CORES=2
-      - SPARK_RPC_AUTHENTICATION_ENABLED=no
-      - SPARK_RPC_ENCRYPTION_ENABLED=no
-      - SPARK_LOCAL_STORAGE_ENCRYPTION_ENABLED=no
-      - SPARK_SSL_ENABLED=no
-    ports:
-    - "7081:8081"
 
   mongo:
     build:
@@ -138,4 +97,3 @@ volumes:
 
 networks:
   backend: {}
-  spark: {}
diff --git a/simulator/opendc/opendc-runner-web/src/main/kotlin/com/atlarge/opendc/runner/web/Main.kt b/simulator/opendc/opendc-runner-web/src/main/kotlin/com/atlarge/opendc/runner/web/Main.kt
index 86696887..0ff9b870 100644
--- a/simulator/opendc/opendc-runner-web/src/main/kotlin/com/atlarge/opendc/runner/web/Main.kt
+++ b/simulator/opendc/opendc-runner-web/src/main/kotlin/com/atlarge/opendc/runner/web/Main.kt
@@ -123,7 +123,7 @@ class RunnerCli : CliktCommand(name = "runner") {
         help = "Spark master to connect to",
         envvar = "OPENDC_SPARK"
     )
-        .required()
+        .default("local[*]")
 
     /**
      * Connect to the user-specified database.
@@ -284,7 +284,7 @@ class RunnerCli : CliktCommand(name = "runner") {
         val portfolios = database.getCollection("portfolios")
         val topologies = database.getCollection("topologies")
 
-        logger.info { "Loading Spark" }
+        logger.info { "Launching Spark" }
         val resultProcessor = ResultProcessor(spark, outputPath)
 
         logger.info { "Watching for queued scenarios" }
-- 
cgit v1.2.3