Merge pull request #2240 from wiredtiger/WT-2156

WT-2149 WT-2156 Allow eviction workers to restart.
wiredtiger · Oct 2, 2015 · cc42bda · cc42bda
2 parents ecfbbb0 + 2c6072d
commit cc42bda
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/evict/evict_lru.c b/src/evict/evict_lru.c
@@ -364,6 +364,8 @@ __wt_evict_destroy(WT_SESSION_IMPL *session)
 		WT_TRET(__wt_cond_signal(session, cache->evict_waiter_cond));
 		WT_TRET(__wt_thread_join(session, workers[i].tid));
 	}
+	conn->evict_workers = 0;
+
 	/* Handle shutdown when cleaning up after a failed open. */
 	if (conn->evict_workctx != NULL) {
 		for (i = 0; i < conn->evict_workers_alloc; i++) {
@@ -373,6 +375,7 @@ __wt_evict_destroy(WT_SESSION_IMPL *session)
 		}
 		__wt_free(session, conn->evict_workctx);
 	}
+	conn->evict_workers_alloc = 0;
 
 	if (conn->evict_session != NULL) {
 		wt_session = &conn->evict_session->iface;