Increase device registration timeout interval
Since the slow network could take long time to come up, increase wifi
connection timeout to 3 minutes. Also we start device registration
process at the same time as the network setup, so a few HTTP requests
are bound to fail before the network is connected, so redesigned the
logic of retrying device registration requests.
We start with exponential backoff that is capped at 5 seconds. We don't
want to wait longer between attempts during the network setup. We keep
trying to make a successfull HTTP request to register the device for
up to 5 minutes before aborting.
BUG: 23748366
Change-Id: I96d15c92067d3ad2561360a9d6ef2ae47168fcd7
diff --git a/libweave/src/privet/cloud_delegate.cc b/libweave/src/privet/cloud_delegate.cc
index 535af14..c7d8c24 100644
--- a/libweave/src/privet/cloud_delegate.cc
+++ b/libweave/src/privet/cloud_delegate.cc
@@ -14,6 +14,7 @@
#include <weave/error.h>
#include <weave/task_runner.h>
+#include "libweave/src/backoff_entry.h"
#include "libweave/src/commands/command_manager.h"
#include "libweave/src/config.h"
#include "libweave/src/device_registration_info.h"
@@ -25,8 +26,10 @@
namespace {
-const int kMaxSetupRetries = 5;
-const int kFirstRetryTimeoutSec = 2;
+const BackoffEntry::Policy register_backoff_policy =
+ { 0, 1000, 2.0, 0.2, 5000, -1, false };
+
+const int kMaxDeviceRegistrationTimeMinutes = 5;
Command* ReturnNotFound(const std::string& command_id, ErrorPtr* error) {
Error::AddToPrintf(error, FROM_HERE, errors::kDomain, errors::kNotFound,
@@ -141,11 +144,15 @@
<< ", user:" << user;
setup_state_ = SetupState(SetupState::kInProgress);
setup_weak_factory_.InvalidateWeakPtrs();
+ backoff_entry_.Reset();
+ base::Time deadline = base::Time::Now();
+ deadline += base::TimeDelta::FromMinutes(kMaxDeviceRegistrationTimeMinutes);
task_runner_->PostDelayedTask(
FROM_HERE, base::Bind(&CloudDelegateImpl::CallManagerRegisterDevice,
- setup_weak_factory_.GetWeakPtr(), ticket_id, 0),
- base::TimeDelta::FromSeconds(kSetupDelaySeconds));
- // Return true because we tried setup.
+ setup_weak_factory_.GetWeakPtr(), ticket_id,
+ deadline),
+ {});
+ // Return true because we initiated setup.
return true;
}
@@ -278,31 +285,34 @@
NotifyOnCommandDefsChanged();
}
- void RetryRegister(const std::string& ticket_id, int retries, Error* error) {
- if (retries >= kMaxSetupRetries) {
- ErrorPtr new_error{error ? error->Clone() : nullptr};
- Error::AddTo(&new_error, FROM_HERE, errors::kDomain,
- errors::kInvalidState, "Failed to register device");
- setup_state_ = SetupState{std::move(new_error)};
- return;
- }
- task_runner_->PostDelayedTask(
- FROM_HERE,
- base::Bind(&CloudDelegateImpl::CallManagerRegisterDevice,
- setup_weak_factory_.GetWeakPtr(), ticket_id, retries + 1),
- base::TimeDelta::FromSeconds(kFirstRetryTimeoutSec << retries));
- }
-
void OnRegisterSuccess(const std::string& device_id) {
VLOG(1) << "Device registered: " << device_id;
setup_state_ = SetupState(SetupState::kSuccess);
}
- void CallManagerRegisterDevice(const std::string& ticket_id, int retries) {
+ void CallManagerRegisterDevice(const std::string& ticket_id,
+ const base::Time& deadline) {
ErrorPtr error;
- if (device_->RegisterDevice(ticket_id, &error).empty())
- return RetryRegister(ticket_id, retries, error.get());
- setup_state_ = SetupState(SetupState::kSuccess);
+ if (base::Time::Now() > deadline) {
+ Error::AddTo(&error, FROM_HERE, errors::kDomain,
+ errors::kInvalidState, "Failed to register device");
+ setup_state_ = SetupState{std::move(error)};
+ return;
+ }
+
+ if (!device_->RegisterDevice(ticket_id, &error).empty()) {
+ backoff_entry_.InformOfRequest(true);
+ setup_state_ = SetupState(SetupState::kSuccess);
+ return;
+ }
+
+ // Registration failed. Retry with backoff.
+ backoff_entry_.InformOfRequest(false);
+ task_runner_->PostDelayedTask(
+ FROM_HERE,
+ base::Bind(&CloudDelegateImpl::CallManagerRegisterDevice,
+ setup_weak_factory_.GetWeakPtr(), ticket_id, deadline),
+ backoff_entry_.GetTimeUntilRelease());
}
Command* GetCommandInternal(const std::string& command_id,
@@ -359,6 +369,9 @@
// Map of command IDs to user IDs.
std::map<std::string, uint64_t> command_owners_;
+ // Backoff entry for retrying device registration.
+ BackoffEntry backoff_entry_{®ister_backoff_policy};
+
// |setup_weak_factory_| tracks the lifetime of callbacks used in connection
// with a particular invocation of Setup().
base::WeakPtrFactory<CloudDelegateImpl> setup_weak_factory_{this};
diff --git a/libweave/src/privet/constants.h b/libweave/src/privet/constants.h
index e95ec2f..256cf9e 100644
--- a/libweave/src/privet/constants.h
+++ b/libweave/src/privet/constants.h
@@ -8,9 +8,6 @@
namespace weave {
namespace privet {
-// Time to reply on privet HTTP.
-const int kSetupDelaySeconds = 1;
-
namespace errors {
extern const char kDomain[];
diff --git a/libweave/src/privet/wifi_bootstrap_manager.cc b/libweave/src/privet/wifi_bootstrap_manager.cc
index 5529030..5a32419 100644
--- a/libweave/src/privet/wifi_bootstrap_manager.cc
+++ b/libweave/src/privet/wifi_bootstrap_manager.cc
@@ -17,9 +17,9 @@
namespace privet {
namespace {
-const int kConnectTimeoutSeconds = 60;
-const int kBootstrapTimeoutSeconds = 600;
-const int kMonitorTimeoutSeconds = 120;
+const int kConnectTimeoutMinutes = 3;
+const int kBootstrapTimeoutMinutes = 10;
+const int kMonitorTimeoutMinutes = 2;
}
WifiBootstrapManager::WifiBootstrapManager(
@@ -81,7 +81,7 @@
task_runner_->PostDelayedTask(
FROM_HERE, base::Bind(&WifiBootstrapManager::OnBootstrapTimeout,
tasks_weak_factory_.GetWeakPtr()),
- base::TimeDelta::FromSeconds(kBootstrapTimeoutSeconds));
+ base::TimeDelta::FromMinutes(kBootstrapTimeoutMinutes));
}
// TODO(vitalybuka): Add SSID probing.
privet_ssid_ = GenerateSsid();
@@ -104,7 +104,7 @@
task_runner_->PostDelayedTask(
FROM_HERE, base::Bind(&WifiBootstrapManager::OnConnectTimeout,
tasks_weak_factory_.GetWeakPtr()),
- base::TimeDelta::FromSeconds(kConnectTimeoutSeconds));
+ base::TimeDelta::FromMinutes(kConnectTimeoutMinutes));
network_->ConnectToService(ssid, passphrase,
base::Bind(&WifiBootstrapManager::OnConnectSuccess,
tasks_weak_factory_.GetWeakPtr(), ssid),
@@ -179,12 +179,13 @@
const std::string& passphrase,
ErrorPtr* error) {
setup_state_ = SetupState{SetupState::kInProgress};
- // TODO(vitalybuka): Find more reliable way to finish request or move delay
- // into PrivetHandler as it's very HTTP specific.
+ // Since we are changing network, we need to let the web server send out the
+ // response to the HTTP request leading to this action. So, we are waiting
+ // a bit before mocking with network set up.
task_runner_->PostDelayedTask(
FROM_HERE, base::Bind(&WifiBootstrapManager::StartConnecting,
tasks_weak_factory_.GetWeakPtr(), ssid, passphrase),
- base::TimeDelta::FromSeconds(kSetupDelaySeconds));
+ base::TimeDelta::FromSeconds(1));
return true;
}
@@ -247,7 +248,7 @@
task_runner_->PostDelayedTask(
FROM_HERE, base::Bind(&WifiBootstrapManager::OnMonitorTimeout,
tasks_weak_factory_.GetWeakPtr()),
- base::TimeDelta::FromSeconds(kMonitorTimeoutSeconds));
+ base::TimeDelta::FromMinutes(kMonitorTimeoutMinutes));
}
}
}
