Commit a5f4857b authored by Chris Morin's avatar Chris Morin Committed by Commit Bot

arc: Increase android container startup timeout

Workaround for patchoat intermittently taking much longer than normal to
complete on startup. This will be reverted once issue is root caused and
fixed.

Bug: 117832337
Test: Add a sleep 30 before patchoat and ensure container starts
Change-Id: I3c66110dff876b8aa61fa4fb12c658038db978a3
Reviewed-on: https://chromium-review.googlesource.com/c/1322352
Commit-Queue: Christopher Morin <cmtm@google.com>
Reviewed-by: default avatarRyo Hashimoto <hashimoto@chromium.org>
Reviewed-by: default avatarYusuke Sato <yusukes@chromium.org>
Reviewed-by: default avatarMike Frysinger <vapier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606205}
parent 03342c7b
...@@ -43,6 +43,8 @@ using RetrievePolicyResponseType = ...@@ -43,6 +43,8 @@ using RetrievePolicyResponseType =
SessionManagerClient::RetrievePolicyResponseType; SessionManagerClient::RetrievePolicyResponseType;
constexpr char kEmptyAccountId[] = ""; constexpr char kEmptyAccountId[] = "";
// The timeout used when starting the android container is 90 seconds
constexpr int kStartArcTimeout = 90 * 1000;
// Helper to get the enum type of RetrievePolicyResponseType based on error // Helper to get the enum type of RetrievePolicyResponseType based on error
// name. // name.
...@@ -403,7 +405,7 @@ class SessionManagerClientImpl : public SessionManagerClient { ...@@ -403,7 +405,7 @@ class SessionManagerClientImpl : public SessionManagerClient {
writer.AppendProtoAsArrayOfBytes(request); writer.AppendProtoAsArrayOfBytes(request);
session_manager_proxy_->CallMethod( session_manager_proxy_->CallMethod(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, &method_call, kStartArcTimeout,
base::BindOnce(&SessionManagerClientImpl::OnStartArcMiniContainer, base::BindOnce(&SessionManagerClientImpl::OnStartArcMiniContainer,
weak_ptr_factory_.GetWeakPtr(), std::move(callback))); weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment