Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
MB-51838 Allow more time for magma bucket deletion
This increases the timeout for deleting a magma bucket to 5 minutes. The
reason is that magma may have many, many thousands of files which must
be deleted.

We already have comparable timeouts for magma bucket online for the same
reason (handling many files).

Change-Id: I04a273ef8572c161e6d8c6ace14716dfc084fc00
Reviewed-on: https://review.couchbase.org/c/ns_server/+/174007
Well-Formed: Build Bot <build@couchbase.com>
Tested-by: Build Bot <build@couchbase.com>
Tested-by: Steve Watanabe <steve.watanabe@couchbase.com>
Reviewed-by: Navdeep S Boparai <navdeep.boparai@couchbase.com>
  • Loading branch information
stevewatanabe committed Apr 22, 2022
1 parent 58cd91f commit 28ac90d
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions src/ns_orchestrator.erl
Expand Up @@ -62,6 +62,7 @@
-define(SERVER, {via, leader_registry, ?MODULE}).

-define(DELETE_BUCKET_TIMEOUT, ?get_timeout(delete_bucket, 30000)).
-define(DELETE_MAGMA_BUCKET_TIMEOUT, ?get_timeout(delete_bucket, 300000)).
-define(FLUSH_BUCKET_TIMEOUT, ?get_timeout(flush_bucket, 60000)).
-define(CREATE_BUCKET_TIMEOUT, ?get_timeout(create_bucket, 5000)).
-define(JANITOR_RUN_TIMEOUT, ?get_timeout(ensure_janitor_run, 30000)).
Expand Down Expand Up @@ -633,14 +634,20 @@ idle({delete_bucket, BucketName}, From, _State) ->
Pred = fun (Active) ->
not lists:member(BucketName, Active)
end,
Timeout = case ns_bucket:kv_backend_type(BucketConfig) of
magma ->
?DELETE_MAGMA_BUCKET_TIMEOUT;
_ ->
?DELETE_BUCKET_TIMEOUT
end,
LeftoverNodes =
case wait_for_nodes(Nodes, Pred, ?DELETE_BUCKET_TIMEOUT) of
case wait_for_nodes(Nodes, Pred, Timeout) of
ok ->
[];
{timeout, LeftoverNodes0} ->
?log_warning("Nodes ~p failed to delete bucket ~p "
"within expected time.",
[LeftoverNodes0, BucketName]),
"within expected time (~p msecs).",
[LeftoverNodes0, BucketName, Timeout]),
LeftoverNodes0
end,

Expand Down

0 comments on commit 28ac90d

Please sign in to comment.