hide debug printout

Author: DifferentialOrange

connection.go

@@ -433,17 +433,17 @@ func Connect(addr string, opts Opts) (conn *Connection, err error) {
 	}
 
 	if conn.isWatchersRequired() {
-		fmt.Printf("starting on_shutdown...\n")
+		// fmt.Printf("starting on_shutdown...\n")
 		watcher, werr := conn.NewWatcher("box.shutdown", func(event WatchEvent) {
-			fmt.Printf("event connection: %s\n", event.Conn.Addr())
-			fmt.Printf("event key: %s\n", event.Key)
-			fmt.Printf("event value: %v\n", event.Value)
+			// fmt.Printf("event connection: %s\n", event.Conn.Addr())
+			// fmt.Printf("event key: %s\n", event.Key)
+			// fmt.Printf("event value: %v\n", event.Value)
 			boolVal, ok := event.Value.(bool)
 			if ok && (boolVal == true) {
 				// defer cause otherwise we'll block ourselves on ack wait
 				defer event.Conn.shutdownOnServerEvent()
 			}
-			fmt.Printf("callback finished\n")
+			// fmt.Printf("callback finished\n")
 		})
 
 		if werr != nil {
@@ -459,11 +459,11 @@ func Connect(addr string, opts Opts) (conn *Connection, err error) {
 func (conn *Connection) shutdownOnServerEvent() {
 	conn.mutex.Lock()
 
-	fmt.Printf("starting shutdown... (%v)\n", conn.UniqueId())
+	// fmt.Printf("starting shutdown... (%v)\n", conn.UniqueId())
 	atomic.StoreUint32(&(conn.shutdownInProgress), shutdownInProgress)
 	defer atomic.StoreUint32(&(conn.shutdownInProgress), shutdownNotInProgress)
 
-	fmt.Printf("wait for futures to finish... (%v)\n", conn.UniqueId())
+	// fmt.Printf("wait for futures to finish... (%v)\n", conn.UniqueId())
 	conn.shutdownWg.Wait()
 
 	// fmt.Printf("defer unregister watcher...\n")
@@ -474,10 +474,10 @@ func (conn *Connection) shutdownOnServerEvent() {
 		"connection closed after server shutdown",
 	}
 
-	fmt.Printf("close the connection... (%v)\n", conn.UniqueId())
+	// fmt.Printf("close the connection... (%v)\n", conn.UniqueId())
 	conn.closeConnection(err, false)
 
-	fmt.Printf("finish shutdown... (%v)\n", conn.UniqueId())
+	// fmt.Printf("finish shutdown... (%v)\n", conn.UniqueId())
 
 	conn.mutex.Unlock()
 
@@ -787,9 +787,9 @@ func (conn *Connection) readIdResponse(r io.Reader) (Response, error) {
 
 func (conn *Connection) createConnection(reconnect bool) (err error) {
 	var reconnects uint
-	fmt.Printf("conn.state is %v (%v)\n", conn.state, conn.UniqueId())
+	// fmt.Printf("conn.state is %v (%v)\n", conn.state, conn.UniqueId())
 	for conn.c == nil && conn.state == connDisconnected {
-		fmt.Printf("createConnection iteration (%v)\n", conn.UniqueId())
+		// fmt.Printf("createConnection iteration (%v)\n", conn.UniqueId())
 
 		now := time.Now()
 		err = conn.dial()
@@ -809,11 +809,11 @@ func (conn *Connection) createConnection(reconnect bool) (err error) {
 		conn.notify(ReconnectFailed)
 		reconnects++
 
-		fmt.Printf("until sleep %v (%v)\n", time.Now(), conn.UniqueId())
+		// fmt.Printf("until sleep %v (%v)\n", time.Now(), conn.UniqueId())
 		conn.mutex.Unlock()
 		time.Sleep(time.Until(now.Add(conn.opts.Reconnect)))
 		conn.mutex.Lock()
-		fmt.Printf("after sleep %v (%v)\n", time.Now(), conn.UniqueId())
+		// fmt.Printf("after sleep %v (%v)\n", time.Now(), conn.UniqueId())
 	}
 	if conn.state == connClosed {
 		err = ClientError{ErrConnectionClosed, "using closed connection"}
@@ -850,29 +850,29 @@ func (conn *Connection) closeConnection(neterr error, forever bool) (err error)
 	return
 }
 
-func (conn *Connection) UniqueId() string {
-	return fmt.Sprintf("conn %v", conn.control)
-}
+// func (conn *Connection) UniqueId() string {
+// 	return fmt.Sprintf("conn %v", conn.control)
+// }
 
 func (conn *Connection) reconnect(neterr error, c net.Conn) {
-	fmt.Printf("reconnect head (%v)\n", conn.UniqueId())
+	// fmt.Printf("reconnect head (%v)\n", conn.UniqueId())
 	conn.mutex.Lock()
 	defer conn.mutex.Unlock()
-	fmt.Printf("conn.opts.Reconnect %d (%v)\n", conn.opts.Reconnect, conn.UniqueId())
+	// fmt.Printf("conn.opts.Reconnect %d (%v)\n", conn.opts.Reconnect, conn.UniqueId())
 	if conn.opts.Reconnect > 0 {
 		if c == conn.c {
-			fmt.Printf("reconnect attempt (%v)\n", conn.UniqueId())
+			// fmt.Printf("reconnect attempt (%v)\n", conn.UniqueId())
 			conn.closeConnection(neterr, false)
 			if err := conn.createConnection(true); err != nil {
-				fmt.Printf("kill that one (folded)(%v)\n", conn.UniqueId())
+				// fmt.Printf("kill that one (folded)(%v)\n", conn.UniqueId())
 				conn.closeConnection(err, true)
 			}
 		}
 	} else {
-		fmt.Printf("kill that one (%v)\n", conn.UniqueId())
+		// fmt.Printf("kill that one (%v)\n", conn.UniqueId())
 		conn.closeConnection(neterr, true)
 	}
-	fmt.Printf("reconnect end (%v)\n", conn.UniqueId())
+	// fmt.Printf("reconnect end (%v)\n", conn.UniqueId())
 }
 
 func (conn *Connection) lockShards() {

graceful_shutdown/tarantool_test.go

@@ -48,7 +48,7 @@ func TestGracefulShutdown(t *testing.T) {
 	// fmt.Printf("opts are is %v\n", opts)
 	// fmt.Printf("opts.Reconnect is %v\n", opts.Reconnect)
 	conn := test_helpers.ConnectWithValidation(t, server, opts)
-	fmt.Printf("test connect unique id: %v\n", conn.UniqueId())
+	// fmt.Printf("test connect unique id: %v\n", conn.UniqueId())
 
 	_, err = conn.Eval("box.ctl.set_on_shutdown_timeout(10)", []interface{}{})
 	require.Nil(t, err)
@@ -63,7 +63,7 @@ func TestGracefulShutdown(t *testing.T) {
 	req := tarantool.NewEvalRequest("require('fiber').sleep(1); return 'nice sleep'")
 
 	fut := conn.Do(req)
-	fmt.Printf("test future is %v\n", fut)
+	// fmt.Printf("test future is %v\n", fut)
 
 	require.Nil(t, inst.Cmd.Process.Signal(syscall.SIGTERM))
 
@@ -96,12 +96,12 @@ func TestGracefulShutdown(t *testing.T) {
 	err = test_helpers.RestartTarantool(&inst)
 	require.Nilf(t, err, "Failed to restart tarantool")
 
-	fmt.Printf("opts are is %v\n", opts)
+	// fmt.Printf("opts are is %v\n", opts)
 	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)
+	// fmt.Printf("test future is %v\n", fut)
 
 	require.Nil(t, inst.Cmd.Process.Signal(syscall.SIGTERM))
 

test_helpers/utils.go

@@ -47,14 +47,14 @@ func DeleteRecordByKey(t *testing.T, conn tarantool.Connector,
 // Returns false in case of connection is not in the connected state
 // after specified retries count, true otherwise.
 func WaitUntilReconnected(conn *tarantool.Connection, retries uint, timeout time.Duration) bool {
-	fmt.Printf("WaitUntilReconnected %v %v \n", retries, timeout)
+	// fmt.Printf("WaitUntilReconnected %v %v \n", retries, timeout)
 
 	for i := uint(0); ; i++ {
-		fmt.Printf("reconnect in tests iteration i=%v\n", i)
+		// fmt.Printf("reconnect in tests iteration i=%v\n", i)
 
 		connected := conn.ConnectedNow()
 		if connected {
-			fmt.Printf("ConnectedNow true\n")
+			// fmt.Printf("ConnectedNow true\n")
 			return true
 		}
 
@@ -65,7 +65,7 @@ func WaitUntilReconnected(conn *tarantool.Connection, retries uint, timeout time
 		time.Sleep(timeout)
 
 		// resp, err := conn.Do(tarantool.NewPingRequest()).Get()
-		fmt.Printf("reconnect in tests iteration i=%v\n", i)
+		// fmt.Printf("reconnect in tests iteration i=%v\n", i)
 		// fmt.Printf("reconnect tests; err ping %v\n", err)
 	}