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 2020/05/29 18:23:44 UTC
[couchdb] branch prototype/fdb-layer updated (ef4cfb4 -> b9aa2c6)
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a change to branch prototype/fdb-layer
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
from ef4cfb4 Fix mango erlfdb error catch clause erlfdb -> erlfdb_error
new 0152c1e Fix bad catch statement in couch_jobs activity monitor
new b9aa2c6 Protect couch_jobs activity monitor against timeouts as well
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/couch_jobs/src/couch_jobs_activity_monitor.erl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
[couchdb] 02/02: Protect couch_jobs activity monitor against
timeouts as well
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch prototype/fdb-layer
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit b9aa2c6b1d2ded7fa1920551b747758e5eebc7bb
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Fri May 29 14:17:20 2020 -0400
Protect couch_jobs activity monitor against timeouts as well
---
src/couch_jobs/src/couch_jobs_activity_monitor.erl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/couch_jobs/src/couch_jobs_activity_monitor.erl b/src/couch_jobs/src/couch_jobs_activity_monitor.erl
index abb8982..9802f57 100644
--- a/src/couch_jobs/src/couch_jobs_activity_monitor.erl
+++ b/src/couch_jobs/src/couch_jobs_activity_monitor.erl
@@ -68,9 +68,9 @@ handle_info(check_activity, St) ->
St1 = try
check_activity(St)
catch
- error:{erlfdb_error, 1020} ->
- LogMsg = "~p : type:~p got 1020 error, possibly from overload",
- couch_log:error(LogMsg, [?MODULE, St#st.type]),
+ error:{erlfdb_error, Err} when Err =:= 1020 orelse Err =:= 1031 ->
+ LogMsg = "~p : type:~p got ~p error, possibly from overload",
+ couch_log:error(LogMsg, [?MODULE, St#st.type, Err]),
St
end,
St2 = schedule_check(St1),
[couchdb] 01/02: Fix bad catch statement in couch_jobs activity
monitor
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch prototype/fdb-layer
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 0152c1e428b1b0a0bebe3a3e4cba331079d99255
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Fri May 29 14:06:04 2020 -0400
Fix bad catch statement in couch_jobs activity monitor
---
src/couch_jobs/src/couch_jobs_activity_monitor.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/couch_jobs/src/couch_jobs_activity_monitor.erl b/src/couch_jobs/src/couch_jobs_activity_monitor.erl
index 6f50d96..abb8982 100644
--- a/src/couch_jobs/src/couch_jobs_activity_monitor.erl
+++ b/src/couch_jobs/src/couch_jobs_activity_monitor.erl
@@ -68,7 +68,7 @@ handle_info(check_activity, St) ->
St1 = try
check_activity(St)
catch
- {error, {erlfdb_error, 1020}} ->
+ error:{erlfdb_error, 1020} ->
LogMsg = "~p : type:~p got 1020 error, possibly from overload",
couch_log:error(LogMsg, [?MODULE, St#st.type]),
St