You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2017/03/14 19:26:42 UTC
[47/50] couch-replicator commit: updated refs/heads/63012-scheduler
to 27a5eae
Forward-port "Make sure to log db as well as doc in replicator logs."
Forward-port commit: 50dcd7d7c5f7ce003e8e2fc84646c1aa9931ebaa from master.
This commit was made to couch_replicator_manager so it had to be ported by hand.
Most changes didn't apply for one or more of these reasons:
* We already do the right thing and log db name
* There is an improved state inspection API so we simply don't log as much
* Functionality is completely changed (eg. We don't stop replications if they
reach a maximum retry count. Scheduler does an exponential backoff)
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/318e9f8c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/318e9f8c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/318e9f8c
Branch: refs/heads/63012-scheduler
Commit: 318e9f8c7d4639b3fc6cb57cf5fad1657db773e8
Parents: 5bebb8a
Author: Nick Vatamaniuc <va...@apache.org>
Authored: Fri Mar 3 14:16:11 2017 -0500
Committer: Nick Vatamaniuc <va...@apache.org>
Committed: Fri Mar 3 14:16:11 2017 -0500
----------------------------------------------------------------------
src/couch_replicator_docs.erl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/318e9f8c/src/couch_replicator_docs.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator_docs.erl b/src/couch_replicator_docs.erl
index 1bc852e..c0a9acd 100644
--- a/src/couch_replicator_docs.erl
+++ b/src/couch_replicator_docs.erl
@@ -77,7 +77,8 @@ update_doc_completed(DbName, DocId, Stats, StartTime) ->
-spec update_failed(binary(), binary(), any(), erlang:timestamp()) -> any().
update_failed(DbName, DocId, Error, StartTime) ->
Reason = error_reason(Error),
- couch_log:error("Error processing replication doc `~s`: ~s", [DocId, Reason]),
+ couch_log:error("Error processing replication doc `~s` from `~s`: ~s",
+ [DocId, DbName, Reason]),
StartTimeBin = couch_replicator_utils:iso8601(StartTime),
update_rep_doc(DbName, DocId, [
{<<"_replication_state">>, <<"failed">>},