xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

accounting for dx1/dx2/dx3/dx4, px1/px2, cpsbn

Browse source 
Former-commit-id: c7c24571fb
Former-commit-id: 7d00ef88cc
This commit is contained in:
AWIPS User 2015-09-07 09:58:14 -06:00
parent e12c718569
commit d0fb25a618
15 changed files with 45 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.uf.viz.collaboration.ui/localization/collaboration/config.xml
View file

@ -4,7 +4,7 @@
of adding sites to subscribe to in the feed -->
<siteConfigInformation>
<!-- hosts must be added, these will show up in the login dialog -->
<server hostname="dx1-oma.oma.us.ray.com" prettyName="Omaha Cluster"></server>
<server hostname="localhost" prettyName="Omaha Cluster"></server>
<!-- <server hostname="dx3-oma.oma.us.ray.com" prettyName="Omaha Secondary Cluster"></server>-->
<config site="OAX">
<subscribedSites>OAX</subscribedSites>

2
cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
View file

@ -1689,7 +1689,7 @@ Scripts = [
"-d {productDB} ",
"Make and Send HTI:" +
"xterm -e ssh px2f /awips2/GFESuite/hti/bin/make_hti.sh {site}",
"xterm -e /awips2/GFESuite/hti/bin/make_hti.sh {site}",
"Official Grids to LDAD: " +
"ifpAG -h {host} -r {port} -o - -d {productDB} | gzip -9 > " +

2
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/Run_NWPS.py
View file

@ -179,5 +179,5 @@ class Procedure (SmartScript.SmartScript):
f.close()
os.chmod('/tmp/nwps/inp_args',0o666)
os.system('scp -rp /tmp/nwps/inp_args px2f:/awips2/GFESuite/nwps/var/')
os.system('cp -r /tmp/nwps/inp_args /awips2/GFESuite/nwps/var/')
shutil.rmtree('/tmp/nwps')

6
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/IrtAccess.py
View file

@ -577,8 +577,10 @@ class IrtAccess():
# server search list in priority. The px3 entries are used for
# dual domain for AFC.
hp = [('dx4','98000000'),('px3', '98000000'), ('dx4','98000001'),
('px3', '98000001')]
#hp = [('dx4','98000000'),('px3', '98000000'), ('dx4','98000001'),
# ('px3', '98000001')]
# 2015-09-07 mjames@ucar
hp = [('localhost','98000000'),('localhost','98000001')]
# choose one server from this domain, find first dx4, 98000000
# try to use one with the same mhsidDest as the site, which

2
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscDataRec.py
View file

@ -121,7 +121,7 @@ def execIscDataRec(MSGID,SUBJECT,FILES):
iscE = Element('isc')
destinationsE = SubElement(iscE, 'destinations')
for x in xrange(98000000, 98000002):
for shost in ['dx4f','px3f']:
for shost in ['localhost']:
addressE = SubElement(destinationsE, 'address')
serverE = SubElement(addressE, 'server')
serverE.text = shost

28
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
View file

@ -113,12 +113,10 @@ def serverBoxText(server):
#returns text based on the server dictionary that should be placed
#into the dialog
hostport = None
if server['host'][0:3] in ['dx4', 'px3'] and server['port'] in \
['98000000', '98000001']:
if server['port'] == "98000000":
hostport = server['host'] + "-primary"
elif server['port'] == "98000001":
hostport = server['host'] + "-svcbu"
if server['port'] == "98000000":
hostport = server['host'] + "-primary"
elif server['port'] == "98000001":
hostport = server['host'] + "-svcbu"
if hostport is None:
hostport = server['host'] + "/" + server['port']
@ -142,21 +140,13 @@ def sortServers(a, b):
return 1
#both are same sites, check for host next
else:
regHostA = (a['host'][0:3] in ['dx4', 'px3'])
regHostB = (b['host'][0:3] in ['dx4', 'px3'])
if regHostA and not regHostB:
regPortA = (a['port'] == "98000000")
regPortB = (b['port'] == "98000000")
if regPortA and not regPortB:
return -1
elif not regHostA and regHostB:
elif not regPortA and regPortB:
return 1
# same host, but not preferred host
else:
regPortA = (a['port'] == "98000000")
regPortB = (b['port'] == "98000000")
if regPortA and not regPortB:
return -1
elif not regPortA and regPortB:
return 1
return 1 #must be non-standard, put at end of list
return 1 #must be non-standard, put at end of list
def createDomainDict(xml):
irt = IrtAccess.IrtAccess("")

22
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
View file

@ -239,15 +239,15 @@ mpe_display_maps : statesCounties
#################################################################################
# database selection tokens
server_name : ONLINE # Informix database server name
db_name : hd_ob92lwx # IHFS database name
damcat_db_name : dc_ob5xxx # Dam Catalog database name
server_name : ONLINE # Informix database server name
db_name : hd_ob92lwx # IHFS database name
damcat_db_name : dc_ob5xxx # Dam Catalog database name
hdb_db_name : ob81_histdata # Historical database.
pghost : dx1f # The machine PostGres is running on
pguser : awips # The user allowed to access PostGres
pgport : 5432 # The PostGres Server port
adb_name : adb_ob7xxx # RFC archive database name
rax_pghost : ax # The machine PostGres is running on for the adb
pghost : localhost # The machine PostGres is running on
pguser : awips # The user allowed to access PostGres
pgport : 5432 # The PostGres Server port
adb_name : adb_ob7xxx # RFC archive database name
rax_pghost : ax # The machine PostGres is running on for the adb
# vacuum log dir token.
vacuum_log_dir : $(whfs_log_dir)/vacuum
@ -281,11 +281,11 @@ damcrest_res_dir : $(whfs_config_dir)/damcrest
#===================== SHEFDECODE Application Tokens ================================
shefdecode_userid : oper # controlling UNIX user
shefdecode_host : dx1f # controlling UNIX system.
shefdecode_host : localhost # controlling UNIX system.
shefdecode_dir : $(apps_dir)/shefdecode # main directory location
shefdecode_bin : $(shefdecode_dir)/bin # executable programs location
shefdecode_input : $(shefdecode_dir)/input # SHEF parameter file location
shef_data_dir : /awips2/edex/data/shef # input products location
shef_data_dir : /awips2/edex/data/shef # input products location
shefdecode_log : $(shefdecode_dir)/logs/decoder # daily log files location
shef_error_dir : $(shefdecode_dir)/logs/product # product log files location
@ -397,7 +397,7 @@ sws_home_dir : $(whfs_bin_dir)/pa # SWS dir
# -----------------------------------------------------------------
gage_pp_userid : oper # controlling UNIX user
gage_pp_host : dx # controlling UNIX system
gage_pp_host : localhost # controlling UNIX system
gage_pp_data : $(pproc_local_data)/gpp_input # input data files location
gage_pp_log : $(pproc_log)/gage_pp # daily log files location
gage_pp_sleep : 10 # sleep duration in seconds in between queries

8
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
View file

@ -1,6 +1,6 @@
#!/bin/bash
# base path to save capture data to, will create subdirectory for each workstation
basePath="/data/fxa/cave"
basePath="/awips2/fxa/cave"
edexGrepString="edex.run.mode="
@ -11,11 +11,11 @@ REMOTE_SERVERS_TO_CHECK="${DX_SERVERS}"
# in case environ variable is undefined
if [ "$REMOTE_SERVERS_TO_CHECK" == "" ]; then
REMOTE_SERVERS_TO_CHECK="dx1f dx2f dx3 dx4"
REMOTE_SERVERS_TO_CHECK="localhost"
fi
# the database host to grab current running queries for
DATABASE_HOST="dx1f"
DATABASE_HOST="localhost"
# Flags to control what data capure grabs, to enable flag must be YES, anything else will be considered off.
RUN_JSTACK="Y"
@ -206,7 +206,7 @@ grabCurrentDatabaseQueries() {
t1=`date "+%Y%m%d %H:%M:%S"`
echo "${t1}: Capturing current database queries" >> $processFile
out_file="${dataPath}/database_queries.log"
echo "dx1f:5432:metadata:awips:awips" > ~/.pgpass; chmod 600 ~/.pgpass
echo "localhost:5432:metadata:awips:awips" > ~/.pgpass; chmod 600 ~/.pgpass
psql -d metadata -U awips -h ${DATABASE_HOST} -c "select datname, pid, client_addr, query, now()-xact_start as runningTime from pg_stat_activity where state != 'idle' order by runningTime desc;" >> $out_file 2>&1 &
fi
}

14
edexOsgi/com.raytheon.uf.tools.gfesuite/cli/rsyncGridsToCWF_client.sh
View file

@ -20,16 +20,4 @@ fi
host_name=`hostname`
host_name=`echo $host_name | cut -c1-3`
if [ $host_name != "dx3" ] && [ $host_name != "dx4" ]; then
CHK=`ssh -q -o "BatchMode yes" -o "ConnectTimeout 5" dx3 "echo success"`;
if [ "success" = $CHK ] >/dev/null 2>&1
then
echo "dx3 connection success - running on dx3"
ssh dx3 "/awips2/GFESuite/bin/rsyncGridsToCWF.sh ${1}"
else
echo "dx3 connection failure - running on dx4"
ssh dx4 "/awips2/GFESuite/bin/rsyncGridsToCWF.sh ${1}"
fi
else
/awips2/GFESuite/bin/rsyncGridsToCWF.sh ${1}
fi
/awips2/GFESuite/bin/rsyncGridsToCWF.sh ${1}

8
edexOsgi/com.raytheon.uf.tools.gfesuite/hti/bin/make_hti.sh
View file

@ -115,7 +115,9 @@ for PARM in $PARMS
do
# NOTE: cannot run ifpIMAGE on dx3/dx4 - must ssh to a px
echo "Creating ${PARM} image..." >> $LOG_FILE
ssh -x px2f "unset DISPLAY; ${GFEBINdir}/ifpIMAGE -site ${SITE} -c ${PARM} -o ${PRODUCTdir}"
#ssh -x px2f "unset DISPLAY; ${GFEBINdir}/ifpIMAGE -site ${SITE} -c ${PARM} -o ${PRODUCTdir}"
# 2015-09-07 mjames@ucar - remove px2f for standalone installation
unset DISPLAY; ${GFEBINdir}/ifpIMAGE -site ${SITE} -c ${PARM} -o ${PRODUCTdir}
convert ${PRODUCTdir}/${SITE}${PARM}.png -resize 104x148 ${PRODUCTdir}/${SITE}${PARM}_sm.png
done
@ -123,7 +125,9 @@ rm -f ${PRODUCTdir}/*.info
# Generate KML automatically via runProcedure
echo "Running KML procedure." >> $LOG_FILE
ssh -x px2f "unset DISPLAY; ${GFEBINdir}/runProcedure -site ${SITE} -n TCImpactGraphics_KML -c gfeConfig"
#ssh -x px2f "unset DISPLAY; ${GFEBINdir}/runProcedure -site ${SITE} -n TCImpactGraphics_KML -c gfeConfig"
# 2015-09-07 mjames@ucar
unset DISPLAY; ${GFEBINdir}/runProcedure -site ${SITE} -n TCImpactGraphics_KML -c gfeConfig
# Create legends for KML
${HTI_HOME}/bin/kml_legend.sh

4
edexOsgi/com.raytheon.uf.tools.gfesuite/nwps/bin/runManualNWPS_OutsideAWIPS.sh
View file

@ -41,8 +41,8 @@ DIR="/data/ldad/nwps/input"
Program="/awips2/GFESuite/bin/ifpnetCDF"
DB="${SITEID}_GRID__Fcst_00000000_0000"
GFESERVER="ec"
RUNSERVER="px"
GFESERVER="localhost"
RUNSERVER="localhost"
WRKSWN="${NWPSLOCAL}/SUAWRKNWP.dat"
Output_Dir="${NWPSLOCAL}/input"

2
nativeLib/files.native/awipsShare/hydroapps/set_hydro_env
View file

@ -59,7 +59,7 @@ export FXA_BIN_DIR=$FXA_HOME/bin
# The following variables provide a JDBC URL or pieces thereof for
# SSHP and any other java programs that access the IHFS database
# The final form of the url is something like
# jdbc:postgresql://dx1:5432/hd_ob6abc?user=oper
# jdbc:postgresql://localhost:5432/hd_ob6abc?user=oper
export PGHOST=$(get_apps_defaults pghost)
export PGPORT=$(get_apps_defaults pgport)

2
nativeLib/files.native/awipsShare/hydroapps/whfs/bin/update_nrldb.pl
View file

@ -42,7 +42,7 @@ $config->define('help',{ ALIAS => 'h',ARGCOUNT => ARGCOUNT_NONE, ARGS => '!',DEF
$config->define('man',{ ALIAS => 'm',ARGCOUNT => ARGCOUNT_NONE, ARGS => '!',DEFAULT => 0});
$config->define('DBengine',{ VALIDATE => '[\w]+',DEFAULT => "Pg"});
$config->define('DBname',{ VALIDATE => '[\w]+',DEFAULT => "hd_ob8xxx"});
$config->define('DBhost',{ VALIDATE => '[-\w]+',DEFAULT => "dx1f"});
$config->define('DBhost',{ VALIDATE => '[-\w]+',DEFAULT => "localhost"});
$config->define('DBport',{ ARGS => '=i',DEFAULT => 5432});
$config->define('master',{ VALIDATE => '[.\w]+',DEFAULT => "HGstation"});
$config->define('basedir',{ VALIDATE => '[- /.\w]+',DEFAULT => $ENV{HYDROGENHOME} . "/bin"});

2
nativeLib/files.native/awipsShare/hydroapps/whfs/local/data/app/nrldb/nrldb.conf.baseline
View file

@ -1,4 +1,4 @@
dbhost = "dx1f"
dbhost = "localhost"
dbuser = "awips"
dbpass = ""
nrldb_host = "165.92.28.1"

2
nativeLib/rary.ohd.whfs/src/hb/TEXT/shefdecoder_show.c
View file

@ -779,7 +779,7 @@ void ShowShefdecoderDS ( Widget w )
fprintf ( stderr , "\nIn routine ShowShefdecodeDS:\n"
"Could not retrieve the value of the shefdecode_host\n"
"token. A default value of 'ds' is being used.\n" ) ;
strcpy ( shefdecode_hostname , "dx1f" ) ;
strcpy ( shefdecode_hostname , "localhost" ) ;
}
else
{