Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Received-SPF: pass (athena.apache.org: domain of bchesneau@gmail.com
 designates 209.85.215.180 as permitted sender)
MIME-Version: 1.0
In-Reply-To: 
 <CAL3q7H7RAEHVpzVgvavPKQY+nM2r9nLN4mVXJUbb=UEhf6BdYA@mail.gmail.com>
References: <20120425221825.0D5A2E588@tyr.zones.apache.org>
	<CAJNb-9qZnR1s4hhdPkiKjFeqjnfBrt-sOyNmQtN0kKpGke1pwg@mail.gmail.com>
	<CAL3q7H6a+nB5xR9P_rUtRW-ajeeFJPTXgnvo9yq=AQ8B3fCWdw@mail.gmail.com>
	<CAJNb-9rdFWWzEqgL3QW2hR_Q7qr3iYrYH=fFqxiz6Rt53gX25w@mail.gmail.com>
	<CAL3q7H7RAEHVpzVgvavPKQY+nM2r9nLN4mVXJUbb=UEhf6BdYA@mail.gmail.com>
Date: Thu, 26 Apr 2012 14:23:16 +0200
Message-ID: 
 <CAJNb-9pN2yf7YR1bq_qGnYMWuVDx-W824_=w7bEMP+OTCGQ6GQ@mail.gmail.com>
Subject: Re: [2/8] git commit: Fixing the replicator_db JS test
From: Benoit Chesneau <bchesneau@gmail.com>
To: dev@couchdb.apache.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On Thu, Apr 26, 2012 at 2:18 PM, Filipe David Manana <fdmanana@gmail.com> w=
rote:
> On Thu, Apr 26, 2012 at 1:10 PM, Benoit Chesneau <bchesneau@gmail.com> wr=
ote:
>> On Thu, Apr 26, 2012 at 2:05 PM, Filipe David Manana <fdmanana@gmail.com=
> wrote:
>>> On Thu, Apr 26, 2012 at 12:26 PM, Benoit Chesneau <bchesneau@gmail.com>=
 wrote:
>>>> On Thu, Apr 26, 2012 at 12:18 AM, =A0<davisp@apache.org> wrote:
>>>>> Fixing the replicator_db JS test
>>>>>
>>>>>
>>>>> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
>>>>> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6c976bd=
9
>>>>> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6c976bd9
>>>>> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6c976bd9
>>>>>
>>>>> Branch: refs/heads/master
>>>>> Commit: 6c976bd948565305c006746f449dc8cd21a749e1
>>>>> Parents: 7d2fe95
>>>>> Author: Paul Joseph Davis <davisp@apache.org>
>>>>> Authored: Mon Mar 26 15:17:02 2012 -0500
>>>>> Committer: Paul Joseph Davis <davisp@apache.org>
>>>>> Committed: Wed Apr 25 16:54:08 2012 -0500
>>>>>
>>>>> ---------------------------------------------------------------------=
-
>>>>> =A0share/www/script/test/replicator_db.js =A0 =A0 =A0 =A0| =A0 =A04 +=
+++
>>>>> =A0src/couch_replicator/src/couch_replicator.erl | =A0 =A05 ++++-
>>>>> =A02 files changed, 8 insertions(+), 1 deletions(-)
>>>>> ---------------------------------------------------------------------=
-
>>>>>
>>>>>
>>>>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/6c976bd9/share/ww=
w/script/test/replicator_db.js
>>>>> ---------------------------------------------------------------------=
-
>>>>> diff --git a/share/www/script/test/replicator_db.js b/share/www/scrip=
t/test/replicator_db.js
>>>>> index 48ca341..edc85f4 100644
>>>>> --- a/share/www/script/test/replicator_db.js
>>>>> +++ b/share/www/script/test/replicator_db.js
>>>>> @@ -1076,6 +1076,10 @@ couchTests.replicator_db =3D function(debug) {
>>>>> =A0 =A0 });
>>>>> =A0 =A0 TEquals(200, xhr.status);
>>>>>
>>>>> + =A0 =A0// Temporary band-aid, give the replicator db some
>>>>> + =A0 =A0// time to make the switch
>>>>> + =A0 =A0wait(500);
>>>>> +
>>>>> =A0 =A0 new_doc =3D {
>>>>> =A0 =A0 =A0 _id: "foo666",
>>>>> =A0 =A0 =A0 value: 666
>>>>>
>>>>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/6c976bd9/src/couc=
h_replicator/src/couch_replicator.erl
>>>>> ---------------------------------------------------------------------=
-
>>>>> diff --git a/src/couch_replicator/src/couch_replicator.erl b/src/couc=
h_replicator/src/couch_replicator.erl
>>>>> index 1f7c08a..e91e1ae 100644
>>>>> --- a/src/couch_replicator/src/couch_replicator.erl
>>>>> +++ b/src/couch_replicator/src/couch_replicator.erl
>>>>> @@ -112,7 +112,7 @@ async_replicate(#rep{id =3D {BaseId, Ext}, source=
 =3D Src, target =3D Tgt} =3D Rep) ->
>>>>> =A0 =A0 =A0 =A0 RepChildId,
>>>>> =A0 =A0 =A0 =A0 {gen_server, start_link, [?MODULE, Rep, [{timeout, Ti=
meout}]]},
>>>>> =A0 =A0 =A0 =A0 temporary,
>>>>> - =A0 =A0 =A0 =A01,
>>>>> + =A0 =A0 =A0 =A0250,
>>>>> =A0 =A0 =A0 =A0 worker,
>>>>> =A0 =A0 =A0 =A0 [?MODULE]
>>>>> =A0 =A0 },
>>>>> @@ -333,6 +333,9 @@ do_init(#rep{options =3D Options, id =3D {BaseId,=
 Ext}} =3D Rep) ->
>>>>> =A0 =A0 }.
>>>>>
>>>>>
>>>>> +handle_info(shutdown, St) ->
>>>>> + =A0 =A0{stop, shutdown, St};
>>>>> +
>>>>> =A0handle_info({'DOWN', Ref, _, _, Why}, #rep_state{source_monitor =
=3D Ref} =3D St) ->
>>>>> =A0 =A0 ?LOG_ERROR("Source database is down. Reason: ~p", [Why]),
>>>>> =A0 =A0 {stop, source_db_down, St};
>>>>>
>>>>
>>>>
>>>> Never had an issue there. What was the problem? I have the feeling it
>>>> may be related to
>>>>
>>>> https://issues.apache.org/jira/browse/COUCHDB-1461
>>>
>>> Why?
>>>
>>> Afaik Paul's changes are to increase the shutdown time (from 1ms to
>>> 250ms) and to avoid the noisy OTP error messages when a running
>>> replication is cancelled (shutdown handle_info clause).
>>> However I would be highly surprised if it fixes the issue you reported.
>>
>> I understand the change, but I don't know what is the problem . I may
>> have misinterpreted what was the switch in question. But this is quite
>> similar since stopping (deleting a doc) or canceling are both calling
>> the same function, aren't they?
>
> Right. But the issue you reported before is unrelated. The problem
> there is that 2 processes are calling 2 functions of the same
> supervisor (start_child and delete_child). Those supervisor functions
> are synchronous, meaning that one has to wait for the other to finish.
>
>>
Ok thanks for the answer :)

- beno=EEt