Skip to content

Agent Mesh

fix tests

Antonio Ojea15a910875545
diff --git a/cmd/sam-node/main.go b/cmd/sam-node/main.go
index 68195789..1ecb9d73 100644
--- a/cmd/sam-node/main.go
+++ b/cmd/sam-node/main.go
@@ -74,6 +74,9 @@ var (
dataDirFlag string
allowLoopbackFlag bool
headlessFlag bool
+ autoRelayMinIntervalFlag time.Duration
+ autoRelayBootDelayFlag time.Duration
+ autoRelayBackoffFlag time.Duration
apiTokenFlag string
tlsCertFlag string
@@ -462,6 +465,9 @@ func main() {
runCmd.Flags().StringVar(&discoveryIntervalFlag, "discovery-interval", DefaultDiscoveryInterval, "Polling interval for DHT discovery")
runCmd.Flags().DurationVar(&monitorBootstrapFlag, "monitor-bootstrap", 2*time.Minute, "Initial wait before monitoring hub connection")
runCmd.Flags().DurationVar(&monitorCheckIntervalFlag, "monitor-interval", 1*time.Minute, "Interval for checking hub connection")
+ runCmd.Flags().DurationVar(&autoRelayMinIntervalFlag, "autorelay-min-interval", 30*time.Second, "AutoRelay Min Interval")
+ runCmd.Flags().DurationVar(&autoRelayBootDelayFlag, "autorelay-boot-delay", 0*time.Second, "AutoRelay Boot Delay")
+ runCmd.Flags().DurationVar(&autoRelayBackoffFlag, "autorelay-backoff", 3*time.Second, "AutoRelay Backoff")
runCmd.Flags().BoolVar(&enableRelayFlag, "enable-relay", false, "Allow this node to serve as a relay for others")
runCmd.Flags().StringVar(&logLevelFlag, "log-level", "info", "Log level (debug, info, warn, error)")
runCmd.Flags().DurationVar(&keyGracePeriodFlag, "key-grace-period", 24*time.Hour, "Key grace period for old keys (e.g. 24h)")
diff --git a/cmd/sam-node/node.go b/cmd/sam-node/node.go
index d0d2e3ae..04a18370 100644
--- a/cmd/sam-node/node.go
+++ b/cmd/sam-node/node.go
@@ -144,9 +144,12 @@ type SamNodeConfig struct {
EnableRelay bool
NodeConfig *NodeConfigComplete
KeyGracePeriod time.Duration
- AllowLoopback bool
- MonitorBootstrap time.Duration
- MonitorInterval time.Duration
+ AllowLoopback bool
+ MonitorBootstrap time.Duration
+ MonitorInterval time.Duration
+ AutoRelayMinInterval time.Duration
+ AutoRelayBootDelay time.Duration
+ AutoRelayBackoff time.Duration
}
// NewSamNode creates a new Agent instance secured with the 4-layer pipeline.
@@ -258,8 +261,9 @@ func NewSamNode(ctx context.Context, cfg SamNodeConfig) (*SamNode, error) {
}()
return c
},
- autorelay.WithBootDelay(0),
- autorelay.WithBackoff(3*time.Second),
+ autorelay.WithBootDelay(cfg.AutoRelayBootDelay),
+ autorelay.WithBackoff(cfg.AutoRelayBackoff),
+ autorelay.WithMinInterval(cfg.AutoRelayMinInterval),
))
}
diff --git a/tests/integration/failover_test.go b/tests/integration/failover_test.go
index 80d1a326..bcc26e8f 100644
--- a/tests/integration/failover_test.go
+++ b/tests/integration/failover_test.go
@@ -143,6 +143,9 @@ roles: {}
"--allow-loopback",
"--monitor-bootstrap", "1s",
"--monitor-interval", "1s",
+ "--autorelay-min-interval", "0s",
+ "--autorelay-backoff", "1s",
+ "--autorelay-boot-delay", "0s",
)
cmdNode.Dir = repoRoot(t)
cmdNode.Env = env
@@ -198,12 +201,6 @@ roles: {}
t.Log("Node B successfully reconnected to Hub B!")
// Final verification: Ensure we can actually reach Node B via the Hub B relay
- clientHost, err := libp2p.New(libp2p.NoListenAddrs, libp2p.EnableRelay())
- if err != nil {
- t.Fatal(err)
- }
- defer clientHost.Close() //nolint:errcheck
-
relayAddrStr := fmt.Sprintf("/ip4/127.0.0.1/tcp/%d/p2p/%s/p2p-circuit/p2p/%s", p2pPortB, peerIDB, nodePeerID)
relayAddr, err := multiaddr.NewMultiaddr(relayAddrStr)
if err != nil {
@@ -219,7 +216,12 @@ roles: {}
var connectErr error
for i := 0; i < 15; i++ {
+ clientHost, err := libp2p.New(libp2p.NoListenAddrs, libp2p.EnableRelay())
+ if err != nil {
+ t.Fatal(err)
+ }
connectErr = clientHost.Connect(ctx, *addrInfo)
+ clientHost.Close() // nolint:errcheck
if connectErr == nil {
break
}