rebase master

vesoft-inc · Jul 2, 2021 · 67fde40 · 67fde40
1 parent cc71619
commit 67fde40
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 47 deletions.
diff --git a/src/meta/processors/jobMan/MetaJobExecutor.cpp b/src/meta/processors/jobMan/MetaJobExecutor.cpp
@@ -146,17 +146,7 @@ ErrOrHosts MetaJobExecutor::getLeaderHost(GraphSpaceID space) {
     return hosts;
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 ErrOrHosts MetaJobExecutor::getListenerHost(GraphSpaceID space, cpp2::ListenerType type) {
-=======
-ErrOrHosts MetaJobExecutor::getListenerHost(GraphSpaceID space) {
-    // TODO : Only ES listener is supported
-    auto type = cpp2::ListenerType::ELASTICSEARCH;
->>>>>>> rebuild fulltext index via listener
-=======
-ErrOrHosts MetaJobExecutor::getListenerHost(GraphSpaceID space, cpp2::ListenerType type) {
->>>>>>> fix getListenerHost; log info; reset
     const auto& prefix = MetaServiceUtils::listenerPrefix(space, type);
     std::unique_ptr<kvstore::KVIterator> iter;
     auto ret = kvstore_->prefix(kDefaultSpaceId, kDefaultPartId, prefix, &iter);
@@ -195,15 +185,7 @@ ErrOrHosts MetaJobExecutor::getListenerHost(GraphSpaceID space, cpp2::ListenerTy
         iter->next();
     }
     if (hosts.empty()) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-       return nebula::cpp2::ErrorCode::E_LISTENER_NOT_FOUND;
-=======
-        nebula::cpp2::ErrorCode::E_LISTENER_NOT_FOUND;
->>>>>>> rebuild fulltext index via listener
-=======
        return nebula::cpp2::ErrorCode::E_LISTENER_NOT_FOUND;
->>>>>>> fix getListenerHost; log info; reset
     }
     return hosts;
 }
@@ -216,15 +198,7 @@ nebula::cpp2::ErrorCode MetaJobExecutor::execute() {
             break;
         }
         case TargetHosts::LISTENER: {
-<<<<<<< HEAD
-<<<<<<< HEAD
-            addressesRet = getListenerHost(space_,  cpp2::ListenerType::ELASTICSEARCH);
-=======
-            addressesRet = getListenerHost(space_);
->>>>>>> rebuild fulltext index via listener
-=======
             addressesRet = getListenerHost(space_,  cpp2::ListenerType::ELASTICSEARCH);
->>>>>>> fix getListenerHost; log info; reset
             break;
         }
         case TargetHosts::DEFAULT: {

diff --git a/src/meta/processors/jobMan/MetaJobExecutor.h b/src/meta/processors/jobMan/MetaJobExecutor.h
@@ -72,15 +72,7 @@ class MetaJobExecutor {
 
     ErrOrHosts getLeaderHost(GraphSpaceID space);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     ErrOrHosts getListenerHost(GraphSpaceID space, cpp2::ListenerType type);
-=======
-    ErrOrHosts getListenerHost(GraphSpaceID space);
->>>>>>> rebuild fulltext index via listener
-=======
-    ErrOrHosts getListenerHost(GraphSpaceID space, cpp2::ListenerType type);
->>>>>>> fix getListenerHost; log info; reset
 
     virtual folly::Future<Status>
     executeInternal(HostAddr&& address, std::vector<PartitionID>&& parts) = 0;

diff --git a/src/storage/admin/RebuildFTIndexTask.cpp b/src/storage/admin/RebuildFTIndexTask.cpp
@@ -7,16 +7,8 @@
 #include "storage/admin/RebuildFTIndexTask.h"
 #include "common/base/Logging.h"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 DECLARE_uint32(raft_heartbeat_interval_secs);
 
-=======
->>>>>>> rebuild fulltext index via listener
-=======
-DECLARE_uint32(raft_heartbeat_interval_secs);
-
->>>>>>> rebase master; rebuild done logic
 namespace nebula {
 namespace storage {
 
@@ -53,11 +45,6 @@ RebuildFTIndexTask::genSubTasks() {
             // TODO : add ErrorCode for listener not ready.
             return nebula::cpp2::ErrorCode::E_LISTENER_NOT_FOUND;
         }
-        if (!listener->isRunning()) {
-            LOG(ERROR) << "listener not ready, may be starting or waiting snapshot";
-            // TODO : add ErrorCode for listener not ready.
-            return nebula::cpp2::ErrorCode::E_LISTENER_NOT_FOUND;
-        }
         VLOG(3) << folly::sformat("Processing fulltext rebuild subtask, space={}, part={}",
                                   *ctx_.parameters_.space_id_ref(), part);
         std::function<nebula::cpp2::ErrorCode()> task =