cb3cd0e9c5b9006b7d316df7905faa516f880c6b
hiram
  Fri Apr 5 00:33:00 2024 -0700
sending to both hgdownload1 and hgdownload2 no redmine

diff --git src/hg/makeDb/doc/asmHubs/asmHubs.mk src/hg/makeDb/doc/asmHubs/asmHubs.mk
index d4b6881..c293fa7 100644
--- src/hg/makeDb/doc/asmHubs/asmHubs.mk
+++ src/hg/makeDb/doc/asmHubs/asmHubs.mk
@@ -1,46 +1,50 @@
 # generic makefile to construct the index pages and symlinks
 # for any assembly hub
 #
 # will be included by those individual build directories with the
 # following variables defined to customize the resulting files:
 #
 # destDir, srcDir, orderList, indexName, testIndexName,
 # statsName, testStatsName, dataName, testDataName, genomesTxt, hubFile
 # testHubFile, Name and name
 
 toolsDir=${HOME}/kent/src/hg/makeDb/doc/asmHubs
 htdocsHgDownload=/usr/local/apache/htdocs-hgdownload
 hubsDownload=${htdocsHgDownload}/hubs/${name}
 asmHubSrc=/hive/data/genomes/asmHubs/${name}
+downloadDest1=hgdownload1.soe.ucsc.edu
+downloadDest2=hgdownload2.soe.ucsc.edu
+# 2024-02-06 hgdownload2.gi.ucsc.edu has address 128.114.198.53
 
 all:: sanityCheck makeDirs mkGenomes symLinks hubIndex asmStats trackData hubTxt groupsTxt
 
 makeDirs:
 	mkdir -p ${destDir}
 
 sanityCheck:
 	@goodBad=$$(cut -d'_' -f1-2 ${orderList} | sort | uniq -c | awk '$$1 > 1' | wc -l); \
 	if [ $$goodBad -ne 0 ]; then \
 	    tsvFile=$$(basename ${orderList}); \
 	    echo "ERROR: duplicate accession in '$$tsvFile'"; \
 	    cut -d'_' -f1-2 ${orderList} | sort | uniq -c | awk '$$1 > 1'; \
 	    exit 255; \
 	fi
 
 sshKeyDownload:
-	ssh -o PasswordAuthentication=no qateam@hgdownload date
+	ssh -o PasswordAuthentication=no qateam@${downloadDest1} date
+	ssh -o PasswordAuthentication=no qateam@${downloadDest2} date
 
 sshKeyDynablat:
 	ssh -o PasswordAuthentication=no qateam@dynablat-01 date
 
 sshKeyCheck: sshKeyDownload sshKeyDynablat
 	@printf "# ssh keys to hgdownload and dynablat-01 are good\n"
 
 mkGenomes::
 	@printf "# starting mkGenomes " 1>&2
 	@date "+%s %F %T" 1>&2
 	${toolsDir}/mkGenomes.pl dynablat-01 4040 ${orderList} > ${destDir}/${genomesTxt}.txt
 	rm -f ${destDir}/download.${genomesTxt}.txt
 	cp -p ${destDir}/${genomesTxt}.txt ${destDir}/download.${genomesTxt}.txt
 	@printf "# finished mkGenomes " 1>&2
 	@date "+%s %F %T" 1>&2
@@ -93,52 +97,79 @@
 clean::
 	rm -f ${destDir}/${hubFile}.txt
 	rm -f ${destDir}/${testHubFile}.txt
 	rm -f ${destDir}/groups.txt
 	rm -f ${destDir}/${genomesTxt}.txt
 	rm -f ${destDir}/${indexName}.html
 	rm -f ${destDir}/${testIndexName}.html
 	rm -f ${destDir}/${statsName}.html
 	rm -f ${destDir}/${testStatsName}.html
 
 sendDownload:: sshKeyCheck
 	${toolsDir}/mkSendList.pl ${orderList} | while read F; do \
 	  ${toolsDir}/sendToHgdownload.sh $$F < /dev/null; done
 	rsync -L -a -P \
   /usr/local/apache/htdocs-hgdownload/hubs/${name}/groups.txt \
-		qateam@hgdownload:/mirrordata/hubs/${name}/
+		qateam@${downloadDest1}:/mirrordata/hubs/${name}/
+	rsync -L -a -P \
+  /usr/local/apache/htdocs-hgdownload/hubs/${name}/groups.txt \
+		qateam@${downloadDest2}:/mirrordata/hubs/${name}/
 	rsync -L -a -P \
   /usr/local/apache/htdocs-hgdownload/hubs/${name}/${hubFile}.txt \
-		qateam@hgdownload:/mirrordata/hubs/${name}/
+		qateam@${downloadDest1}:/mirrordata/hubs/${name}/
+	rsync -L -a -P \
+  /usr/local/apache/htdocs-hgdownload/hubs/${name}/${hubFile}.txt \
+		qateam@${downloadDest2}:/mirrordata/hubs/${name}/
 	rsync -L -a -P \
   /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${indexName}.html \
-		qateam@hgdownload:/mirrordata/hubs/${name}/${indexName}.html
+		qateam@${downloadDest1}:/mirrordata/hubs/${name}/${indexName}.html
+	rsync -L -a -P \
+  /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${indexName}.html \
+		qateam@${downloadDest2}:/mirrordata/hubs/${name}/${indexName}.html
+	rsync -L -a -P \
+  /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${statsName}.html \
+		qateam@${downloadDest1}:/mirrordata/hubs/${name}/${statsName}.html
 	rsync -L -a -P \
   /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${statsName}.html \
-		qateam@hgdownload:/mirrordata/hubs/${name}/${statsName}.html
+		qateam@${downloadDest2}:/mirrordata/hubs/${name}/${statsName}.html
+	rsync -L -a -P \
+  /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${dataName}.html \
+		qateam@${downloadDest1}:/mirrordata/hubs/${name}/${dataName}.html
 	rsync -L -a -P \
   /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${dataName}.html \
-		qateam@hgdownload:/mirrordata/hubs/${name}/${dataName}.html
+		qateam@${downloadDest2}:/mirrordata/hubs/${name}/${dataName}.html
+	rsync -L -a -P \
+  /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${genomesTxt}.txt \
+		qateam@${downloadDest1}:/mirrordata/hubs/${name}/${genomesTxt}.txt
 	rsync -L -a -P \
   /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${genomesTxt}.txt \
-		qateam@hgdownload:/mirrordata/hubs/${name}/${genomesTxt}.txt
+		qateam@${downloadDest2}:/mirrordata/hubs/${name}/${genomesTxt}.txt
 
 verifyTestDownload:
 	${toolsDir}/verifyOnDownload.sh api-test.gi.ucsc.edu ${orderList}
 
 verifyDownload:
 	${toolsDir}/verifyOnDownload.sh apibeta.soe.ucsc.edu ${orderList}
 
 verifyDynamicBlat:
 	grep -v "^#" ${orderList} | cut -d'_' -f1-2 | while read asmId; do \
 	  ${toolsDir}/testDynBlat.sh $$asmId < /dev/null; done
 
 sendIndexes::
 	rsync -L -a -P \
   /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${indexName}.html \
-		qateam@hgdownload:/mirrordata/hubs/${name}/${indexName}.html
+		qateam@${downloadDest1}:/mirrordata/hubs/${name}/${indexName}.html
+	rsync -L -a -P \
+  /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${indexName}.html \
+		qateam@${downloadDest2}:/mirrordata/hubs/${name}/${indexName}.html
 	rsync -L -a -P \
   /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${statsName}.html \
-		qateam@hgdownload:/mirrordata/hubs/${name}/${statsName}.html
+		qateam@${downloadDest1}:/mirrordata/hubs/${name}/${statsName}.html
+	rsync -L -a -P \
+  /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${statsName}.html \
+		qateam@${downloadDest2}:/mirrordata/hubs/${name}/${statsName}.html
+	rsync -L -a -P \
+  /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${dataName}.html \
+		qateam@${downloadDest1}:/mirrordata/hubs/${name}/${dataName}.html
 	rsync -L -a -P \
   /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${dataName}.html \
-		qateam@hgdownload:/mirrordata/hubs/${name}/${dataName}.html
+		qateam@${downloadDest2}:/mirrordata/hubs/${name}/${dataName}.html