Skip to content

Add retry delay on topic subscription failures #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 19, 2022
Merged

Add retry delay on topic subscription failures #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eef2605
Add retry delay on topic subscription failures
pennam Jan 13, 2022
696b48e
Avoid big nested 'if' when checking for subscribe_retry_delay
pennam Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/AIoTC_Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@

#define AIOT_CONFIG_RECONNECTION_RETRY_DELAY_ms (1000UL)
#define AIOT_CONFIG_MAX_RECONNECTION_RETRY_DELAY_ms (32000UL)
#define AIOT_CONFIG_SUBSCRIBE_RETRY_DELAY_ms (1000UL)
#define AIOT_CONFIG_SUBSCRIBE_MAX_RETRY_CNT (10UL)
#define AIOT_CONFIG_TIMEOUT_FOR_LASTVALUES_SYNC_ms (30000UL)
#define AIOT_CONFIG_LASTVALUES_SYNC_MAX_RETRY_CNT (10UL)

Expand Down
26 changes: 26 additions & 0 deletions src/ArduinoIoTCloudTCP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP()
, _last_connection_attempt_cnt{0}
, _last_sync_request_tick{0}
, _last_sync_request_cnt{0}
, _last_subscribe_request_tick{0}
, _last_subscribe_request_cnt{0}
, _mqtt_data_buf{0}
, _mqtt_data_len{0}
, _mqtt_data_request_retransmit{false}
Expand Down Expand Up @@ -404,6 +406,27 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeMqttTopics()
return State::ConnectPhy;
}

unsigned long const now = millis();
bool const is_subscribe_retry_delay_expired = (now - _last_subscribe_request_tick) > AIOT_CONFIG_SUBSCRIBE_RETRY_DELAY_ms;
bool const is_first_subscribe_request = (_last_subscribe_request_cnt == 0);

if (!is_first_subscribe_request && !is_subscribe_retry_delay_expired)
{
return State::SubscribeMqttTopics;
}

if (_last_subscribe_request_cnt > AIOT_CONFIG_SUBSCRIBE_MAX_RETRY_CNT)
{
_last_subscribe_request_cnt = 0;
_last_subscribe_request_tick = 0;
_mqttClient.stop();
execCloudEventCallback(ArduinoIoTCloudEvent::DISCONNECT);
return State::ConnectPhy;
}

_last_subscribe_request_tick = now;
_last_subscribe_request_cnt++;

if (!_mqttClient.subscribe(_dataTopicIn))
{
DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not subscribe to %s", __FUNCTION__, _dataTopicIn.c_str());
Expand All @@ -427,11 +450,14 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeMqttTopics()

DEBUG_INFO("Connected to Arduino IoT Cloud");
execCloudEventCallback(ArduinoIoTCloudEvent::CONNECT);
_last_subscribe_request_cnt = 0;
_last_subscribe_request_tick = 0;

if (_shadowTopicIn != "")
return State::RequestLastValues;
else
return State::Connected;

}

ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_RequestLastValues()
Expand Down
2 changes: 2 additions & 0 deletions src/ArduinoIoTCloudTCP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
unsigned int _last_connection_attempt_cnt;
unsigned long _last_sync_request_tick;
unsigned int _last_sync_request_cnt;
unsigned long _last_subscribe_request_tick;
unsigned int _last_subscribe_request_cnt;
String _brokerAddress;
uint16_t _brokerPort;
uint8_t _mqtt_data_buf[MQTT_TRANSMIT_BUFFER_SIZE];
Expand Down