From 32930400a1ed817edfc12cadfe0d370d10a59f45 Mon Sep 17 00:00:00 2001 From: Jan Lehnardt Date: Tue, 27 Mar 2018 16:11:12 +0200 Subject: [PATCH 1/2] feat: add debug log output for shard open errors --- src/fabric/src/fabric_util.erl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/fabric/src/fabric_util.erl b/src/fabric/src/fabric_util.erl index 49f4c8913f2..dd4b80da60f 100644 --- a/src/fabric/src/fabric_util.erl +++ b/src/fabric/src/fabric_util.erl @@ -194,9 +194,11 @@ get_shard([#shard{node = Node, name = Name} | Rest], Opts, Timeout, Factor) -> throw(Error); {Ref, {'rexi_EXIT', {{forbidden, _} = Error, _}}} -> throw(Error); - {Ref, _Else} -> + {Ref, Reason} -> + couch_log:debug("Failed to open shard ~p because: ~p", [Name, Reason]), get_shard(Rest, Opts, Timeout, Factor) after Timeout -> + couch_log:debug("Failed to open shard ~p after: ~p", [Name, Timeout]), get_shard(Rest, Opts, Factor * Timeout, Factor) end after From 9a866b37d8a712c307e6b871c545e2f8de7f5194 Mon Sep 17 00:00:00 2001 From: Jan Lehnardt Date: Tue, 27 Mar 2018 16:29:32 +0200 Subject: [PATCH 2/2] feat: remove duplicate authentication check --- src/chttpd/src/chttpd_db.erl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chttpd/src/chttpd_db.erl b/src/chttpd/src/chttpd_db.erl index ed0adead925..77610073057 100644 --- a/src/chttpd/src/chttpd_db.erl +++ b/src/chttpd/src/chttpd_db.erl @@ -314,7 +314,6 @@ delete_db_req(#httpd{}=Req, DbName) -> end. do_db_req(#httpd{path_parts=[DbName|_], user_ctx=Ctx}=Req, Fun) -> - fabric:get_security(DbName, [{user_ctx,Ctx}]), % calls check_is_reader {ok, Db} = couch_db:clustered_db(DbName, Ctx), Fun(Req, Db).