Merge branch '1.0'

2018-12-18 19:17:52 +03:00
parent 80348fa3e2 3b7aacb567
commit cd73213935
1 changed files with 6 additions and 2 deletions
--- a/src/sysbench.c
+++ b/src/sysbench.c
@ -1237,8 +1237,12 @@ static int run_test(sb_test_t *test)

  if (eventgen_thread_created)
  {
-    if (sb_thread_cancel(eventgen_thread) ||
-        sb_thread_join(eventgen_thread, NULL))
+    /*
+      When a time limit is used, the event generation thread may terminate
+      itself.
+    */
+    if ((sb_thread_cancel(eventgen_thread) ||
+         sb_thread_join(eventgen_thread, NULL)) && sb_globals.max_time_ns == 0)
      log_text(LOG_FATAL, "Terminating the event generator thread failed.");
  }