summaryrefslogtreecommitdiff
path: root/src/async
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2014-11-07 18:05:06 -0500
committerKeith Bostic <keith@wiredtiger.com>2014-11-07 18:05:06 -0500
commit5391b19eae0b48b572b8309d0b8f6775755b1067 (patch)
tree3e89598430edb5f8b38bc659df0173ffcfd443f4 /src/async
parent7666bdb657a75d6db67ee03d33e9d193c95b01b6 (diff)
downloadmongo-5391b19eae0b48b572b8309d0b8f6775755b1067.tar.gz
Change the API to not repeatedly call __wt_panic() after the panic flag
is set, that will just inundate the log with useless error/panic messages.
Diffstat (limited to 'src/async')
-rw-r--r--src/async/async_worker.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/async/async_worker.c b/src/async/async_worker.c
index 74ee2dd2f86..3d807395ddc 100644
--- a/src/async/async_worker.c
+++ b/src/async/async_worker.c
@@ -56,8 +56,7 @@ retry:
return (0);
if (!F_ISSET(conn, WT_CONN_SERVER_ASYNC))
return (0);
- if (F_ISSET(conn, WT_CONN_PANIC))
- return (__wt_panic(session));
+ WT_RET(WT_SESSION_CHECK_PANIC(session));
WT_ORDERED_READ(last_consume, async->alloc_tail);
}
if (async->flush_state == WT_ASYNC_FLUSHING)
@@ -308,8 +307,7 @@ __wt_async_worker(void *arg)
* keep running, unless there is a panic.
*/
(void)__async_worker_op(session, op, &worker);
- if (F_ISSET(conn, WT_CONN_PANIC))
- WT_ERR(__wt_panic(session));
+ WT_ERR(WT_SESSION_CHECK_PANIC(session));
} else if (async->flush_state == WT_ASYNC_FLUSHING) {
/*
* Worker flushing going on. Last worker to the party