[couchdb] branch COUCHDB-3288-mixed-cluster-upgrade updated: Handle attachments downgrades in a mixed cluster environment

[da...@apache.org]

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

davisp pushed a commit to branch COUCHDB-3288-mixed-cluster-upgrade
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/COUCHDB-3288-mixed-cluster-upgrade by this push:
     new 8e860e9  Handle attachments downgrades in a mixed cluster environment
8e860e9 is described below

commit 8e860e9c3c33d6dd5f044785f1506810eef93ac9
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Mon Jun 5 18:16:45 2017 -0400

    Handle attachments downgrades in a mixed cluster environment
    
    Previously attachment uploading from a PSE to non-PSE node would
    fail as the attachment streaming API changed between version.
    
    This commit handles downgrading attachment streams from PSE nodes so that
    non-PSE nodes can write them.
---
 src/couch/src/couch_att.erl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/couch/src/couch_att.erl b/src/couch/src/couch_att.erl
index 9d38cfa..481ef2c 100644
--- a/src/couch/src/couch_att.erl
+++ b/src/couch/src/couch_att.erl
@@ -481,6 +481,9 @@ flush(Fd, Att) ->
     flush_data(Fd, fetch(data, Att), Att).
 
 
+flush_data(Fd, {stream, {couch_bt_engine_stream, {OtherFd, StreamPointer}}},
+        Att) ->
+    flush_data(Fd, {OtherFd, StreamPointer}, Att);
 flush_data(Fd, {Fd0, _}, Att) when Fd0 == Fd ->
     % already written to our file, nothing to write
     Att;

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