From 75ea4c4add2af8353e3cd15c8aad04945bad00c4 Mon Sep 17 00:00:00 2001
From: wxyu <xy.wang@zilliz.com>
Date: Thu, 19 Sep 2019 17:28:15 +0800
Subject: [PATCH] MS-577 Unittest Query randomly hung

Former-commit-id: 5e4365deea822861077f41cda17d3cbd8504f327
---
 cpp/CHANGELOG.md             | 1 +
 cpp/src/scheduler/JobMgr.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md
index 113045897f..ab630f124a 100644
--- a/cpp/CHANGELOG.md
+++ b/cpp/CHANGELOG.md
@@ -5,6 +5,7 @@ Please mark all change in change log and use the ticket from JIRA.
 # Milvus 0.5.0 (TODO)
 
 ## Bug
+- MS-577 - Unittest Query randomly hung
 
 ## Improvement
 - MS-552 - Add and change the easylogging library
diff --git a/cpp/src/scheduler/JobMgr.cpp b/cpp/src/scheduler/JobMgr.cpp
index c5c14c1b41..31db4b344e 100644
--- a/cpp/src/scheduler/JobMgr.cpp
+++ b/cpp/src/scheduler/JobMgr.cpp
@@ -32,8 +32,8 @@ JobMgr::JobMgr(ResourceMgrPtr res_mgr)
 void
 JobMgr::Start() {
     if (not running_) {
-        worker_thread_ = std::thread(&JobMgr::worker_function, this);
         running_ = true;
+        worker_thread_ = std::thread(&JobMgr::worker_function, this);
     }
 }