- reload calls tracked via dictionary mapping handles to boolean value

- dictionary expectedreloadcalls updated by .z.po and .z.pc
- .z.pc automatically triggers reload if wdb or rdb disconnects
- handling added for user to bypass check if reload triggered manually

Author: CReid98

code/hdb/hdbstandard.q

@@ -1,12 +1,26 @@
 // reload function
 reload:{
-	.hdb.expectedreloadcalls:count select from .clients.clients where u in `wdb`rdb, not null w;
-
-	.[`.hdb.reloadcalls;();+;1];
-	.lg.o[`reload;string[.hdb.reloadcalls]," out of ",string[.hdb.expectedreloadcalls]," calls received"];
-	if[.hdb.reloadcalls<.hdb.expectedreloadcalls;:(::)];
+	
+	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", raze ssr[", %x"; "%x";] each string key .hdb.reloadcalls];
+		if[not all value .hdb.reloadcalls;:(::)]];
 	.lg.o[`reload;"reloading HDB"];
+	{.hdb.reloadcalls[x]:0} each key .hdb.reloadcalls;
 	system"l .";.[`.hdb.reloadcalls;();:;0];}
 
 // 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 value .hdb.reloadcalls;reload[]]};
+.z.pc:{[f;x] @[f;x;()];.hdb.pc x} @[value;`.z.pc;{{}}];

code/processes/gateway.q

@@ -550,15 +550,15 @@ reloadstart:{
  };
 
 reloadend:{
- .gw.expectedreloadcalls:;count select from .clients.clients where u in `wdb, not null w;
+ 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", raze ssr[", %x"; "%x";] each string key .gw.reloadcalls];
+  if[not all value .gw.reloadcalls;:(::)]];
 
- .[`.gw.reloadcalls;();+;1];
- .lg.o[`reload;string[.gw.reloadcalls]," out of ",string[.gw.expectedreloadcalls]," calls received"];
- if[.gw.reloadcalls<.gw.expectedreloadcalls;:(::)];
  .lg.o[`reload;"reload end called"];
  /- set eod variable to false
  .gw.seteod[0b];
- .[`.gw.reloadcalls;();:;0];
+ {.gw.reloadcalls[x]:0} each key .gw.reloadcalls;
  /- 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
@@ -643,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 value .gwreload.reloadcalls;reload[]]};
+.z.pc:{[f;x] @[f;x;()];.gwreload.pc x} @[value;`.z.pc;{{}}];

code/processes/rdb.q

@@ -114,11 +114,10 @@ endofday:{[date;processdata]
 	};
 
 reload:{[date]
-        .rdb.expectedreloadcalls:count select from .clients.clients where u in `wdb, not null w;
-
-	.[`.rdb.reloadcalls;();+;1];
-	.lg.o[`reload;string[.rdb.reloadcalls]," out of ",string[.rdb.expectedreloadcalls]," calls received"];
-	if[.rdb.reloadcalls<.rdb.expectedreloadcalls;:(::)];
+	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", raze ssr[", %x"; "%x";] each string key .rdb.reloadcalls];
+		if[not all value .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)
@@ -136,8 +135,19 @@ reload:{[date]
 	/-restore original timeout back to rdb
 	restoretimeout[];
 	.lg.o[`reload;"Finished reloading RDB"];
-	.[`.rdb.reloadcalls;();:;0];
+	{.rdb.reloadcalls[x]:0} each key .rdb.reloadcalls;
 	};
+
+// 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 value .rdb.reloadcalls;reload[]]};
+.z.pc:{[f;x] @[f;x;()];.rdb.pc x} @[value;`.z.pc;{{}}];
 
 /-drop date from rdbpartition
 rmdtfromgetpar:{[date]