Update dial timeout

commonspace/space.go

@@ -337,11 +337,13 @@ func (s *space) BuildTree(ctx context.Context, id string, opts BuildTreeOpts) (t
 		PeerGetter:         s.peerManager,
 		BuildObjectTree:    treeBuilder,
 	}
-	if t, err = synctree.BuildSyncTreeOrGetRemote(ctx, id, deps); err != nil {
-		return nil, err
-	}
 	s.treesUsed.Add(1)
 	log.Debug("incrementing counter", zap.String("id", id), zap.Int32("trees", s.treesUsed.Load()), zap.String("spaceId", s.id))
+	if t, err = synctree.BuildSyncTreeOrGetRemote(ctx, id, deps); err != nil {
+		s.treesUsed.Add(-1)
+		log.Debug("decrementing counter, load failed", zap.String("id", id), zap.Int32("trees", s.treesUsed.Load()), zap.String("spaceId", s.id), zap.Error(err))
+		return nil, err
+	}
 	return
 }
 

net/dialer/dialer.go

@@ -113,7 +113,7 @@ func (d *dialer) Dial(ctx context.Context, peerId string) (p peer.Peer, err erro
 func (d *dialer) handshake(ctx context.Context, addr, peerId string) (conn drpc.Conn, sc sec.SecureConn, err error) {
 	st := time.Now()
 	// TODO: move dial timeout to config
-	tcpConn, err := net.DialTimeout("tcp", addr, time.Second*3)
+	tcpConn, err := net.DialTimeout("tcp", addr, time.Second*15)
 	if err != nil {
 		return nil, nil, fmt.Errorf("dialTimeout error: %v; since start: %v", err, time.Since(st))
 	}

net/peer/peer.go

@@ -63,14 +63,14 @@ func (p *peer) NewStream(ctx context.Context, rpc string, enc drpc.Encoding) (dr
 }
 
 func (p *peer) Read(b []byte) (n int, err error) {
-	if n, err = p.sc.Read(b); err != nil {
+	if n, err = p.sc.Read(b); err == nil {
 		p.UpdateLastUsage()
 	}
 	return
 }
 
 func (p *peer) Write(b []byte) (n int, err error) {
-	if n, err = p.sc.Write(b); err != nil {
+	if n, err = p.sc.Write(b); err == nil {
 		p.UpdateLastUsage()
 	}
 	return