From 46dbce34adcf7eab92f0f402a485f830aea7c1d9 Mon Sep 17 00:00:00 2001
From: starlord <chxiehust@gmail.com>
Date: Mon, 15 Jul 2019 19:24:20 +0800
Subject: [PATCH] avoid background merge thread stop

Former-commit-id: cc6ff30a93f8f6afdd662b7459dbb0db63ef45d6
---
 cpp/src/db/DBImpl.cpp | 5 ++---
 cpp/src/db/DBImpl.h   | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp
index 09a7c72201..c6365bc38b 100644
--- a/cpp/src/db/DBImpl.cpp
+++ b/cpp/src/db/DBImpl.cpp
@@ -229,7 +229,6 @@ void DBImpl::BackgroundTimerTask() {
     Status status;
     server::SystemInfo::GetInstance().Init();
     while (true) {
-        if (!bg_error_.ok()) break;
         if (shutting_down_.load(std::memory_order_acquire)){
             for(auto& iter : compact_thread_results_) {
                 iter.wait();
@@ -392,7 +391,7 @@ void DBImpl::BackgroundCompaction(std::set<std::string> table_ids) {
     for (auto& table_id : table_ids) {
         status = BackgroundMergeFiles(table_id);
         if (!status.ok()) {
-            bg_error_ = status;
+            ENGINE_LOG_ERROR << "Merge files for table " << table_id << " failed: " << status.ToString();
             return;
         }
     }
@@ -498,7 +497,7 @@ void DBImpl::BackgroundBuildIndex() {
         /* ENGINE_LOG_DEBUG << "Buiding index for " << file.location; */
         status = BuildIndex(file);
         if (!status.ok()) {
-            bg_error_ = status;
+            ENGINE_LOG_ERROR << "Building index for " << file.id_ << " failed: " << status.ToString();
             return;
         }
 
diff --git a/cpp/src/db/DBImpl.h b/cpp/src/db/DBImpl.h
index 5601f1a33b..012a445ef1 100644
--- a/cpp/src/db/DBImpl.h
+++ b/cpp/src/db/DBImpl.h
@@ -114,10 +114,8 @@ class DBImpl : public DB {
     BuildIndex(const meta::TableFileSchema &);
 
  private:
-
     const Options options_;
 
-    Status bg_error_;
     std::atomic<bool> shutting_down_;
 
     std::thread bg_timer_thread_;