[couchdb] branch fix/548/view-index-monitor updated (fa09806 -> 7e3d7cb)

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jan pushed a change to branch fix/548/view-index-monitor
in repository https://gitbox.apache.org/repos/asf/couchdb.git.

     omits  fa09806   fix: monitor index before getting its state #548
       new  7e3d7cb   fix: monitor index before getting its state #548

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (fa09806)
            \
             N -- N -- N   refs/heads/fix/548/view-index-monitor (7e3d7cb)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/couch_mrview/src/couch_mrview_util.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].

[couchdb] 01/01: fix: monitor index before getting its state #548

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jan pushed a commit to branch fix/548/view-index-monitor
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 7e3d7cb9368bd368bc3485c6c21bb7a6d3c7dc64
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Fri Jun 2 12:01:13 2017 +0200

    fix: monitor index before getting its state #548
---
 src/couch_mrview/src/couch_mrview_util.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/couch_mrview/src/couch_mrview_util.erl b/src/couch_mrview/src/couch_mrview_util.erl
index 27f8737..9e382aa 100644
--- a/src/couch_mrview/src/couch_mrview_util.erl
+++ b/src/couch_mrview/src/couch_mrview_util.erl
@@ -47,11 +47,11 @@ get_view(Db, DDoc, ViewName, Args0) ->
     MinSeq = case Args2#mrargs.update of
         false -> 0; lazy -> 0; _ -> DbUpdateSeq
     end,
+    Ref = erlang:monitor(process, Pid),
     {ok, State} = case couch_index:get_state(Pid, MinSeq) of
         {ok, _} = Resp -> Resp;
         Error -> throw(Error)
     end,
-    Ref = erlang:monitor(process, State#mrst.fd),
     if Args2#mrargs.update == lazy ->
         spawn(fun() -> catch couch_index:get_state(Pid, DbUpdateSeq) end);
         true -> ok

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.