mirror of
https://github.com/espressif/openthread.git
synced 2026-07-27 06:17:47 +00:00
[srp-client] enhance selection of TX jitter based on trigger reason (#10357)
This commit improves the `Srp::Client` mechanism for applying random
jitter delays before sending update messages to the server. It now
supports different jitter ranges based on specific triggers. Since
trigger events are often network-wide, potentially causing
simultaneous SRP re-registration from many nodes, longer jitter
intervals are used to distribute the resulting SRP update
transmissions and avoid congestion.
The following triggers are covered:
- Server switch: Client switching to a new server while already
connected to a discovered server. This occurs when a new server
entry appears in Network Data which is preferred over the current
selection.
- Server restart: Client was previously connected to a server that
disappeared from Network Data. Later, the same or a new server is
discovered in Network Data.
- SLAAC address add or remove: This is generally triggered by updates
to SLAAC prefixes in Network Data (e.g., OMR prefix changes).
- First registration after attach:
- If the device is attaching to an established Thread mesh
(e.g., after a reboot or initial pairing), the Network Data it
receives should already include a server entry, leading to a
quick server selection after attach. If server selection occurs
within a short window, a shorter TX jitter is used, allowing the
device to register quickly and become discoverable.
- If server discovery takes longer, a longer TX jitter is used. This
situation can indicate a server/BR starting up or a network-wide
restart of many nodes (e.g., due to a power outage).
This commit introduces `TxJitter` class to manage the requested TX
jitter based on a trigger reason. It tracks the time of the event
that triggered a longer jitter request. If the update message is sent
immediately after the trigger event, the requested maximum jitter is
applied. However, if the update message is sent later, the maximum
jitter is adjusted proportionally to the time elapsed since the
trigger event. If the elapsed time exceeds the requested maximum
jitter interval, the default short jitter is applied to avoid
unnecessary registration delay.
This commit is contained in:
@@ -84,7 +84,7 @@ class TestDnssdNameWithSpecialChars(thread_cert.TestCase):
|
||||
|
||||
server.srp_server_set_enabled(True)
|
||||
client.srp_client_enable_auto_start_mode()
|
||||
self.simulator.go(5)
|
||||
self.simulator.go(15)
|
||||
|
||||
# Register a single service with the instance name containing special chars
|
||||
client.srp_client_set_host_name('host1')
|
||||
|
||||
@@ -74,6 +74,7 @@ class SrpAutoHostAddress(thread_cert.TestCase):
|
||||
client.start()
|
||||
self.simulator.go(15)
|
||||
self.assertEqual(client.get_state(), 'leader')
|
||||
client.srp_client_stop()
|
||||
|
||||
server.start()
|
||||
self.simulator.go(5)
|
||||
@@ -88,8 +89,9 @@ class SrpAutoHostAddress(thread_cert.TestCase):
|
||||
#-------------------------------------------------------------------
|
||||
# Check auto start mode on SRP client
|
||||
|
||||
client.srp_client_enable_auto_start_mode()
|
||||
self.assertEqual(client.srp_client_get_auto_start_mode(), 'Enabled')
|
||||
self.simulator.go(2)
|
||||
self.simulator.go(15)
|
||||
|
||||
self.assertEqual(client.srp_client_get_state(), 'Enabled')
|
||||
|
||||
@@ -135,7 +137,7 @@ class SrpAutoHostAddress(thread_cert.TestCase):
|
||||
|
||||
client.add_prefix('fd00:abba:cafe:bee::/64', 'paos')
|
||||
client.register_netdata()
|
||||
self.simulator.go(5)
|
||||
self.simulator.go(15)
|
||||
|
||||
slaac_addr = [addr.strip() for addr in client.get_addrs() if addr.strip().startswith('fd00:abba:cafe:bee:')]
|
||||
self.assertEqual(len(slaac_addr), 1)
|
||||
@@ -147,7 +149,7 @@ class SrpAutoHostAddress(thread_cert.TestCase):
|
||||
|
||||
client.add_prefix('fd00:9:8:7::/64', 'paos')
|
||||
client.register_netdata()
|
||||
self.simulator.go(5)
|
||||
self.simulator.go(15)
|
||||
|
||||
slaac_addr = [addr.strip() for addr in client.get_addrs() if addr.strip().startswith('fd00:9:8:7:')]
|
||||
self.assertEqual(len(slaac_addr), 1)
|
||||
@@ -160,7 +162,7 @@ class SrpAutoHostAddress(thread_cert.TestCase):
|
||||
|
||||
client.add_prefix('fd00:a:b:c::/64', 'aos')
|
||||
client.register_netdata()
|
||||
self.simulator.go(5)
|
||||
self.simulator.go(15)
|
||||
|
||||
slaac_addr = [addr.strip() for addr in client.get_addrs() if addr.strip().startswith('fd00:a:b:c:')]
|
||||
self.assertEqual(len(slaac_addr), 1)
|
||||
@@ -173,7 +175,7 @@ class SrpAutoHostAddress(thread_cert.TestCase):
|
||||
client.remove_prefix('fd00:abba:cafe:bee::/64')
|
||||
client.register_netdata()
|
||||
|
||||
self.simulator.go(5)
|
||||
self.simulator.go(15)
|
||||
|
||||
self.check_registered_addresses(client, server)
|
||||
|
||||
@@ -184,7 +186,7 @@ class SrpAutoHostAddress(thread_cert.TestCase):
|
||||
client.remove_prefix('fd00:9:8:7::/64')
|
||||
client.register_netdata()
|
||||
|
||||
self.simulator.go(5)
|
||||
self.simulator.go(15)
|
||||
|
||||
self.check_registered_addresses(client, server)
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ class SrpRemoveHost(thread_cert.TestCase):
|
||||
|
||||
server.srp_server_set_enabled(True)
|
||||
client.srp_client_enable_auto_start_mode()
|
||||
self.simulator.go(5)
|
||||
self.simulator.go(15)
|
||||
|
||||
#-------------------------------------------------------------------------------------
|
||||
# Register a single service and verify that it worked.
|
||||
|
||||
@@ -48,7 +48,7 @@ SERVER1 = 2
|
||||
SERVER2 = 3
|
||||
SERVER3 = 4
|
||||
|
||||
WAIT_TIME = 5
|
||||
WAIT_TIME = 16
|
||||
MAX_ITER = 5
|
||||
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@ class SrpRegisterSingleService(thread_cert.TestCase):
|
||||
|
||||
# Start the client again, the same service should be successfully registered.
|
||||
client.srp_client_enable_auto_start_mode()
|
||||
self.simulator.go(2)
|
||||
self.simulator.go(15)
|
||||
|
||||
self.check_host_and_service(server, client)
|
||||
|
||||
@@ -132,7 +132,7 @@ class SrpRegisterSingleService(thread_cert.TestCase):
|
||||
|
||||
# Start the client again, the same service should be successfully registered.
|
||||
client.srp_client_enable_auto_start_mode()
|
||||
self.simulator.go(2)
|
||||
self.simulator.go(15)
|
||||
|
||||
self.check_host_and_service(server, client)
|
||||
|
||||
|
||||
@@ -84,7 +84,7 @@ class SrpManyServicesMtuCheck(thread_cert.TestCase):
|
||||
|
||||
server.srp_server_set_enabled(True)
|
||||
client.srp_client_enable_auto_start_mode()
|
||||
self.simulator.go(5)
|
||||
self.simulator.go(15)
|
||||
|
||||
# Register 8 services with long name, 6 sub-types and long txt record.
|
||||
# The 8 services won't be fit in a single MTU (1280 bytes) UDP message
|
||||
|
||||
@@ -84,7 +84,7 @@ class SrpRegisterServicesDiffLease(thread_cert.TestCase):
|
||||
server.srp_server_set_enabled(True)
|
||||
client.srp_client_enable_auto_start_mode()
|
||||
|
||||
self.simulator.go(5)
|
||||
self.simulator.go(15)
|
||||
|
||||
client.srp_client_set_host_name('host')
|
||||
client.srp_client_enable_auto_host_address()
|
||||
|
||||
@@ -147,7 +147,7 @@ class TestSrpServerAnycastMode(thread_cert.TestCase):
|
||||
# server and uses the proper address and port number.
|
||||
|
||||
client.srp_client_enable_auto_start_mode()
|
||||
self.simulator.go(5)
|
||||
self.simulator.go(15)
|
||||
|
||||
if addr_mode == 'anycast':
|
||||
server_alocs = server.get_ip6_address(config.ADDRESS_TYPE.ALOC)
|
||||
|
||||
@@ -109,7 +109,7 @@ class SrpServerRebootPort(thread_cert.TestCase):
|
||||
client.srp_client_set_host_name('my-host')
|
||||
client.srp_client_set_host_address('2001::1')
|
||||
client.srp_client_add_service('my-service', '_ipps._tcp', 12345, 0, 0, ['abc', 'def=', 'xyz=XYZ'])
|
||||
self.simulator.go(5)
|
||||
self.simulator.go(16)
|
||||
self.check_host_and_service(server, client, '2001::1')
|
||||
|
||||
ports = [server.get_srp_server_port()]
|
||||
@@ -129,7 +129,7 @@ class SrpServerRebootPort(thread_cert.TestCase):
|
||||
# re-registered.
|
||||
#
|
||||
server.srp_server_set_enabled(True)
|
||||
self.simulator.go(5)
|
||||
self.simulator.go(16)
|
||||
self.assertEqual(client.srp_client_get_state(), 'Enabled')
|
||||
self.assertEqual(client.srp_client_get_server_address(), server.get_mleid())
|
||||
self.assertNotEqual(old_port, server.get_srp_server_port())
|
||||
|
||||
@@ -80,7 +80,7 @@ class SrpSubType(thread_cert.TestCase):
|
||||
|
||||
server.srp_server_set_enabled(True)
|
||||
client.srp_client_enable_auto_start_mode()
|
||||
self.simulator.go(5)
|
||||
self.simulator.go(15)
|
||||
|
||||
# Register a single service with 3 subtypes and verify that it worked.
|
||||
|
||||
|
||||
@@ -85,6 +85,7 @@ class SrpTtl(thread_cert.TestCase):
|
||||
self.simulator.go(config.ROUTER_STARTUP_DELAY)
|
||||
self.assertEqual(client.get_state(), 'router')
|
||||
|
||||
self.simulator.go(15)
|
||||
self.assertEqual(client.srp_client_get_auto_start_mode(), 'Enabled')
|
||||
|
||||
client.srp_client_set_host_name('my-host')
|
||||
|
||||
Reference in New Issue
Block a user