update_engine: UM: Async request expiration handled differently.
As discussed on the tracker issue, we're changing the way an async
policy request expiration timeout is being handled: instead of failing
the policy request entirely, this now only causes the UpdateManager to
dump the evaluation context, reset the expiration deadline and
reevaluate the policy (which is necessary in order for evaluation time
and corresponding timeouts to be recomputed). This is aimed to ensure
that policies are allowed to block for arbitrarily long periods, while
still emitting useful information to the log (which will help diagnose
if this is due to an implementation error).
Since the expiration timeout no longer returns control to the caller, we
remove it from the AsyncPolicyRequest() API. Instead, we use a single
timeout value, which is set during the UpdateManager construction and
used for all policy calls. By default, the update engine sets it to 12
hours; for testing and debugging purposes, a smaller value is used.
This CL also forbids the default (fallback) policy from blocking,
forcing a failure instead; a situation like that makes no sense anyway,
and may lead to inconsistent return values leaking to the caller.
BUG=chromium:401687
TEST=Unit tests.
Change-Id: I0bf60875bb7f524c99ed72dac61720633ab2061b
Reviewed-on: https://chromium-review.googlesource.com/211647
Tested-by: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>
diff --git a/update_manager/evaluation_context.h b/update_manager/evaluation_context.h
index 909201e..81574d4 100644
--- a/update_manager/evaluation_context.h
+++ b/update_manager/evaluation_context.h
@@ -86,6 +86,11 @@
// be called right before any new evaluation starts.
void ResetEvaluation();
+ // Clears the expiration status of the EvaluationContext and resets its
+ // expiration timeout based on |expiration_timeout_|. This should be called if
+ // expiration occurred, prior to re-evaluating the policy.
+ void ResetExpiration();
+
// Schedules the passed |callback| closure to be called when a cached
// variable changes its value, a polling interval passes, or the context
// expiration occurs. If none of these events can happen, for example if
@@ -175,9 +180,11 @@
// current evaluation should finish.
base::Time evaluation_monotonic_deadline_;
- // The monotonic clock deadline at which expiration occurs. This is set once
- // during construction.
- const base::Time expiration_monotonic_deadline_;
+ // The expiration timeout of the evaluation context.
+ const base::TimeDelta expiration_timeout_;
+
+ // The monotonic clock deadline at which expiration occurs.
+ base::Time expiration_monotonic_deadline_;
base::WeakPtrFactory<EvaluationContext> weak_ptr_factory_;