stellar#4475:pr feedback, trim space on env variable for job_index name

sreuland · Aug 28, 2022 · cd6322a · cd6322a
1 parent 0bcf070
commit cd6322a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml
@@ -122,6 +122,7 @@ jobs:
     - if: github.ref == 'refs/heads/master'
       name: Push to DockerHub
       run: docker push stellar/horizon-verify-range:latest
+
   horizon-light:
     name: Test and Push the horizon light images
     runs-on: ubuntu-latest
@@ -141,18 +142,18 @@ jobs:
           docker run -e ARCHIVE_TARGET=file:///ledgerexport\
                      -e START=5\
                      -e END=150\
-                     -e NETWORK_PASSPHRASE="Test SDF Network ; September 2015"\
-                     -e CAPTIVE_CORE_CONFIG="/captive-core-testnet.cfg"\
-                     -e HISTORY_ARCHIVE_URLS="https://history.stellar.org/prd/core-testnet/core_testnet_001,https://history.stellar.org/prd/core-testnet/core_testnet_002"\
+                     -e NETWORK_PASSPHRASE="Public Global Stellar Network ; September 2015"\
+                     -e CAPTIVE_CORE_CONFIG="/captive-core-pubnet.cfg"\
+                     -e HISTORY_ARCHIVE_URLS="https://history.stellar.org/prd/core-live/core_live_001"\
                      -v $PWD/ledgerexport:/ledgerexport\
                      stellar/lighthorizon-ledgerexporter
           
           # run map job
-          docker run -e NETWORK_PASSPHRASE='testnet' -e JOB_INDEX_ENV=AWS_BATCH_JOB_ARRAY_INDEX -e AWS_BATCH_JOB_ARRAY_INDEX=0 -e BATCH_SIZE=64 -e FIRST_CHECKPOINT=64 \
+          docker run -e NETWORK_PASSPHRASE='prodnet' -e JOB_INDEX_ENV=AWS_BATCH_JOB_ARRAY_INDEX -e AWS_BATCH_JOB_ARRAY_INDEX=0 -e BATCH_SIZE=64 -e FIRST_CHECKPOINT=64 \
                      -e WORKER_COUNT=1 -e RUN_MODE=map -v $PWD/ledgerexport:/ledgermeta -e TXMETA_SOURCE=file:///ledgermeta -v $PWD/index:/index -e INDEX_TARGET=file:///index stellar/lighthorizon-index-batch
 
           # run reduce job
-          docker run -e NETWORK_PASSPHRASE='testnet' -e JOB_INDEX_ENV=AWS_BATCH_JOB_ARRAY_INDEX -e AWS_BATCH_JOB_ARRAY_INDEX=0 -e MAP_JOB_COUNT=1 -e REDUCE_JOB_COUNT=1 \
+          docker run -e NETWORK_PASSPHRASE='prodnet' -e JOB_INDEX_ENV=AWS_BATCH_JOB_ARRAY_INDEX -e AWS_BATCH_JOB_ARRAY_INDEX=0 -e MAP_JOB_COUNT=1 -e REDUCE_JOB_COUNT=1 \
                      -e WORKER_COUNT=1 -e RUN_MODE=reduce -v $PWD/index:/index -e INDEX_SOURCE_ROOT=file:///index -e INDEX_TARGET=file:///index stellar/lighthorizon-index-batch
                      
       # Push images

diff --git a/exp/lighthorizon/build/index-batch/README.md b/exp/lighthorizon/build/index-batch/README.md
@@ -1,4 +1,4 @@
-# `stellar/horizon-indexer`
+# `stellar/lighthorizon-index-batch`
 
 This docker image contains the ledger/checkpoint indexing executables. It allows running multiple instances of `map`/`reduce` on a single machine or running it in [AWS Batch](https://aws.amazon.com/batch/).
 

diff --git a/...8s/lighthorizon_batch_reduce_job copy.yml → ...ild/k8s/lighthorizon_batch_reduce_job.yml b/...8s/lighthorizon_batch_reduce_job copy.yml → ...ild/k8s/lighthorizon_batch_reduce_job.yml
@@ -20,11 +20,11 @@ spec:
         - name: RUN_MODE
           value: "reduce" 
         - name: MAP_JOB_COUNT
-          value: 52
+          value: "52"
         - name: REDUCE_JOB_COUNT
-          value: 52   
+          value: "52"   
         - name: WORKER_COUNT
-          value: 8   
+          value: "8"   
         - name: INDEX_SOURCE_ROOT
           value: "<url of index location>"
         - name: JOB_INDEX_ENV

diff --git a/exp/lighthorizon/index/cmd/batch/reduce/main.go b/exp/lighthorizon/index/cmd/batch/reduce/main.go
@@ -40,7 +40,7 @@ func ReduceConfigFromEnvironment() (*ReduceConfig, error) {
 		indexTargetEnv     = "INDEX_TARGET"
 	)
 
-	jobIndexEnv := os.Getenv(jobIndexEnvName)
+	jobIndexEnv := strings.TrimSpace(os.Getenv(jobIndexEnvName))
 	if jobIndexEnv == "" {
 		return nil, errors.New("env variable can't be empty " + jobIndexEnvName)
 	}