diff options
author | James Fish <[email protected]> | 2013-04-04 01:59:53 +0100 |
---|---|---|
committer | James Fish <[email protected]> | 2013-04-04 12:22:11 +0100 |
commit | c59c3a6d57b857913ddfa13f96425ba0d95ccb2d (patch) | |
tree | 3df89de54964e1fb9b2bd181ce7990d1c2f5d2a4 /lib/stdlib/test/supervisor_3.erl | |
parent | 8dba74ac7ff331a2c4870cc64b62dd4f168533eb (diff) | |
download | otp-c59c3a6d57b857913ddfa13f96425ba0d95ccb2d.tar.gz otp-c59c3a6d57b857913ddfa13f96425ba0d95ccb2d.tar.bz2 otp-c59c3a6d57b857913ddfa13f96425ba0d95ccb2d.zip |
Fix rest_for_one and one_for_all restarting a child not terminated
In rest_for_one and one_for_all supervisors one child dying can cause
multiple children to be restarted. Previously if the child that caused
the restart is started successfully but another child fails to start,
the supervisor would not terminate this child with the other
successfully restarted children as no record of the pid was kept. Thus
the supervisor would try to start this child again. This could lead to
multiples of the same child or if the child is registered cause repeated
attempts at starting this child - until the max restart threshold was
reached.
Now the child that failed to start becomes the restarting child, instead
of staying with the same child, for the next restart attempt. This has
the following side effects:
1) In one_for_all the new version of the child that original died is
terminated before a restart attempt is made.
2) In rest_for_one all succesfully restarted children are not terminated
and restarting continues from the child that failed to start.
Diffstat (limited to 'lib/stdlib/test/supervisor_3.erl')
-rw-r--r-- | lib/stdlib/test/supervisor_3.erl | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/lib/stdlib/test/supervisor_3.erl b/lib/stdlib/test/supervisor_3.erl new file mode 100644 index 0000000000..31b3037d6f --- /dev/null +++ b/lib/stdlib/test/supervisor_3.erl @@ -0,0 +1,45 @@ +%% +%% %CopyrightBegin% +%% +%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% +%% The contents of this file are subject to the Erlang Public License, +%% Version 1.1, (the "License"); you may not use this file except in +%% compliance with the License. You should have received a copy of the +%% Erlang Public License along with this software. If not, it can be +%% retrieved online at http://www.erlang.org/. +%% +%% Software distributed under the License is distributed on an "AS IS" +%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See +%% the License for the specific language governing rights and limitations +%% under the License. +%% +%% %CopyrightEnd% +%% +%% Description: Simulates the behaviour that a child process may have. +%% Is used by the supervisor_SUITE test suite. +-module(supervisor_3). + +-export([start_child/2, init/1]). + +-export([handle_call/3, handle_info/2, terminate/2]). + +start_child(Name, Caller) -> + gen_server:start_link(?MODULE, [Name, Caller], []). + +init([Name, Caller]) -> + Caller ! {Name, self()}, + receive + {Result, Caller} -> + Result + end. + +handle_call(Req, _From, State) -> + {reply, Req, State}. + +handle_info(_, State) -> + {noreply, State}. + +terminate(_Reason, Time) -> + timer:sleep(Time), + ok. |