Update dial timeout

commonspace/headsync/diffsyncer.go

@@ -66,7 +66,7 @@ type diffSyncer struct {
 func (d *diffSyncer) Init(deletionState settingsstate.ObjectDeletionState) {
 	d.deletionState = deletionState
 	d.deletionState.AddObserver(d.RemoveObjects)
-	d.treeSyncer = d.treeManager.NewTreeSyncer(d.spaceId)
+	d.treeSyncer = d.treeManager.NewTreeSyncer(d.spaceId, d.treeManager)
 }
 
 func (d *diffSyncer) RemoveObjects(ids []string) {

commonspace/headsync/diffsyncer_test.go

@@ -127,7 +127,7 @@ func TestDiffSyncer_Sync(t *testing.T) {
 	l := logger.NewNamed(spaceId)
 	diffSyncer := newDiffSyncer(spaceId, diffMock, peerManagerMock, cacheMock, stMock, factory, syncstatus.NewNoOpSyncStatus(), credentialProvider, l)
 	delState.EXPECT().AddObserver(gomock.Any())
-	cacheMock.EXPECT().NewTreeSyncer(spaceId).Return(treeSyncerMock)
+	cacheMock.EXPECT().NewTreeSyncer(spaceId, gomock.Any()).Return(treeSyncerMock)
 	diffSyncer.Init(delState)
 
 	t.Run("diff syncer sync", func(t *testing.T) {

commonspace/object/treemanager/mock_treemanager/mock_treemanager.go

@@ -123,17 +123,17 @@ func (mr *MockTreeManagerMockRecorder) Name() *gomock.Call {
 }
 
 // NewTreeSyncer mocks base method.
-func (m *MockTreeManager) NewTreeSyncer(arg0 string) treemanager.TreeSyncer {
+func (m *MockTreeManager) NewTreeSyncer(arg0 string, arg1 treemanager.TreeManager) treemanager.TreeSyncer {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NewTreeSyncer", arg0)
+	ret := m.ctrl.Call(m, "NewTreeSyncer", arg0, arg1)
 	ret0, _ := ret[0].(treemanager.TreeSyncer)
 	return ret0
 }
 
 // NewTreeSyncer indicates an expected call of NewTreeSyncer.
-func (mr *MockTreeManagerMockRecorder) NewTreeSyncer(arg0 interface{}) *gomock.Call {
+func (mr *MockTreeManagerMockRecorder) NewTreeSyncer(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTreeSyncer", reflect.TypeOf((*MockTreeManager)(nil).NewTreeSyncer), arg0)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTreeSyncer", reflect.TypeOf((*MockTreeManager)(nil).NewTreeSyncer), arg0, arg1)
 }
 
 // Run mocks base method.

commonspace/object/treemanager/treemanager.go

@@ -14,7 +14,7 @@ type TreeManager interface {
 	GetTree(ctx context.Context, spaceId, treeId string) (objecttree.ObjectTree, error)
 	MarkTreeDeleted(ctx context.Context, spaceId, treeId string) error
 	DeleteTree(ctx context.Context, spaceId, treeId string) error
-	NewTreeSyncer(spaceId string) TreeSyncer
+	NewTreeSyncer(spaceId string, treeManager TreeManager) TreeSyncer
 }
 
 type TreeSyncer interface {

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
 }
 

commonspace/spaceutils_test.go

@@ -238,7 +238,7 @@ type mockTreeManager struct {
 	markedIds  []string
 }
 
-func (t *mockTreeManager) NewTreeSyncer(spaceId string) treemanager.TreeSyncer {
+func (t *mockTreeManager) NewTreeSyncer(spaceId string, treeManager treemanager.TreeManager) treemanager.TreeSyncer {
 	return noOpSyncer{}
 }
 

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