Sync reload

code/hdb/hdbstandard.q

@@ -1,7 +1,26 @@
 // reload function
 reload:{
+
+	if[.z.w in key .hdb.reloadcalls;
+		.hdb.reloadcalls[.z.w]:1b;
+		.lg.o[`reload;"reload call received from handle ", string[.z.w], "; reload calls pending from handles ", ", "sv string where not .hdb.reloadcalls];
+		if[not all .hdb.reloadcalls;:(::)]];
 	.lg.o[`reload;"reloading HDB"];
+	@[`.hdb.reloadcalls;key .hdb.reloadcalls;:;0b];
 	system"l ."}
 
 // Get the relevant HDB attributes
 .proc.getattributes:{`date`tables!(@[value;`date;`date$()];tables[])}
+
+\d .hdb
+
+// dictionary of handles to reload
+reloadcalls:()!();
+
+// function to add handle to reloadcalls dictionary
+po:{[h] if[.z.u in `wdb`rdb;reloadcalls[h]:0b]};
+.z.po:{[f;x] @[f;x;()];.hdb.po x} @[value;`.z.po;{{}}];
+
+// function to remove handle from reloadcalls dictionary
+pc:{[h] reloadcalls _: h; if[(all .hdb.reloadcalls) & count .hdb.reloadcalls;reload[]]};
+.z.pc:{[f;x] @[f;x;()];.hdb.pc x} @[value;`.z.pc;{{}}];

code/processes/gateway.q

@@ -550,9 +550,15 @@ reloadstart:{
  };
 
 reloadend:{
+ if[.z.w in key .gw.reloadcalls;
+  .gw.reloadcalls[.z.w]:1b;
+  .lg.o[`reload;"reload call received from handle ", string[.z.w], "; reload calls pending from handles ", ", "sv string where not .gw.reloadcalls];
+  if[not all .gw.reloadcalls;:(::)]];
+
  .lg.o[`reload;"reload end called"];
  /- set eod variable to false
  .gw.seteod[0b];
+ @[`.gw.reloadcalls; key .gw.reloadcalls;:;0b];
  /- retry connections - get updated attributes from servers and refresh servers tables
  setattributes .' flip value flip select procname,proctype,@[;(`.proc.getattributes;`);()!()] each w from .servers.SERVERS where .dotz.liveh[w];
  /- flush any async queries held during reload phase
@@ -637,4 +643,15 @@ neg[h](`.gw.asyncexecjpt;(`.q.system;"sleep 10");enlist[`servertype]!enlist`rdb`
 h(`.gw.syncexec;"`$last .z.x";enlist[`tables]!enlist enlist`logmsgXXX)
 h(`.gw.syncexec;"`$last .z.x";`tables`servertype!(enlist`data;`rdb`hdb))
 
+\d .gwreload
+
+// dictionary of handles to reload
+reloadcalls:()!();
+
+// function to add handle to reloadcalls dictionary
+po:{[h] if[.z.u in `wdb;reloadcalls[h]:0b]};
+.z.po:{[f;x] @[f;x;()];.gwreload.po x} @[value;`.z.po;{{}}];
 
+// function to remove handle from reloadcalls dictionary
+pc:{[h] reloadcalls _: h; if[(all .gwreload.reloadcalls) & count .gwreload.reloadcalls;reload[]]};
+.z.pc:{[f;x] @[f;x;()];.gwreload.pc x} @[value;`.z.pc;{{}}];

code/processes/rdb.q

@@ -114,6 +114,10 @@ endofday:{[date;processdata]
 	};
 
 reload:{[date]
+	if[.z.w in key .rdb.reloadcalls;
+	        .rdb.reloadcalls[.z.w]:1b;
+		.lg.o[`reload;"reload call received from handle ", string[.z.w], "; reload calls pending from handles ", ", "sv string where not .rdb.reloadcalls];
+		if[not all .rdb.reloadcalls;:(::)]];
 	.lg.o[`reload;"reload command has been called remotely"];
 	/-get all attributes from all tables before they are wiped
 	/-get a list of pairs (tablename;columnname!attributes)
@@ -131,7 +135,19 @@ reload:{[date]
 	/-restore original timeout back to rdb
 	restoretimeout[];
 	.lg.o[`reload;"Finished reloading RDB"];
+	@[`.rdb.reloadcalls; key .rdb.reloadcalls;:;0b];
 	};
+
+// dictionary of handles to reload
+reloadcalls:()!();
+
+// function to add handle to reloadcalls dictionary
+po:{[h] if[.z.u in `wdb;reloadcalls[h]:0b]};
+.z.po:{[f;x] @[f;x;()];.rdb.po x} @[value;`.z.po;{{}}];
+
+// function to remove handle from reloadcalls dictionary
+pc:{[h] reloadcalls _: h; if[(all .rdb.reloadcalls) & count .rdb.reloadcalls;reload[]]};
+.z.pc:{[f;x] @[f;x;()];.rdb.pc x} @[value;`.z.pc;{{}}];
 
 /-drop date from rdbpartition
 rmdtfromgetpar:{[date] 

config/settings/hdb.q

@@ -7,4 +7,3 @@ loadprocesscode:1b              // whether to load the process specific code def
 \d .servers
 CONNECTIONS:()			// list of connections to make at start up
 STARTUP:1b                      // create connections
-

config/settings/rdb.q

@@ -22,6 +22,7 @@ gc:1b                                       //if true .Q.gc will be called after
 sortcsv:hsym first .proc.getconfigfile["sort.csv"]	//location of csv file
 reloadenabled:0b    //if true, the RDB will not save when .u.end is called but
                     //will clear it's data using reload function (called by the WDB)
+
 parvaluesrc:`log    //where to source the rdb partition value, can be log (from tp log file name),
                     //tab (from the the first value in the time column of the table that is subscribed for)
                     //anything else will return a null date which is will be filled by pardefault                                             

tests/syncreload/connections.csv

@@ -0,0 +1,18 @@
+action,ms,bytes,lang,code,repeat,minver,comment
+beforeany,0,0,q,system "sleep 5",1,,"wait for all procs to go up"
+before,0,0,q,hdbHandle:hopen`::41804:admin:admin,1,,"Get handle to the HDB"
+before,0,0,q,rdb1Handle:hopen`::41802:admin:admin,1,,"Get handle to RDB1"
+before,0,0,q,rdb2Handle:hopen`::41803:admin:admin,1,,"Get handle to RDB2"
+before,0,0,q,wdbHandle:hopen`::41805:admin:admin,1,,"Get handle to WDB"
+before,0,0,q,gwHandle:hopen`::41806:admin:admin,1,,"Get handle to gateway"
+true,0,0,q,2~count hdbHandle(value;`.hdb.reloadcalls),1,,"check number of connections to the HDB"
+true,0,0,q,1~count rdb1Handle(value;`.rdb.reloadcalls),1,,"check number of connections to RDB1"
+true,0,0,q,1~count rdb2Handle(value;`.rdb.reloadcalls),1,,"check number of connections to RDB12"
+true,0,0,q,1~count gwHandle(value;`.gwreload.reloadcalls),1,,"check number of connections to the gateway"
+run,0,0,q,kill9proc["rdb1"],1,,"shut down rdb1 process"
+run,0,0,q,system "sleep 5",1,,"to ensure rdb1 shuts down"
+true,0,0,q,2~count hdbHandle(value;`.hdb.reloadcalls),1,,"recheck number of connections to the HDB"
+true,0,0,q,1~count rdb2Handle(value;`.rdb.reloadcalls),1,,"recheck number of connections to RDB2"
+run,0,0,q,kill9proc["rdb2"],1,,"shut down rdb2 process"
+run,0,0,q,system "sleep 5",1,,"to ensure rdb2 shuts down"
+true,0,0,q,1~count hdbHandle(value;`.hdb.reloadcalls),1,,"recheck number of connections to the HDB"

tests/syncreload/eod.csv

@@ -0,0 +1,17 @@
+action,ms,bytes,lang,code,repeat,minver,comment
+beforeany,0,0,q,system "sleep 5",1,,"wait for all procs to go up"
+before,0,0,q,hdbHandle:hopen`::41804:admin:admin,1,,"Get handle to the HDB"
+before,0,0,q,rdb1Handle:hopen`::41802:admin:admin,1,,"Get handle to RDB1"
+before,0,0,q,rdb2Handle:hopen`::41803:admin:admin,1,,"Get handle to RDB2"
+before,0,0,q,wdbHandle:hopen`::41805:admin:admin,1,,"Get handle to WDB"
+before,0,0,q,gwHandle:hopen`::41806:admin:admin,1,,"Get handle to gateway"
+true,0,0,q,0=all rdb1Handle(value;`.rdb.reloadcalls),1,,"check rdb1 reloadcalls dictionary"
+true,0,0,q,0=all rdb2Handle(value;`.rdb.reloadcalls),1,,"check rdb2 reloadcalls dictionary"
+true,0,0,q,0=all gwHandle(value;`.gwreload.reloadcalls),1,,"check gateway reloadcalls dictionary"
+true,0,0,q,0=all hdbHandle(value;`.hdb.reloadcalls),1,,"check hdb reloadcalls dictionary"
+run,0,0,q,wdbHandle(`.u.end;.z.d)
+run,0,0,q,system "sleep 5",1,,"wait to allow wdb endofday process to finish running"
+true,0,0,q,1=all rdb1Handle(value;`.rdb.reloadcalls),1,,"check rdb1 reloadcalls dictionary has updated"
+true,0,0,q,0=all rdb2Handle(value;`.rdb.reloadcalls),1,,"check rdb2 reloadcalls dictionary has not updated"
+true,0,0,q,0=all gwHandle(value;`.gwreload.reloadcalls),1,,"check gateway reloadcalls dictionary has updated"
+true,0,0,q,1=sum hdbHandle(value;`.hdb.reloadcalls),1,,"check hdb reloadcalls dictionary has updated"

tests/syncreload/process.csv

@@ -0,0 +1,8 @@
+host,port,proctype,procname,U,localtime,g,T,w,load,startwithall,extras,qcmd
+localhost,{KDBBASEPORT}+1,discovery,discovery1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,0,,,${KDBCODE}/processes/discovery.q,1,,
+localhost,{KDBBASEPORT},segmentedtickerplant,stp1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,0,,,${KDBCODE}/processes/segmentedtickerplant.q,1,-schemafile ${TORQAPPHOME}/database.q -tplogdir ${KDBTPLOG},
+localhost,{KDBBASEPORT}+2,rdb,rdb1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,1,180,,${KDBCODE}/processes/rdb.q,1,,
+localhost,{KDBBASEPORT}+3,rdb,rdb2,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,1,180,,${KDBCODE}/processes/rdb.q,1,,
+localhost,{KDBBASEPORT}+4,hdb,hdb1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,1,60,4000,${KDBHDB},1,,
+localhost,{KDBBASEPORT}+5,wdb,wdb1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,1,,,${KDBCODE}/processes/wdb.q,1,,
+localhost,{KDBBASEPORT}+6,gateway,gateway1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,1,,4000,${KDBCODE}/processes/gateway.q,1,,

tests/syncreload/rdb2.q

@@ -0,0 +1,2 @@
+.rdb.hdbtypes:enlist`hdb
+.servers.CONNECTIONS:`gateway`hdb

tests/syncreload/run.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Handle command-line arguments
+source $KDBTESTS/flagparse.sh
+
+# Path to test directory
+testpath=/home/creid/devTorQ/bin/syncreload
+
+# Start procs
+bin/torq.sh start discovery1 stp1 hdb1 rdb1 rdb2 wdb1 gateway1 -csv ${testpath}/process.csv
+
+# Start test proc
+/usr/bin/rlwrap q ${TORQHOME}/torq.q \
+  -proctype test -procname test1 \
+  -test ${testpath} \
+  -load ${KDBTESTS}/helperfunctions.q ${testpath}/settings.q \
+  -testresults ${KDBTESTS}/syncreload/results/ \
+  -procfile ${testpath}/process.csv \
+  -runtime $run \
+  $debug $stop $write $quiet
+
+# Shut down procs
+bin/torq.sh stop discovery1 stp1 hdb1 rdb1 rdb2 wdb1 gateway1 -csv ${testpath}/process.csv

tests/syncreload/settings.q

@@ -0,0 +1,6 @@
+// IPC connection parameters
+.servers.CONNECTIONS:`rdb`segmentedtickerplant;
+.servers.USERPASS:`admin:admin;
+
+// Paths to process CSV and test STP log directory
+processcsv:getenv[`KDBTESTS],"/syncreload/connections/process.csv";