diff --git a/cmd/sam-node/main.go b/cmd/sam-node/main.go index 1ecb9d7..42bd7f9 100644 --- a/cmd/sam-node/main.go +++ b/cmd/sam-node/main.go @@ -190,12 +190,15 @@ func main() { MeshID: meshFlag, DiscoveryInterval: discoveryIntervalFlag, ListenAddrs: listenAddrs, - EnableRelay: enableRelayFlag, - NodeConfig: nodeConfig, - KeyGracePeriod: keyGracePeriodFlag, - AllowLoopback: allowLoopbackFlag, - MonitorBootstrap: monitorBootstrapFlag, - MonitorInterval: monitorCheckIntervalFlag, + EnableRelay: enableRelayFlag, + NodeConfig: nodeConfig, + KeyGracePeriod: keyGracePeriodFlag, + AllowLoopback: allowLoopbackFlag, + MonitorBootstrap: monitorBootstrapFlag, + MonitorInterval: monitorCheckIntervalFlag, + AutoRelayMinInterval: autoRelayMinIntervalFlag, + AutoRelayBootDelay: autoRelayBootDelayFlag, + AutoRelayBackoff: autoRelayBackoffFlag, }) if err != nil { logger.Fatalf("Failed to start mesh node: %v", err) @@ -243,11 +246,14 @@ func main() { DiscoveryInterval: discoveryIntervalFlag, ListenAddrs: listenAddrs, EnableRelay: enableRelayFlag, - NodeConfig: nodeConfig, - KeyGracePeriod: keyGracePeriodFlag, - AllowLoopback: allowLoopbackFlag, - MonitorBootstrap: monitorBootstrapFlag, - MonitorInterval: monitorCheckIntervalFlag, + NodeConfig: nodeConfig, + KeyGracePeriod: keyGracePeriodFlag, + AllowLoopback: allowLoopbackFlag, + MonitorBootstrap: monitorBootstrapFlag, + MonitorInterval: monitorCheckIntervalFlag, + AutoRelayMinInterval: autoRelayMinIntervalFlag, + AutoRelayBootDelay: autoRelayBootDelayFlag, + AutoRelayBackoff: autoRelayBackoffFlag, }) if err != nil { enrollCancel() @@ -287,11 +293,14 @@ func main() { DiscoveryInterval: discoveryIntervalFlag, ListenAddrs: listenAddrs, EnableRelay: enableRelayFlag, - NodeConfig: nodeConfig, - KeyGracePeriod: keyGracePeriodFlag, - AllowLoopback: allowLoopbackFlag, - MonitorBootstrap: monitorBootstrapFlag, - MonitorInterval: monitorCheckIntervalFlag, + NodeConfig: nodeConfig, + KeyGracePeriod: keyGracePeriodFlag, + AllowLoopback: allowLoopbackFlag, + MonitorBootstrap: monitorBootstrapFlag, + MonitorInterval: monitorCheckIntervalFlag, + AutoRelayMinInterval: autoRelayMinIntervalFlag, + AutoRelayBootDelay: autoRelayBootDelayFlag, + AutoRelayBackoff: autoRelayBackoffFlag, }) if err != nil { logger.Fatalf("Failed to start mesh node after enrollment: %v", err) @@ -431,11 +440,14 @@ func main() { DiscoveryInterval: discoveryIntervalFlag, ListenAddrs: []string{"/ip4/0.0.0.0/udp/0/quic-v1", "/ip4/0.0.0.0/tcp/0"}, EnableRelay: enableRelayFlag, - NodeConfig: nodeConfig, - KeyGracePeriod: keyGracePeriodFlag, - AllowLoopback: allowLoopbackFlag, - MonitorBootstrap: 2 * time.Minute, - MonitorInterval: 1 * time.Minute, + NodeConfig: nodeConfig, + KeyGracePeriod: keyGracePeriodFlag, + AllowLoopback: allowLoopbackFlag, + MonitorBootstrap: 2 * time.Minute, + MonitorInterval: 1 * time.Minute, + AutoRelayMinInterval: 30 * time.Second, + AutoRelayBootDelay: 0 * time.Second, + AutoRelayBackoff: 3 * time.Second, }) if err != nil { logger.Fatalf("Failed to initialize node for enrollment: %v", err) diff --git a/tests/integration/failover_test.go b/tests/integration/failover_test.go index bcc26e8..57e3c83 100644 --- a/tests/integration/failover_test.go +++ b/tests/integration/failover_test.go @@ -143,7 +143,7 @@ roles: {} "--allow-loopback", "--monitor-bootstrap", "1s", "--monitor-interval", "1s", - "--autorelay-min-interval", "0s", + "--autorelay-min-interval", "1s", "--autorelay-backoff", "1s", "--autorelay-boot-delay", "0s", )