From 4bfedf8d7cf9a26edf809e66b769d5e0c2b7f089 Mon Sep 17 00:00:00 2001 From: Parthiv Seetharaman Date: Fri, 18 Nov 2022 18:03:06 -0800 Subject: [PATCH 1/2] Fix error with no snapshot and issue warning --- nix/cardano/entrypoints.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/nix/cardano/entrypoints.nix b/nix/cardano/entrypoints.nix index 2a5d3c67e4..df1dd45df7 100644 --- a/nix/cardano/entrypoints.nix +++ b/nix/cardano/entrypoints.nix @@ -308,8 +308,12 @@ in { if [ -n "''${ENVIRONMENT:-}" ] && [ -n "''${USE_SNAPSHOT:-}" ]; then # we are using a standard environment that already has known snapshots snapshots="${builtins.toFile "snapshots.json" (builtins.toJSON constants.node-snapshots)}" - SNAPSHOT_BASE_URL="$(jq -e -r --arg CADRENV "$ENVIRONMENT" '.[$CADRENV].base_url' < "$snapshots")" - SNAPSHOT_FILE_NAME="$(jq -e -r --arg CADRENV "$ENVIRONMENT" '.[$CADRENV].file_name' < "$snapshots")" + if jq -e 'has("$ENVIRONMENT")' > /dev/null < "$snapshots"; then + SNAPSHOT_BASE_URL="$(jq -e -r --arg CADRENV "$ENVIRONMENT" '.[$CADRENV].base_url' < "$snapshots")" + SNAPSHOT_FILE_NAME="$(jq -e -r --arg CADRENV "$ENVIRONMENT" '.[$CADRENV].file_name' < "$snapshots")" + else + echo "Warning: No snapshot is being used, there isn't one for $ENVIRONMENT" + fi fi if [ -n "''${SNAPSHOT_BASE_URL:-}" ]; then pull_snapshot @@ -451,8 +455,12 @@ in { if [ -n "''${ENVIRONMENT:-}" ] && [ -n "''${USE_SNAPSHOT:-}" ]; then # we are using a standard environment that already has known snapshots snapshots="${builtins.toFile "snapshots.json" (builtins.toJSON constants.db-sync-snapshots)}" - SNAPSHOT_BASE_URL="$(jq -e -r --arg CADRENV "$ENVIRONMENT" '.[$CADRENV].base_url' < "$snapshots")" - SNAPSHOT_FILE_NAME="$(jq -e -r --arg CADRENV "$ENVIRONMENT" '.[$CADRENV].file_name' < "$snapshots")" + if jq -e 'has("$ENVIRONMENT")' > /dev/null < "$snapshots"; then + SNAPSHOT_BASE_URL="$(jq -e -r --arg CADRENV "$ENVIRONMENT" '.[$CADRENV].base_url' < "$snapshots")" + SNAPSHOT_FILE_NAME="$(jq -e -r --arg CADRENV "$ENVIRONMENT" '.[$CADRENV].file_name' < "$snapshots")" + else + echo "Warning: No snapshot is being used, there isn't one for $ENVIRONMENT" + fi fi if [ -n "''${SNAPSHOT_BASE_URL:-}" ]; then [ -z "''${PGPASSFILE-}" ] && echo "PGPASSFILE env var must be set (either manually or via vault kv discovery) -- aborting" && exit 1 From 1593f6c745970b3e5dbbc8549201d8bb369c3b35 Mon Sep 17 00:00:00 2001 From: Parthiv Seetharaman Date: Tue, 22 Nov 2022 08:22:56 -0800 Subject: [PATCH 2/2] fix: default EDGE_NODE value to compare to --- nix/cardano/entrypoints.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/cardano/entrypoints.nix b/nix/cardano/entrypoints.nix index df1dd45df7..90b90f9eb8 100644 --- a/nix/cardano/entrypoints.nix +++ b/nix/cardano/entrypoints.nix @@ -294,7 +294,7 @@ in { # in nomad: producer is always the node with index 0 producer=0 [ "''${NOMAD_ALLOC_INDEX:-1}" -eq "0" ] && [ -z "''${EDGE_NODE:-}" ] && producer=1 - [ "''${EDGE_NODE:-}" -eq "1" ] && LEDGER_SLOT=-1 + [ "''${EDGE_NODE:-0}" -eq "1" ] && LEDGER_SLOT=-1 ${prelude}