Send disconnect message to the server

knizhnik · knizhnik · commit 3060cc4385b9 · 2015-10-10T13:51:27.000+03:00
diff --git a/contrib/pg_dtm/dtmd/Makefile b/contrib/pg_dtm/dtmd/Makefile
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-g -Wall -Iinclude -D_LARGEFILE64_SOURCE # -DDEBUG
+CFLAGS=-g -O2 -Wall -Iinclude -D_LARGEFILE64_SOURCE # -DDEBUG
 LIBUV_PREFIX=$(HOME)/libuv-build
 LIBUV_CFLAGS=-I"$(LIBUV_PREFIX)/include" -L"$(LIBUV_PREFIX)/lib"
 LIBUV_LDFLAGS=-luv -pthread -lrt
diff --git a/contrib/pg_dtm/sockhub/sockhub.c b/contrib/pg_dtm/sockhub/sockhub.c
@@ -14,6 +14,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
+#include <assert.h>
 
 #include "sockhub.h"
 
@@ -151,6 +152,17 @@ static void reconnect(Shub* shub)
     }
 }
 
+static void notify_disconnect(Shub* shub, int chan)
+{
+    ShubMessageHdr* hdr;
+    assert(shub->in_buffer_used + sizeof(ShubMessageHdr) < shub->params->buffer_size);
+    hdr = (ShubMessageHdr*)&shub->in_buffer[shub->in_buffer_used];
+    hdr->size = 0;
+    hdr->chan = chan;
+    hdr->code = MSG_DISCONNECT;
+    shub->in_buffer_used += sizeof(ShubMessageHdr);
+}
+
 static void recovery(Shub* shub)
 {
     int i, max_fd;
@@ -162,6 +174,9 @@ static void recovery(Shub* shub)
             FD_ZERO(&tryset);
             FD_SET(i, &tryset);
             if (select(i+1, &tryset, NULL, NULL, &tm) < 0) { 
+                if (i != shub->input && i != shub->output) { 
+                    notify_disconnect(shub, i);
+                }
                 close_socket(shub, i);
             }
         }
@@ -259,6 +274,7 @@ void ShubLoop(Shub* shub)
                                 if (!write_socket(chan, (char*)hdr, n)) { 
                                     shub->params->error_handler("Failed to write to local socket", SHUB_RECOVERABLE_ERROR);
                                     close_socket(shub, chan);
+                                    notify_disconnect(shub, chan);
                                     chan = -1;
                                 }
                                 if (n != hdr->size + sizeof(ShubMessageHdr)) { 
@@ -274,6 +290,7 @@ void ShubLoop(Shub* shub)
                                         if (chan >= 0 && !write_socket(chan, shub->out_buffer, n)) { 
                                             shub->params->error_handler("Failed to write to local socket", SHUB_RECOVERABLE_ERROR);
                                             close_socket(shub, chan);
+                                            notify_disconnect(shub, chan);
                                             chan = -1;
                                         }                                       
                                         tail -= n;
@@ -295,6 +312,7 @@ void ShubLoop(Shub* shub)
                                 if (available < sizeof(ShubMessageHdr)) { 
                                     shub->params->error_handler("Failed to read local socket", SHUB_RECOVERABLE_ERROR);
                                     close_socket(shub, i);
+                                    notify_disconnect(shub, i);
                                 } else { 
                                     int pos = 0;
                                     /* loop through all fetched messages */
@@ -333,6 +351,7 @@ void ShubLoop(Shub* shub)
                                                 if (hdr != NULL) { /* if message header is not yet sent to the server... */
                                                     /* ... then skip this message */
                                                     shub->in_buffer_used = (char*)hdr - shub->in_buffer;
+                                                    notify_disconnect(shub, chan);
                                                     break;
                                                 } else { /* if message was partly sent to the server, we can not skip it, so we have to send garbage to the server */
                                                     chan = -1; /* do not try to read rest of body of this message */
@@ -351,6 +370,10 @@ void ShubLoop(Shub* shub)
                                                 shub->in_buffer_used = 0;
                                             }
                                         } while (size != 0); /* repeat until all message body is received */
+                                        
+                                        if (chan < 0) { 
+                                            notify_disconnect(shub, i);
+                                        }
 
                                         pos = available;
                                         break;
diff --git a/contrib/pg_dtm/sockhub/sockhub.h b/contrib/pg_dtm/sockhub/sockhub.h
@@ -9,6 +9,12 @@ typedef struct {
     unsigned int chan;      /* local socket: set by SockHUB */
 } ShubMessageHdr;
 
+enum ShubMessageCodes
+{
+    MSG_DISCONNECT,
+    MSG_FIRST_USER_CODE /* all codes >= 1 are user defined */
+};
+
 typedef enum 
 {
     SHUB_FATAL_ERROR,
diff --git a/contrib/pg_dtm/tests/pg_shard_transfers.go b/contrib/pg_dtm/tests/pg_shard_transfers.go
@@ -11,9 +11,9 @@ import (
 )
 
 const (
-    TRANSFER_CONNECTIONS = 50
+    TRANSFER_CONNECTIONS = 10
     INIT_AMOUNT = 10000
-    N_ITERATIONS = 2000
+    N_ITERATIONS = 10000
     N_ACCOUNTS = 2*100000 
 )
 

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`const (`
`14`		`- TRANSFER_CONNECTIONS = 50`
	`14`	`+ TRANSFER_CONNECTIONS = 10`
`15`	`15`	`INIT_AMOUNT = 10000`
`16`		`- N_ITERATIONS = 2000`
	`16`	`+ N_ITERATIONS = 10000`
`17`	`17`	`N_ACCOUNTS = 2*100000`
`18`	`18`	`)`
`19`	`19`