summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul J. Davis <paul.joseph.davis@gmail.com>2017-04-25 11:21:54 -0500
committerJoan Touzet <wohali@users.noreply.github.com>2017-10-19 19:13:25 -0400
commitad0928be4ebdd5e9762b536dcf77e3ae365c9ec0 (patch)
treeeb40ece2b0f229cf3d44f2cfbe612b4f19c9b116
parentf40d161eea683553021d3dfcfa4d3f112b71e54b (diff)
downloadcouchdb-ad0928be4ebdd5e9762b536dcf77e3ae365c9ec0.tar.gz
Add clause for mixed cluster upgrades
A mixed cluster (i.e., during a rolling reboot) will want to include this commit in a release before deploying PSE code to avoid spurious erros during the upgrade. COUCHDB-3288
-rw-r--r--src/fabric/src/fabric_rpc.erl10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/fabric/src/fabric_rpc.erl b/src/fabric/src/fabric_rpc.erl
index c2ac67fe9..9cf653c59 100644
--- a/src/fabric/src/fabric_rpc.erl
+++ b/src/fabric/src/fabric_rpc.erl
@@ -16,8 +16,9 @@
-export([open_doc/3, open_revs/4, get_doc_info/3, get_full_doc_info/3,
get_missing_revs/2, get_missing_revs/3, update_docs/3]).
-export([all_docs/3, changes/3, map_view/4, reduce_view/4, group_info/2]).
--export([create_db/1, delete_db/1, reset_validation_funs/1, set_security/3,
- set_revs_limit/3, create_shard_db_doc/2, delete_shard_db_doc/2]).
+-export([create_db/1, create_db/2, delete_db/1, reset_validation_funs/1,
+ set_security/3, set_revs_limit/3, create_shard_db_doc/2,
+ delete_shard_db_doc/2]).
-export([get_all_security/2, open_shard/2]).
-export([compact/1, compact/2]).
@@ -145,7 +146,10 @@ fix_skip_and_limit(Args) ->
Args#mrargs{skip=0, limit=Skip+Limit}.
create_db(DbName) ->
- rexi:reply(case couch_server:create(DbName, []) of
+ create_db(DbName, []).
+
+create_db(DbName, Options) ->
+ rexi:reply(case couch_server:create(DbName, Options) of
{ok, _} ->
ok;
Error ->