reconnect not yet work

Author: DifferentialOrange

connection.go

@@ -453,8 +453,12 @@ func Connect(addr string, opts Opts) (conn *Connection, err error) {
 }
 
 func (conn *Connection) shutdownOnServerEvent() {
+	conn.mutex.Lock()
+	defer conn.mutex.Unlock()
+
 	fmt.Printf("starting shutdown...\n")
 	conn.shutdownOn.Store(true)
+	defer conn.shutdownOn.Store(false)
 
 	fmt.Printf("wait for futures to finish...\n")
 	conn.shutdownWg.Wait()
@@ -463,11 +467,12 @@ func (conn *Connection) shutdownOnServerEvent() {
 	// defer conn.shutdownWatcher.Unregister()
 
 	fmt.Printf("close the connection...\n")
-	conn.mutex.Lock()
-	conn.closeConnection(ClientError{ErrConnectionClosed, "connection closed after server shutdown"}, true)
-	conn.mutex.Unlock()
+	conn.closeConnection(
+		ClientError{
+			ErrConnectionClosed,
+			"connection closed after server shutdown",
+		}, false)
 
-	conn.shutdownOn.Store(false)
 	fmt.Printf("finish shutdown...\n")
 }
 

graceful_shutdown/tarantool_test.go

@@ -27,15 +27,22 @@ var opts = tarantool.Opts{
 func TestGracefulShutdown(t *testing.T) {
 	test_helpers.SkipIfWatchersUnsupported(t)
 
-	inst, err := test_helpers.StartTarantool(test_helpers.StartOpts{
+	instOpts := test_helpers.StartOpts{
 		InitScript:   "testdata/config.lua",
 		Listen:       server,
 		User:         opts.User,
 		Pass:         opts.Pass,
 		WaitStart:    100 * time.Millisecond,
 		ConnectRetry: 3,
 		RetryTimeout: 500 * time.Millisecond,
-	})
+	}
+
+	retries := uint(10)
+	timeout := 200 * time.Millisecond
+	opts.Reconnect = timeout
+	opts.MaxReconnects = retries
+
+	inst, err := test_helpers.StartTarantool(instOpts)
 	require.Nil(t, err)
 
 	conn := test_helpers.ConnectWithValidation(t, server, opts)
@@ -81,5 +88,42 @@ func TestGracefulShutdown(t *testing.T) {
 
 	// time.Sleep(2 * time.Second)
 
+	require.Equal(t, false, conn.ConnectedNow())
+
+	err = test_helpers.RestartTarantool(&inst)
+	require.Nilf(t, err, "Failed to restart tarantool")
+
+	connected := test_helpers.WaitUntilReconnected(conn, retries, timeout)
+	require.True(t, connected, "Reconnect success")
+
+	fut = conn.Do(req)
+	fmt.Printf("test future is %v\n", fut)
+
+	require.Nil(t, inst.Cmd.Process.Signal(syscall.SIGTERM))
+
+	retrerr = test_helpers.Retry(func(interface{}) error {
+		_, err = conn.Do(tarantool.NewPingRequest()).Get()
+		if err == nil {
+			return fmt.Errorf("expected error for requests sent on shutdown")
+		}
+
+		if err.Error() != "instance shutdown in process" {
+			return err
+		}
+
+		return nil
+	}, nil, 5, 100*time.Millisecond)
+	require.Nil(t, retrerr)
+
+	resp, rerr = fut.Get()
+	require.Nil(t, rerr)
+	require.NotNil(t, resp)
+	require.Equal(t, resp.Data, []interface{}{"nice sleep"})
+
+	_, err = inst.Cmd.Process.Wait()
+	require.Nil(t, err)
+
+	// time.Sleep(2 * time.Second)
+
 	require.Equal(t, true, conn.ClosedNow())
 }