diff options
| author | illustris <rharikrishnan95@gmail.com> | 2023-11-04 13:01:45 +0530 |
|---|---|---|
| committer | illustris <rharikrishnan95@gmail.com> | 2023-11-04 13:01:45 +0530 |
| commit | ef9732e11f242a17b5b1a7e58397006a3c8f77d9 (patch) | |
| tree | fc2d2ea073190f339cb7175c33faf9130e4dae2c /nixos | |
| parent | 392bc5422573ffce67a5ac924bc6494398150edb (diff) | |
| download | nixlib-ef9732e11f242a17b5b1a7e58397006a3c8f77d9.tar nixlib-ef9732e11f242a17b5b1a7e58397006a3c8f77d9.tar.gz nixlib-ef9732e11f242a17b5b1a7e58397006a3c8f77d9.tar.bz2 nixlib-ef9732e11f242a17b5b1a7e58397006a3c8f77d9.tar.lz nixlib-ef9732e11f242a17b5b1a7e58397006a3c8f77d9.tar.xz nixlib-ef9732e11f242a17b5b1a7e58397006a3c8f77d9.tar.zst nixlib-ef9732e11f242a17b5b1a7e58397006a3c8f77d9.zip | |
spark: remove untarDir
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/cluster/spark/default.nix | 16 | ||||
| -rw-r--r-- | nixos/tests/spark/default.nix | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/nixos/modules/services/cluster/spark/default.nix b/nixos/modules/services/cluster/spark/default.nix index bf39c5537332..985ff24d62c8 100644 --- a/nixos/modules/services/cluster/spark/default.nix +++ b/nixos/modules/services/cluster/spark/default.nix @@ -69,8 +69,8 @@ with lib; confDir = mkOption { type = types.path; description = lib.mdDoc "Spark configuration directory. Spark will use the configuration files (spark-defaults.conf, spark-env.sh, log4j.properties, etc) from this directory."; - default = "${cfg.package}/lib/${cfg.package.untarDir}/conf"; - defaultText = literalExpression ''"''${package}/lib/''${package.untarDir}/conf"''; + default = "${cfg.package}/conf"; + defaultText = literalExpression ''"''${package}/conf"''; }; logDir = mkOption { type = types.path; @@ -113,9 +113,9 @@ with lib; Type = "forking"; User = "spark"; Group = "spark"; - WorkingDirectory = "${cfg.package}/lib/${cfg.package.untarDir}"; - ExecStart = "${cfg.package}/lib/${cfg.package.untarDir}/sbin/start-master.sh"; - ExecStop = "${cfg.package}/lib/${cfg.package.untarDir}/sbin/stop-master.sh"; + WorkingDirectory = "${cfg.package}/"; + ExecStart = "${cfg.package}/sbin/start-master.sh"; + ExecStop = "${cfg.package}/sbin/stop-master.sh"; TimeoutSec = 300; StartLimitBurst=10; Restart = "always"; @@ -136,9 +136,9 @@ with lib; serviceConfig = { Type = "forking"; User = "spark"; - WorkingDirectory = "${cfg.package}/lib/${cfg.package.untarDir}"; - ExecStart = "${cfg.package}/lib/${cfg.package.untarDir}/sbin/start-worker.sh spark://${cfg.worker.master}"; - ExecStop = "${cfg.package}/lib/${cfg.package.untarDir}/sbin/stop-worker.sh"; + WorkingDirectory = "${cfg.package}/"; + ExecStart = "${cfg.package}/sbin/start-worker.sh spark://${cfg.worker.master}"; + ExecStop = "${cfg.package}/sbin/stop-worker.sh"; TimeoutSec = 300; StartLimitBurst=10; Restart = "always"; diff --git a/nixos/tests/spark/default.nix b/nixos/tests/spark/default.nix index 63d6a5d44db8..eed7db35bf4f 100644 --- a/nixos/tests/spark/default.nix +++ b/nixos/tests/spark/default.nix @@ -41,6 +41,7 @@ let worker.wait_for_unit("spark-worker.service") worker.copy_from_host( "${./spark_sample.py}", "/spark_sample.py" ) assert "<title>Spark Master at spark://" in worker.succeed("curl -sSfkL http://master:8080/") + worker.succeed("spark-submit --version | systemd-cat") worker.succeed("spark-submit --master spark://master:7077 --executor-memory 512m --executor-cores 1 /spark_sample.py") ''; }); |