try fixing the jobs with persistence

input-output-hk · Oct 26, 2020 · e5ef319 · e5ef319
1 parent 93a57d5
commit e5ef319
Show file tree

Hide file tree

Showing 12 changed files with 253 additions and 325 deletions.
diff --git a/clusters/vit/testnet/default.nix b/clusters/vit/testnet/default.nix
@@ -64,7 +64,7 @@ in {
           desiredCapacity = 1;
           instanceType = "t3a.large";
           associatePublicIP = true;
-          maxInstanceLifetime = 604800;
+          maxInstanceLifetime = 0;
           iam.role = cluster.iam.roles.client;
           iam.instanceProfile.role = cluster.iam.roles.client;
 
@@ -167,9 +167,7 @@ in {
         privateIP = "172.16.0.20";
         subnet = cluster.vpc.subnets.core-1;
         volumeSize = 40;
-        route53.domains = [
-          "*.${cluster.domain}"
-        ];
+        route53.domains = [ "*.${cluster.domain}" ];
 
         modules = let
           extraConfig = pkgs.writeText "extra-config.nix" ''
@@ -188,7 +186,8 @@ in {
         ];
 
         securityGroupRules = {
-          inherit (securityGroupRules) internet internal ssh http https vit-public-rpc;
+          inherit (securityGroupRules)
+            internet internal ssh http https vit-public-rpc;
         };
       };
     };

diff --git a/clusters/vit/testnet/host_volumes.nix b/clusters/vit/testnet/host_volumes.nix
@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   # services.nomad.client = {
   #   host_volume = [{
   #     name = "ca-certificates";

diff --git a/clusters/vit/testnet/seaweedfs.nix b/clusters/vit/testnet/seaweedfs.nix
@@ -1,22 +1,6 @@
 { config, lib, ... }:
 let cores = [ "core-1" "core-2" "core-3" ];
 in {
-  # services.cockroachdb = {
-  #   enable = true;
-  #   insecure = true;
-  #   listen.address = "0.0.0.0";
-  #   join = lib.concatStringsSep "," (lib.forEach cores (core:
-  #     "${config.cluster.instances.${core}.privateIP}:${
-  #       toString config.services.cockroachdb.listen.port
-  #     }"));
-  # };
-
-# seaweed+ 10911  weed -v 4 filer -port 8888 -ip 172.16.2.10 -ip.bind 172.16.2.10 -master 172.16.0.10:9333,172.16.1.10:9333 -s3.port 8333
-# 
-# seaweed+  3775  weed -v 4 volume -port 8080 -dir /var/lib/seaweedfs-volume -metricsPort 9334 -minFreeSpacePercent 1 -dataCenter eu-central-1 -max 0 -mserver 172.16.0.10:9333,172.16.1.10:9333 -ip 172.16.2.10 -ip.bind 172.16.2.10
-# 
-# seaweed+  9697  weed -v 3 master -port 9333 -mdir /var/lib/seaweedfs-master -peers 172.16.0.10:9333,172.16.1.10:9333 -ip 172.16.2.10 -ip.bind 172.16.2.10 -volumeSizeLimitMB 1000 -volumePreallocate
-
   services.seaweedfs.filer = {
     enable = true;
 
@@ -25,7 +9,7 @@ in {
         toString config.services.seaweedfs.master.port
       }");
 
-    peers = lib.forEach ["core-3"] (core:
+    peers = lib.forEach [ "core-3" ] (core:
       "${config.cluster.instances.${core}.privateIP}:${
         toString config.services.seaweedfs.filer.http.port
       }");
@@ -38,8 +22,7 @@ in {
   services.seaweedfs.mount = {
     enable = true;
     mounts = {
-      # nomad-vit-testnet = "vit-testnet";
-      "nomad-vit-store" = "vit-store";
+      nomad = "nomad";
     };
   };
 }
diff --git a/clusters/vit/testnet/security-group-rules.nix b/clusters/vit/testnet/security-group-rules.nix
@@ -5,8 +5,7 @@ let
   vpcs = pkgs.terralib.vpcs config.cluster;
 
   global = [ "0.0.0.0/0" ];
-  internal = [ config.cluster.vpc.cidr ]
-    ++ (lib.forEach vpcs (vpc: vpc.cidr));
+  internal = [ config.cluster.vpc.cidr ] ++ (lib.forEach vpcs (vpc: vpc.cidr));
 in {
   # TODO: derive needed security groups from networking.firewall?
   securityGroupRules = {

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -12,7 +12,7 @@
       "github:input-output-hk/rust-libs.nix/vit-servicing-station";
     ops-lib.url = "github:input-output-hk/ops-lib/zfs-image?dir=zfs";
     jormungandr-nix = {
-      url ="github:input-output-hk/jormungandr-nix";
+      url = "github:input-output-hk/jormungandr-nix";
       flake = false;
     };
     vit-servicing-station = {

diff --git a/jobs/block0.bin b/jobs/block0.bin
diff --git a/jobs/store.nix b/jobs/store.nix
@@ -6,9 +6,7 @@ in {
     taskGroups = {
       ${jobPrefix} = {
         tasks.${jobPrefix} = systemdSandbox {
-          mountPaths = {
-            "${jobPrefix}" = "/persistent";
-          };
+          mountPaths = { "${jobPrefix}" = "/persistent"; };
 
           name = jobPrefix;
 
@@ -17,14 +15,14 @@ in {
 
             set -x
 
-            echo Attempt 6
+            echo Attempt 7
 
             for i in $(seq 1 120); do
               echo "$i $(date)"
               ls -laR
               cat persistent/goodbye || true
               echo $i $RANDOM > persistent/goodbye || true
-              sleep 1
+              sleep 10
             done
           '';