couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject couch commit: updated refs/heads/master to f6b69a9
Date Mon, 24 Aug 2015 14:44:16 GMT
Repository: couchdb-couch
Updated Branches:
  refs/heads/master 6137c66fa -> f6b69a925


Fix crashing filtered _changes request

A filtered call to _changes end-point prompts a node to
pull a peer from the received mochi request record.
This is crashing on the secondary nodes in a clustered
environment since the peer call made on a socket
that is not original for them.

The fix makes use of the fact that by the time of the request
the peer already got resolved on the coordinator node and
passed along as a part of #http record.

This closes the case COUCHDB-2785


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/f6b69a92
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/f6b69a92
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/f6b69a92

Branch: refs/heads/master
Commit: f6b69a925610ea0295e299a4186df43cd64cf75e
Parents: 6137c66
Author: Eric Avdey <eiri@eiri.ca>
Authored: Mon Aug 24 10:55:30 2015 -0300
Committer: Eric Avdey <eiri@eiri.ca>
Committed: Mon Aug 24 10:55:30 2015 -0300

----------------------------------------------------------------------
 src/couch_httpd_external.erl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/f6b69a92/src/couch_httpd_external.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd_external.erl b/src/couch_httpd_external.erl
index d1a5d01..626a3fb 100644
--- a/src/couch_httpd_external.erl
+++ b/src/couch_httpd_external.erl
@@ -58,7 +58,8 @@ json_req_obj(#httpd{mochi_req=Req,
                method=Method,
                requested_path_parts=RequestedPath,
                path_parts=Path,
-               req_body=ReqBody
+               req_body=ReqBody,
+               peer=Peer
             }, Db, DocId) ->
     Body = case ReqBody of
         undefined ->
@@ -91,7 +92,7 @@ json_req_obj(#httpd{mochi_req=Req,
         {<<"query">>, json_query_keys(to_json_terms(Req:parse_qs()))},
         {<<"headers">>, to_json_terms(Hlist)},
         {<<"body">>, Body},
-        {<<"peer">>, ?l2b(Req:get(peer))},
+        {<<"peer">>, ?l2b(Peer)},
         {<<"form">>, to_json_terms(ParsedForm)},
         {<<"cookie">>, to_json_terms(Req:parse_cookie())},
         {<<"userCtx">>, couch_util:json_user_ctx(Db)},


Mime
View raw message