Merge pull request #101 from bgokden/develop

Add logs, remove conn block, increase max procs
bgokden · Aug 10, 2021 · fc8371c · fc8371c
2 parents 66937aa + 9b2c97a
commit fc8371c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/node/node.go b/node/node.go
@@ -17,7 +17,7 @@ import (
 	data "github.com/bgokden/veri/data"
 )
 
-const MINGOMAXPROCS = 32
+const MINGOMAXPROCS = 128
 
 func GetIdOfPeer(p *pb.Peer) string {
 	return SerializeStringArray(p.GetAddressList())
@@ -262,6 +262,7 @@ func (n *Node) SyncWithPeers() {
 		}
 	}
 	state.Ready = true
+	log.Printf("Synced with peers")
 	// fmt.Println(n.Info())
 }
 

diff --git a/node/nodeservice.go b/node/nodeservice.go
@@ -179,14 +179,14 @@ func (n *Node) SendJoinRequest(id string) error {
 	}
 	// This is a speacial case that doesn't use connection pool
 	conn, err := grpc.Dial(id,
-		grpc.WithBlock(),
 		grpc.WithInsecure(),
 		grpc.WithTimeout(time.Duration(1000)*time.Millisecond),
 	)
 	if err != nil {
 		return err
 	}
 	if conn == nil {
+		log.Printf("Failed Join request to %v", id)
 		return errors.New("Connection failure")
 	}
 	defer conn.Close()

diff --git a/util/connpool.go b/util/connpool.go
@@ -101,7 +101,6 @@ func (cp *ConnectionPool) NewConnection(address string) *Connection {
 		return nil
 	}
 	conn, err := grpc.Dial(address,
-		grpc.WithBlock(),
 		grpc.WithInsecure(),
 		grpc.WithTimeout(time.Duration(200)*time.Millisecond),
 	)
@@ -141,7 +140,7 @@ func (cp *ConnectionPool) GetWithRetry(count int) *Connection {
 	}
 	if conn, ok := connectionInterface.(*Connection); ok {
 		if conn != nil && conn.Conn != nil {
-			if conn.Conn.GetState() == connectivity.Ready {
+			if conn.Conn.GetState() == connectivity.Ready || conn.Conn.GetState() == connectivity.Connecting {
 				return conn
 			} else {
 				err := conn.Conn.Close()