fix renterd setup

SiaFoundation · Aug 19, 2024 · 93ac69c · 93ac69c
1 parent 01d61eb
commit 93ac69c
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 25 deletions.
diff --git a/cmd/clusterd/main.go b/cmd/clusterd/main.go
@@ -157,7 +157,7 @@ func main() {
 		GenesisID:  genesis.ID(),
 		UniqueID:   gateway.GenerateUniqueID(),
 		NetAddress: "127.0.0.1:" + port,
-	}, syncer.WithMaxInboundPeers(10000)) // essentially no limit on inbound peers
+	}, syncer.WithLogger(log.Named("syncer")), syncer.WithMaxInboundPeers(10000), syncer.WithBanDuration(time.Second), syncer.WithPeerDiscoveryInterval(5*time.Second), syncer.WithSyncInterval(5*time.Second)) // essentially no limit on inbound peers
 	if err != nil {
 		log.Panic("failed to create syncer", zap.Error(err))
 	}

diff --git a/nodes/hostd.go b/nodes/hostd.go
@@ -110,19 +110,22 @@ func (m *Manager) StartHostd(ctx context.Context, ready chan<- struct{}) error {
 		GenesisID:  genesisIndex.ID,
 		UniqueID:   gateway.GenerateUniqueID(),
 		NetAddress: "127.0.0.1:" + port,
-	})
+	}, syncer.WithLogger(log.Named("syncer")), syncer.WithPeerDiscoveryInterval(5*time.Second), syncer.WithSyncInterval(5*time.Second))
 	defer s.Close()
 	go s.Run(ctx)
-	// connect to the primary cluster syncer
-	err = func(ctx context.Context) error {
-		ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
-		defer cancel()
-		_, err := m.syncer.Connect(ctx, s.Addr())
-		return err
-	}(ctx)
+	node.SyncerAddress = syncerListener.Addr().String()
+	// connect to the cluster syncer
+	_, err = m.syncer.Connect(ctx, node.SyncerAddress)
 	if err != nil {
 		return fmt.Errorf("failed to connect to cluster syncer: %w", err)
 	}
+	// connect to other nodes in the cluster
+	for _, n := range m.Nodes() {
+		_, err = s.Connect(ctx, n.SyncerAddress)
+		if err != nil {
+			return fmt.Errorf("failed to connect to peer syncer: %w", err)
+		}
+	}
 
 	store, err := sqlite.OpenDatabase(filepath.Join(dir, "hostd.sqlite3"), log.Named("sqlite3"))
 	if err != nil {

diff --git a/nodes/manager.go b/nodes/manager.go
@@ -38,6 +38,8 @@ type (
 		APIAddress string `json:"apiAddress"`
 		Password   string `json:"password"`
 
+		SyncerAddress string `json:"syncerAddress"`
+
 		WalletAddress types.Address `json:"walletAddress"`
 	}
 

diff --git a/nodes/renterd.go b/nodes/renterd.go
@@ -93,19 +93,22 @@ func (m *Manager) StartRenterd(ctx context.Context, ready chan<- struct{}) error
 		GenesisID:  genesisIndex.ID,
 		UniqueID:   gateway.GenerateUniqueID(),
 		NetAddress: "127.0.0.1:" + port,
-	})
+	}, syncer.WithLogger(log.Named("syncer")), syncer.WithPeerDiscoveryInterval(5*time.Second), syncer.WithSyncInterval(5*time.Second))
 	defer s.Close()
 	go s.Run(ctx)
-	// connect to the primary cluster syncer
-	err = func(ctx context.Context) error {
-		ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
-		defer cancel()
-		_, err := m.syncer.Connect(ctx, s.Addr())
-		return err
-	}(ctx)
+	node.SyncerAddress = syncerListener.Addr().String()
+	// connect to the cluster syncer
+	_, err = m.syncer.Connect(ctx, node.SyncerAddress)
 	if err != nil {
 		return fmt.Errorf("failed to connect to cluster syncer: %w", err)
 	}
+	// connect to other nodes in the cluster
+	for _, n := range m.Nodes() {
+		_, err = s.Connect(ctx, n.SyncerAddress)
+		if err != nil {
+			return fmt.Errorf("failed to connect to peer syncer: %w", err)
+		}
+	}
 
 	db, err := sqlite.Open(filepath.Join(dir, "db.sqlite"))
 	if err != nil {

diff --git a/nodes/walletd.go b/nodes/walletd.go
@@ -89,19 +89,22 @@ func (m *Manager) StartWalletd(ctx context.Context, ready chan<- struct{}) error
 		GenesisID:  genesisIndex.ID,
 		UniqueID:   gateway.GenerateUniqueID(),
 		NetAddress: "127.0.0.1:" + port,
-	})
+	}, syncer.WithLogger(log.Named("syncer")), syncer.WithPeerDiscoveryInterval(5*time.Second), syncer.WithSyncInterval(5*time.Second))
 	defer s.Close()
 	go s.Run(ctx)
-	// connect to the primary cluster syncer
-	err = func(ctx context.Context) error {
-		ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
-		defer cancel()
-		_, err := m.syncer.Connect(ctx, s.Addr())
-		return err
-	}(ctx)
+	node.SyncerAddress = syncerListener.Addr().String()
+	// connect to the cluster syncer
+	_, err = m.syncer.Connect(ctx, node.SyncerAddress)
 	if err != nil {
 		return fmt.Errorf("failed to connect to cluster syncer: %w", err)
 	}
+	// connect to other nodes in the cluster
+	for _, n := range m.Nodes() {
+		_, err = s.Connect(ctx, n.SyncerAddress)
+		if err != nil {
+			return fmt.Errorf("failed to connect to peer syncer: %w", err)
+		}
+	}
 
 	wm, err := wallet.NewManager(cm, store, wallet.WithLogger(log.Named("wallet")), wallet.WithIndexMode(wallet.IndexModePersonal)) // TODO switch index modes
 	if err != nil {