diff --git a/internal/allocator/timestamp.go b/internal/allocator/timestamp.go
index 8b0288ed9c..6ddfd57898 100644
--- a/internal/allocator/timestamp.go
+++ b/internal/allocator/timestamp.go
@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"time"
 
-	msc "github.com/zilliztech/milvus-distributed/internal/distributed/masterservice/client"
-	"github.com/zilliztech/milvus-distributed/internal/types"
 	"go.uber.org/zap"
 
+	msc "github.com/zilliztech/milvus-distributed/internal/distributed/masterservice/client"
 	"github.com/zilliztech/milvus-distributed/internal/log"
 	"github.com/zilliztech/milvus-distributed/internal/proto/commonpb"
 	"github.com/zilliztech/milvus-distributed/internal/proto/masterpb"
+	"github.com/zilliztech/milvus-distributed/internal/types"
 	"github.com/zilliztech/milvus-distributed/internal/util/typeutil"
 )
 
diff --git a/internal/core/src/pb/common.pb.cc b/internal/core/src/pb/common.pb.cc
index 2b7d9a8626..18b80f3670 100644
--- a/internal/core/src/pb/common.pb.cc
+++ b/internal/core/src/pb/common.pb.cc
@@ -221,33 +221,32 @@ const char descriptor_table_protodef_common_2eproto[] PROTOBUF_SECTION_VARIABLE(
   "\020CannotDeleteFile\020\024\022\023\n\017BuildIndexError\020\025"
   "\022\020\n\014IllegalNLIST\020\026\022\025\n\021IllegalMetricType\020"
   "\027\022\017\n\013OutOfMemory\020\030\022\021\n\rIndexNotExist\020\031\022\022\n"
-  "\rDDRequestRace\020\350\007*e\n\nIndexState\022\022\n\016Index"
+  "\rDDRequestRace\020\350\007*X\n\nIndexState\022\022\n\016Index"
   "StateNone\020\000\022\014\n\010Unissued\020\001\022\016\n\nInProgress\020"
-  "\002\022\014\n\010Finished\020\003\022\n\n\006Failed\020\004\022\013\n\007Deleted\020\005"
-  "*X\n\014SegmentState\022\024\n\020SegmentStateNone\020\000\022\014"
-  "\n\010NotExist\020\001\022\013\n\007Growing\020\002\022\n\n\006Sealed\020\003\022\013\n"
-  "\007Flushed\020\004*\372\005\n\007MsgType\022\r\n\tUndefined\020\000\022\024\n"
-  "\020CreateCollection\020d\022\022\n\016DropCollection\020e\022"
-  "\021\n\rHasCollection\020f\022\026\n\022DescribeCollection"
-  "\020g\022\023\n\017ShowCollections\020h\022\024\n\020GetSystemConf"
-  "igs\020i\022\022\n\016LoadCollection\020j\022\025\n\021ReleaseColl"
-  "ection\020k\022\024\n\017CreatePartition\020\310\001\022\022\n\rDropPa"
-  "rtition\020\311\001\022\021\n\014HasPartition\020\312\001\022\026\n\021Describ"
-  "ePartition\020\313\001\022\023\n\016ShowPartitions\020\314\001\022\023\n\016Lo"
-  "adPartitions\020\315\001\022\026\n\021ReleasePartitions\020\316\001\022"
-  "\021\n\014ShowSegments\020\372\001\022\024\n\017DescribeSegment\020\373\001"
-  "\022\020\n\013CreateIndex\020\254\002\022\022\n\rDescribeIndex\020\255\002\022\016"
-  "\n\tDropIndex\020\256\002\022\013\n\006Insert\020\220\003\022\013\n\006Delete\020\221\003"
-  "\022\n\n\005Flush\020\222\003\022\013\n\006Search\020\364\003\022\021\n\014SearchResul"
-  "t\020\365\003\022\022\n\rGetIndexState\020\366\003\022\034\n\027GetCollectio"
-  "nStatistics\020\367\003\022\033\n\026GetPartitionStatistics"
-  "\020\370\003\022\020\n\013SegmentInfo\020\330\004\022\r\n\010TimeTick\020\260\t\022\023\n\016"
-  "QueryNodeStats\020\261\t\022\016\n\tLoadIndex\020\262\t\022\016\n\tReq"
-  "uestID\020\263\t\022\017\n\nRequestTSO\020\264\t\022\024\n\017AllocateSe"
-  "gment\020\265\t\022\026\n\021SegmentStatistics\020\266\t\022\025\n\020Segm"
-  "entFlushDone\020\267\tBBZ@github.com/zilliztech"
-  "/milvus-distributed/internal/proto/commo"
-  "npbb\006proto3"
+  "\002\022\014\n\010Finished\020\003\022\n\n\006Failed\020\004*X\n\014SegmentSt"
+  "ate\022\024\n\020SegmentStateNone\020\000\022\014\n\010NotExist\020\001\022"
+  "\013\n\007Growing\020\002\022\n\n\006Sealed\020\003\022\013\n\007Flushed\020\004*\372\005"
+  "\n\007MsgType\022\r\n\tUndefined\020\000\022\024\n\020CreateCollec"
+  "tion\020d\022\022\n\016DropCollection\020e\022\021\n\rHasCollect"
+  "ion\020f\022\026\n\022DescribeCollection\020g\022\023\n\017ShowCol"
+  "lections\020h\022\024\n\020GetSystemConfigs\020i\022\022\n\016Load"
+  "Collection\020j\022\025\n\021ReleaseCollection\020k\022\024\n\017C"
+  "reatePartition\020\310\001\022\022\n\rDropPartition\020\311\001\022\021\n"
+  "\014HasPartition\020\312\001\022\026\n\021DescribePartition\020\313\001"
+  "\022\023\n\016ShowPartitions\020\314\001\022\023\n\016LoadPartitions\020"
+  "\315\001\022\026\n\021ReleasePartitions\020\316\001\022\021\n\014ShowSegmen"
+  "ts\020\372\001\022\024\n\017DescribeSegment\020\373\001\022\020\n\013CreateInd"
+  "ex\020\254\002\022\022\n\rDescribeIndex\020\255\002\022\016\n\tDropIndex\020\256"
+  "\002\022\013\n\006Insert\020\220\003\022\013\n\006Delete\020\221\003\022\n\n\005Flush\020\222\003\022"
+  "\013\n\006Search\020\364\003\022\021\n\014SearchResult\020\365\003\022\022\n\rGetIn"
+  "dexState\020\366\003\022\034\n\027GetCollectionStatistics\020\367"
+  "\003\022\033\n\026GetPartitionStatistics\020\370\003\022\020\n\013Segmen"
+  "tInfo\020\330\004\022\r\n\010TimeTick\020\260\t\022\023\n\016QueryNodeStat"
+  "s\020\261\t\022\016\n\tLoadIndex\020\262\t\022\016\n\tRequestID\020\263\t\022\017\n\n"
+  "RequestTSO\020\264\t\022\024\n\017AllocateSegment\020\265\t\022\026\n\021S"
+  "egmentStatistics\020\266\t\022\025\n\020SegmentFlushDone\020"
+  "\267\tBBZ@github.com/zilliztech/milvus-distr"
+  "ibuted/internal/proto/commonpbb\006proto3"
   ;
 static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_common_2eproto_deps[1] = {
 };
@@ -262,7 +261,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_com
 static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_common_2eproto_once;
 static bool descriptor_table_common_2eproto_initialized = false;
 const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_common_2eproto = {
-  &descriptor_table_common_2eproto_initialized, descriptor_table_protodef_common_2eproto, "common.proto", 1971,
+  &descriptor_table_common_2eproto_initialized, descriptor_table_protodef_common_2eproto, "common.proto", 1958,
   &descriptor_table_common_2eproto_once, descriptor_table_common_2eproto_sccs, descriptor_table_common_2eproto_deps, 6, 0,
   schemas, file_default_instances, TableStruct_common_2eproto::offsets,
   file_level_metadata_common_2eproto, 6, file_level_enum_descriptors_common_2eproto, file_level_service_descriptors_common_2eproto,
@@ -322,7 +321,6 @@ bool IndexState_IsValid(int value) {
     case 2:
     case 3:
     case 4:
-    case 5:
       return true;
     default:
       return false;
diff --git a/internal/core/src/pb/common.pb.h b/internal/core/src/pb/common.pb.h
index f68d27453a..31f48ec860 100644
--- a/internal/core/src/pb/common.pb.h
+++ b/internal/core/src/pb/common.pb.h
@@ -146,13 +146,12 @@ enum IndexState : int {
   InProgress = 2,
   Finished = 3,
   Failed = 4,
-  Deleted = 5,
   IndexState_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::PROTOBUF_NAMESPACE_ID::int32>::min(),
   IndexState_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::PROTOBUF_NAMESPACE_ID::int32>::max()
 };
 bool IndexState_IsValid(int value);
 constexpr IndexState IndexState_MIN = IndexStateNone;
-constexpr IndexState IndexState_MAX = Deleted;
+constexpr IndexState IndexState_MAX = Failed;
 constexpr int IndexState_ARRAYSIZE = IndexState_MAX + 1;
 
 const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* IndexState_descriptor();
diff --git a/internal/indexnode/indexnode.go b/internal/indexnode/indexnode.go
index 7f74de656e..15f9866f33 100644
--- a/internal/indexnode/indexnode.go
+++ b/internal/indexnode/indexnode.go
@@ -177,8 +177,25 @@ func (i *IndexNode) BuildIndex(ctx context.Context, request *indexpb.BuildIndexR
 }
 
 func (i *IndexNode) DropIndex(ctx context.Context, request *indexpb.DropIndexRequest) (*commonpb.Status, error) {
-	log.Debug("indexnode drop index ...", zap.Int64("index id", request.IndexID))
-	i.sched.IndexBuildQueue.tryToRemoveUselessIndexBuildTask(request.IndexID)
+	log.Debug("IndexNode", zap.Int64("Drop index by id", request.IndexID))
+	indexBuildIDs := i.sched.IndexBuildQueue.tryToRemoveUselessIndexBuildTask(request.IndexID)
+	log.Debug("IndexNode", zap.Any("The index of the IndexBuildIDs to be deleted", indexBuildIDs))
+	for _, indexBuildID := range indexBuildIDs {
+		nty := &indexpb.NotifyBuildIndexRequest{
+			Status: &commonpb.Status{
+				ErrorCode: commonpb.ErrorCode_Success,
+			},
+			IndexBuildID:   indexBuildID,
+			NodeID:         Params.NodeID,
+			IndexFilePaths: []string{},
+		}
+		resp, err := i.serviceClient.NotifyBuildIndex(ctx, nty)
+		if err != nil {
+			log.Warn("IndexNode", zap.String("DropIndex notify error", err.Error()))
+		} else if resp.ErrorCode != commonpb.ErrorCode_Success {
+			log.Warn("IndexNode", zap.String("DropIndex notify error reason", resp.Reason))
+		}
+	}
 	return &commonpb.Status{
 		ErrorCode: commonpb.ErrorCode_Success,
 		Reason:    "",
diff --git a/internal/indexnode/task_scheduler.go b/internal/indexnode/task_scheduler.go
index d076f7c36d..dff8939ce1 100644
--- a/internal/indexnode/task_scheduler.go
+++ b/internal/indexnode/task_scheduler.go
@@ -25,7 +25,7 @@ type TaskQueue interface {
 	AddActiveTask(t task)
 	PopActiveTask(tID UniqueID) task
 	Enqueue(t task) error
-	tryToRemoveUselessIndexBuildTask(indexID UniqueID)
+	tryToRemoveUselessIndexBuildTask(indexID UniqueID) []UniqueID
 }
 
 type BaseTaskQueue struct {
@@ -119,11 +119,12 @@ func (queue *BaseTaskQueue) PopActiveTask(tID UniqueID) task {
 	return nil
 }
 
-func (queue *BaseTaskQueue) tryToRemoveUselessIndexBuildTask(indexID UniqueID) {
+func (queue *BaseTaskQueue) tryToRemoveUselessIndexBuildTask(indexID UniqueID) []UniqueID {
 	queue.utLock.Lock()
 	defer queue.utLock.Unlock()
 
 	var next *list.Element
+	var indexBuildIDs []UniqueID
 	for e := queue.unissuedTasks.Front(); e != nil; e = next {
 		next = e.Next()
 		indexBuildTask, ok := e.Value.(*IndexBuildTask)
@@ -131,9 +132,12 @@ func (queue *BaseTaskQueue) tryToRemoveUselessIndexBuildTask(indexID UniqueID) {
 			continue
 		}
 		if indexBuildTask.req.IndexID == indexID {
+			indexBuildIDs = append(indexBuildIDs, indexBuildTask.req.IndexBuildID)
 			queue.unissuedTasks.Remove(e)
+			indexBuildTask.Notify(nil)
 		}
 	}
+	return indexBuildIDs
 }
 
 func (queue *BaseTaskQueue) Enqueue(t task) error {
diff --git a/internal/indexservice/indexservice.go b/internal/indexservice/indexservice.go
index bb38c3b5bb..e7494ec269 100644
--- a/internal/indexservice/indexservice.go
+++ b/internal/indexservice/indexservice.go
@@ -27,6 +27,8 @@ import (
 
 const (
 	reqTimeoutInterval = time.Second * 10
+	durationInterval   = time.Second * 10
+	dropIndexLimit     = 20
 )
 
 type IndexService struct {
@@ -129,6 +131,9 @@ func (i *IndexService) Start() error {
 	i.loopWg.Add(1)
 	go i.tsLoop()
 
+	i.loopWg.Add(1)
+	go i.dropIndexLoop()
+
 	i.sched.Start()
 	// Start callbacks
 	for _, cb := range i.startCallbacks {
@@ -278,34 +283,36 @@ func (i *IndexService) GetIndexStates(ctx context.Context, req *indexpb.GetIndex
 }
 
 func (i *IndexService) DropIndex(ctx context.Context, req *indexpb.DropIndexRequest) (*commonpb.Status, error) {
-	log.Debug("indexservice dropping index ...", zap.Int64("indexID", req.IndexID))
-	i.sched.IndexAddQueue.tryToRemoveUselessIndexAddTask(req.IndexID)
+	log.Debug("IndexService", zap.Int64("Drop Index ID", req.IndexID))
 
+	ret := &commonpb.Status{
+		ErrorCode: commonpb.ErrorCode_Success,
+	}
 	err := i.metaTable.MarkIndexAsDeleted(req.IndexID)
 	if err != nil {
-		return &commonpb.Status{
-			ErrorCode: commonpb.ErrorCode_UnexpectedError,
-			Reason:    err.Error(),
-		}, nil
+		ret.ErrorCode = commonpb.ErrorCode_UnexpectedError
+		ret.Reason = err.Error()
+		return ret, nil
 	}
 
 	defer func() {
+		go func() {
+			unissuedIndexBuildIDs := i.sched.IndexAddQueue.tryToRemoveUselessIndexAddTask(req.IndexID)
+			for _, indexBuildID := range unissuedIndexBuildIDs {
+				i.metaTable.DeleteIndex(indexBuildID)
+			}
+		}()
+
 		go func() {
 			allNodeClients := i.nodeClients.PeekAllClients()
 			for _, client := range allNodeClients {
 				client.DropIndex(ctx, req)
 			}
 		}()
-		go func() {
-			i.metaTable.removeIndexFile(req.IndexID)
-			i.metaTable.removeMeta(req.IndexID)
-		}()
 	}()
 
-	log.Debug("indexservice drop index success")
-	return &commonpb.Status{
-		ErrorCode: commonpb.ErrorCode_Success,
-	}, nil
+	log.Debug("IndexService", zap.Int64("DropIndex success by ID", req.IndexID))
+	return ret, nil
 }
 
 func (i *IndexService) GetIndexFilePaths(ctx context.Context, req *indexpb.GetIndexFilePathsRequest) (*indexpb.GetIndexFilePathsResponse, error) {
@@ -333,19 +340,22 @@ func (i *IndexService) GetIndexFilePaths(ctx context.Context, req *indexpb.GetIn
 }
 
 func (i *IndexService) NotifyBuildIndex(ctx context.Context, nty *indexpb.NotifyBuildIndexRequest) (*commonpb.Status, error) {
-	log.Debug("indexservice",
+	log.Debug("IndexService",
 		zap.Int64("notify build index", nty.IndexBuildID),
 		zap.Strings("index file paths", nty.IndexFilePaths),
 		zap.Int64("node ID", nty.NodeID))
 	ret := &commonpb.Status{
 		ErrorCode: commonpb.ErrorCode_Success,
 	}
-	log.Debug("indexservice", zap.String("[IndexService][NotifyBuildIndex]", nty.String()))
+	log.Debug("IndexService", zap.String("[IndexService][NotifyBuildIndex]", nty.String()))
 	if err := i.metaTable.NotifyBuildIndex(nty); err != nil {
 		ret.ErrorCode = commonpb.ErrorCode_BuildIndexError
 		ret.Reason = err.Error()
-		log.Debug("indexservice", zap.String("[IndexService][NotifyBuildIndex][metaTable][NotifyBuildIndex]", err.Error()))
+		log.Debug("IndexService", zap.String("[IndexService][NotifyBuildIndex][metaTable][NotifyBuildIndex]", err.Error()))
 	}
+
+	log.Debug("IndexService", zap.Any("Index build completed with ID", nty.IndexBuildID))
+
 	i.nodeClients.IncPriority(nty.NodeID, -1)
 	return ret, nil
 }
@@ -370,3 +380,28 @@ func (i *IndexService) tsLoop() {
 		}
 	}
 }
+
+func (i *IndexService) dropIndexLoop() {
+	ctx, cancel := context.WithCancel(i.loopCtx)
+
+	defer cancel()
+	defer i.loopWg.Done()
+
+	timeTicker := time.NewTicker(durationInterval)
+
+	log.Debug("IndexService start drop index loop")
+	for {
+		select {
+		case <-ctx.Done():
+			return
+		case <-timeTicker.C:
+			indexMetas := i.metaTable.getMarkDeleted(dropIndexLimit)
+			for j := 0; j < len(indexMetas); j++ {
+				if err := i.kv.MultiRemove(indexMetas[j].IndexFilePaths); err != nil {
+					log.Debug("IndexService", zap.String("Remove index files error", err.Error()))
+				}
+				i.metaTable.DeleteIndex(indexMetas[j].IndexBuildID)
+			}
+		}
+	}
+}
diff --git a/internal/indexservice/meta_table.go b/internal/indexservice/meta_table.go
index 3d98827110..118e6498cd 100644
--- a/internal/indexservice/meta_table.go
+++ b/internal/indexservice/meta_table.go
@@ -89,6 +89,23 @@ func (mt *metaTable) AddIndex(indexBuildID UniqueID, req *indexpb.BuildIndexRequ
 	return mt.saveIndexMeta(meta)
 }
 
+func (mt *metaTable) BuildIndex(indexBuildID UniqueID) error {
+	mt.lock.Lock()
+	defer mt.lock.Unlock()
+	log.Debug("IndexService update index state")
+
+	meta, ok := mt.indexBuildID2Meta[indexBuildID]
+	if !ok {
+		return fmt.Errorf("index not exists with ID = %d", indexBuildID)
+	}
+
+	if meta.State != commonpb.IndexState_Unissued {
+		return fmt.Errorf("can not update index state, index with ID = %d state is %d", indexBuildID, meta.State)
+	}
+	meta.State = commonpb.IndexState_InProgress
+	return mt.saveIndexMeta(&meta)
+}
+
 func (mt *metaTable) MarkIndexAsDeleted(indexID UniqueID) error {
 	mt.lock.Lock()
 	defer mt.lock.Unlock()
@@ -97,7 +114,7 @@ func (mt *metaTable) MarkIndexAsDeleted(indexID UniqueID) error {
 
 	for indexBuildID, meta := range mt.indexBuildID2Meta {
 		if meta.Req.IndexID == indexID {
-			meta.State = commonpb.IndexState_Deleted
+			meta.MarkDeleted = true
 			mt.indexBuildID2Meta[indexBuildID] = meta
 		}
 	}
@@ -115,9 +132,6 @@ func (mt *metaTable) NotifyBuildIndex(nty *indexpb.NotifyBuildIndexRequest) erro
 	if !ok {
 		return fmt.Errorf("index not exists with ID = %d", indexBuildID)
 	}
-	if meta.State == commonpb.IndexState_Deleted {
-		return fmt.Errorf("index not exists with ID = %d", indexBuildID)
-	}
 
 	if nty.Status.ErrorCode != commonpb.ErrorCode_Success {
 		meta.State = commonpb.IndexState_Failed
@@ -140,7 +154,7 @@ func (mt *metaTable) GetIndexState(indexBuildID UniqueID) (*indexpb.IndexInfo, e
 	if !ok {
 		return ret, fmt.Errorf("index not exists with ID = %d", indexBuildID)
 	}
-	if meta.State == commonpb.IndexState_Deleted {
+	if meta.MarkDeleted {
 		return ret, fmt.Errorf("index not exists with ID = %d", indexBuildID)
 	}
 	ret.IndexID = meta.Req.IndexID
@@ -160,52 +174,35 @@ func (mt *metaTable) GetIndexFilePathInfo(indexBuildID UniqueID) (*indexpb.Index
 	if !ok {
 		return nil, fmt.Errorf("index not exists with ID = %d", indexBuildID)
 	}
-	if meta.State == commonpb.IndexState_Deleted {
+	if meta.MarkDeleted {
 		return nil, fmt.Errorf("index not exists with ID = %d", indexBuildID)
 	}
 	ret.IndexFilePaths = meta.IndexFilePaths
 	return ret, nil
 }
 
-func (mt *metaTable) removeIndexFile(indexID UniqueID) {
+func (mt *metaTable) DeleteIndex(indexBuildID UniqueID) {
 	mt.lock.Lock()
 	defer mt.lock.Unlock()
 
+	delete(mt.indexBuildID2Meta, indexBuildID)
+}
+
+func (mt *metaTable) getMarkDeleted(limit int) []indexpb.IndexMeta {
+	mt.lock.Lock()
+	defer mt.lock.Unlock()
+
+	log.Debug("IndexService get mark deleted meta")
+
+	var indexMetas []indexpb.IndexMeta
 	for _, meta := range mt.indexBuildID2Meta {
-		if meta.Req.IndexID == indexID {
-			err := mt.client.MultiRemove(meta.IndexFilePaths)
-			if err != nil {
-				log.Warn("indexservice", zap.String("remove index file err", err.Error()))
-			}
+		if meta.MarkDeleted && meta.State == commonpb.IndexState_Finished {
+			indexMetas = append(indexMetas, meta)
 		}
-	}
-}
-
-func (mt *metaTable) removeMeta(indexID UniqueID) {
-	mt.lock.Lock()
-	defer mt.lock.Unlock()
-
-	indexBuildIDToRemove := make([]UniqueID, 0)
-	for indexBuildID, meta := range mt.indexBuildID2Meta {
-		if meta.Req.IndexID == indexID {
-			indexBuildIDToRemove = append(indexBuildIDToRemove, indexBuildID)
+		if len(indexMetas) >= limit {
+			return indexMetas
 		}
 	}
 
-	for _, indexBuildID := range indexBuildIDToRemove {
-		delete(mt.indexBuildID2Meta, indexBuildID)
-	}
-}
-
-func (mt *metaTable) DeleteIndex(indexBuildID UniqueID) error {
-	mt.lock.Lock()
-	defer mt.lock.Unlock()
-
-	indexMeta, ok := mt.indexBuildID2Meta[indexBuildID]
-	if !ok {
-		return fmt.Errorf("can't find index. id = %d", indexBuildID)
-	}
-	log.Debug("indexservice", zap.Stringer("indexMeta", &indexMeta))
-
-	return nil
+	return indexMetas
 }
diff --git a/internal/indexservice/task.go b/internal/indexservice/task.go
index 8ab4d1845e..185c2ed794 100644
--- a/internal/indexservice/task.go
+++ b/internal/indexservice/task.go
@@ -122,6 +122,10 @@ func (it *IndexAddTask) Execute(ctx context.Context) error {
 	if resp.ErrorCode != commonpb.ErrorCode_Success {
 		return errors.New(resp.Reason)
 	}
+	err = it.table.BuildIndex(it.indexBuildID)
+	if err != nil {
+		return err
+	}
 	it.nodeClients.IncPriority(it.buildClientNodeID, 1)
 	return nil
 }
diff --git a/internal/indexservice/task_scheduler.go b/internal/indexservice/task_scheduler.go
index 9d5c00229f..a588924821 100644
--- a/internal/indexservice/task_scheduler.go
+++ b/internal/indexservice/task_scheduler.go
@@ -26,7 +26,7 @@ type TaskQueue interface {
 	AddActiveTask(t task)
 	PopActiveTask(tID UniqueID) task
 	Enqueue(t task) error
-	tryToRemoveUselessIndexAddTask(indexID UniqueID)
+	tryToRemoveUselessIndexAddTask(indexID UniqueID) []UniqueID
 }
 
 type BaseTaskQueue struct {
@@ -143,10 +143,11 @@ func (queue *IndexAddTaskQueue) Enqueue(t task) error {
 }
 
 // Note: tryToRemoveUselessIndexAddTask must be called by DropIndex
-func (queue *IndexAddTaskQueue) tryToRemoveUselessIndexAddTask(indexID UniqueID) {
+func (queue *IndexAddTaskQueue) tryToRemoveUselessIndexAddTask(indexID UniqueID) []UniqueID {
 	queue.lock.Lock()
 	defer queue.lock.Unlock()
 
+	var indexBuildIDs []UniqueID
 	var next *list.Element
 	for e := queue.unissuedTasks.Front(); e != nil; e = next {
 		next = e.Next()
@@ -156,8 +157,12 @@ func (queue *IndexAddTaskQueue) tryToRemoveUselessIndexAddTask(indexID UniqueID)
 		}
 		if indexAddTask.req.IndexID == indexID {
 			queue.unissuedTasks.Remove(e)
+			indexAddTask.Notify(nil)
+			indexBuildIDs = append(indexBuildIDs, indexAddTask.req.IndexBuildID)
 		}
 	}
+
+	return indexBuildIDs
 }
 
 func NewIndexAddTaskQueue(sched *TaskScheduler) *IndexAddTaskQueue {
diff --git a/internal/proto/common.proto b/internal/proto/common.proto
index 2e0708b5b8..334ea5cc96 100644
--- a/internal/proto/common.proto
+++ b/internal/proto/common.proto
@@ -41,7 +41,6 @@ enum IndexState {
     InProgress = 2;
     Finished = 3;
     Failed = 4;
-    Deleted = 5;
 }
 
 enum SegmentState {
diff --git a/internal/proto/commonpb/common.pb.go b/internal/proto/commonpb/common.pb.go
index 1c01861e88..9308b0a472 100644
--- a/internal/proto/commonpb/common.pb.go
+++ b/internal/proto/commonpb/common.pb.go
@@ -126,7 +126,6 @@ const (
 	IndexState_InProgress     IndexState = 2
 	IndexState_Finished       IndexState = 3
 	IndexState_Failed         IndexState = 4
-	IndexState_Deleted        IndexState = 5
 )
 
 var IndexState_name = map[int32]string{
@@ -135,7 +134,6 @@ var IndexState_name = map[int32]string{
 	2: "InProgress",
 	3: "Finished",
 	4: "Failed",
-	5: "Deleted",
 }
 
 var IndexState_value = map[string]int32{
@@ -144,7 +142,6 @@ var IndexState_value = map[string]int32{
 	"InProgress":     2,
 	"Finished":       3,
 	"Failed":         4,
-	"Deleted":        5,
 }
 
 func (x IndexState) String() string {
@@ -629,77 +626,77 @@ func init() {
 func init() { proto.RegisterFile("common.proto", fileDescriptor_555bd8c177793206) }
 
 var fileDescriptor_555bd8c177793206 = []byte{
-	// 1142 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x55, 0x5b, 0x6f, 0xdc, 0x44,
-	0x14, 0xae, 0x77, 0x37, 0x17, 0x9f, 0xdd, 0x6c, 0x26, 0x93, 0x4b, 0x53, 0x88, 0x50, 0x95, 0xa7,
-	0x2a, 0x52, 0x13, 0x04, 0x12, 0x3c, 0x55, 0xa2, 0xd9, 0x6d, 0xd2, 0x55, 0x9b, 0x0b, 0xde, 0xb4,
-	0x42, 0xbc, 0x54, 0x5e, 0xfb, 0xc4, 0x3b, 0xd4, 0x9e, 0x59, 0x66, 0xc6, 0x6d, 0xb7, 0xbf, 0x02,
-	0xfa, 0x1f, 0x78, 0x03, 0xc4, 0x9d, 0xbf, 0xc0, 0xfd, 0x99, 0x9f, 0xc0, 0x0f, 0xe0, 0xa6, 0xf2,
-	0x82, 0xce, 0xd8, 0x59, 0x1b, 0xa9, 0xbc, 0xf9, 0x7c, 0xe7, 0xf6, 0x9d, 0x9b, 0x07, 0x3a, 0x91,
-	0xca, 0x32, 0x25, 0x77, 0x27, 0x5a, 0x59, 0xc5, 0x57, 0x33, 0x91, 0x3e, 0xca, 0x4d, 0x21, 0xed,
-	0x16, 0xaa, 0xed, 0x07, 0x30, 0x3f, 0xb4, 0xa1, 0xcd, 0x0d, 0xbf, 0x01, 0x80, 0x5a, 0x2b, 0xfd,
-	0x20, 0x52, 0x31, 0x6e, 0x7a, 0x57, 0xbd, 0x6b, 0xdd, 0xd7, 0x5e, 0xd9, 0x7d, 0x81, 0xcf, 0xee,
-	0x2d, 0x32, 0xeb, 0xa9, 0x18, 0x03, 0x1f, 0x2f, 0x3e, 0xf9, 0x06, 0xcc, 0x6b, 0x0c, 0x8d, 0x92,
-	0x9b, 0x8d, 0xab, 0xde, 0x35, 0x3f, 0x28, 0xa5, 0xed, 0x37, 0xa0, 0x73, 0x07, 0xa7, 0xf7, 0xc3,
-	0x34, 0xc7, 0xd3, 0x50, 0x68, 0xce, 0xa0, 0xf9, 0x10, 0xa7, 0x2e, 0xbe, 0x1f, 0xd0, 0x27, 0x5f,
-	0x83, 0xb9, 0x47, 0xa4, 0x2e, 0x1d, 0x0b, 0x61, 0x7b, 0x0b, 0x5a, 0xfb, 0xa9, 0x1a, 0x55, 0x5a,
-	0xf2, 0xe8, 0x5c, 0x68, 0xaf, 0xc3, 0xc2, 0xcd, 0x38, 0xd6, 0x68, 0x0c, 0xef, 0x42, 0x43, 0x4c,
-	0xca, 0x78, 0x0d, 0x31, 0xe1, 0x1c, 0x5a, 0x13, 0xa5, 0xad, 0x8b, 0xd6, 0x0c, 0xdc, 0xf7, 0xf6,
-	0x33, 0x0f, 0x16, 0x8e, 0x4c, 0xb2, 0x1f, 0x1a, 0xe4, 0x6f, 0xc2, 0x62, 0x66, 0x92, 0x07, 0x76,
-	0x3a, 0xb9, 0xa8, 0x72, 0xeb, 0x85, 0x55, 0x1e, 0x99, 0xe4, 0x6c, 0x3a, 0xc1, 0x60, 0x21, 0x2b,
-	0x3e, 0x88, 0x49, 0x66, 0x92, 0x41, 0xbf, 0x8c, 0x5c, 0x08, 0x7c, 0x0b, 0x7c, 0x2b, 0x32, 0x34,
-	0x36, 0xcc, 0x26, 0x9b, 0xcd, 0xab, 0xde, 0xb5, 0x56, 0x50, 0x01, 0xfc, 0x25, 0x58, 0x34, 0x2a,
-	0xd7, 0x11, 0x0e, 0xfa, 0x9b, 0x2d, 0xe7, 0x36, 0x93, 0xb7, 0x6f, 0x80, 0x7f, 0x64, 0x92, 0xdb,
-	0x18, 0xc6, 0xa8, 0xf9, 0xab, 0xd0, 0x1a, 0x85, 0xa6, 0x60, 0xd4, 0xfe, 0x7f, 0x46, 0x54, 0x41,
-	0xe0, 0x2c, 0x77, 0x3e, 0x6a, 0x81, 0x3f, 0x9b, 0x04, 0x6f, 0xc3, 0xc2, 0x30, 0x8f, 0x22, 0x34,
-	0x86, 0x5d, 0xe2, 0xab, 0xb0, 0x7c, 0x4f, 0xe2, 0x93, 0x09, 0x46, 0x16, 0x63, 0x67, 0xc3, 0x3c,
-	0xbe, 0x02, 0x4b, 0x3d, 0x25, 0x25, 0x46, 0xf6, 0x20, 0x14, 0x29, 0xc6, 0xac, 0xc1, 0xd7, 0x80,
-	0x9d, 0xa2, 0xce, 0x84, 0x31, 0x42, 0xc9, 0x3e, 0x4a, 0x81, 0x31, 0x6b, 0xf2, 0xcb, 0xb0, 0xda,
-	0x53, 0x69, 0x8a, 0x91, 0x15, 0x4a, 0x1e, 0x2b, 0x7b, 0xeb, 0x89, 0x30, 0xd6, 0xb0, 0x16, 0x85,
-	0x1d, 0xa4, 0x29, 0x26, 0x61, 0x7a, 0x53, 0x27, 0x79, 0x86, 0xd2, 0xb2, 0x39, 0x8a, 0x51, 0x82,
-	0x7d, 0x91, 0xa1, 0xa4, 0x48, 0x6c, 0xa1, 0x86, 0x0e, 0x64, 0x8c, 0x4f, 0xa8, 0x7f, 0x6c, 0x91,
-	0x5f, 0x81, 0xf5, 0x12, 0xad, 0x25, 0x08, 0x33, 0x64, 0x3e, 0x5f, 0x86, 0x76, 0xa9, 0x3a, 0x3b,
-	0x39, 0xbd, 0xc3, 0xa0, 0x16, 0x21, 0x50, 0x8f, 0x03, 0x8c, 0x94, 0x8e, 0x59, 0xbb, 0x46, 0xe1,
-	0x3e, 0x46, 0x56, 0xe9, 0x41, 0x9f, 0x75, 0x88, 0x70, 0x09, 0x0e, 0x31, 0xd4, 0xd1, 0x38, 0x40,
-	0x93, 0xa7, 0x96, 0x2d, 0x71, 0x06, 0x9d, 0x03, 0x91, 0xe2, 0xb1, 0xb2, 0x07, 0x2a, 0x97, 0x31,
-	0xeb, 0xf2, 0x2e, 0xc0, 0x11, 0xda, 0xb0, 0xec, 0xc0, 0x32, 0xa5, 0xed, 0x85, 0xd1, 0x18, 0x4b,
-	0x80, 0xf1, 0x0d, 0xe0, 0xbd, 0x50, 0x4a, 0x65, 0x7b, 0x1a, 0x43, 0x8b, 0x07, 0x2a, 0x8d, 0x51,
-	0xb3, 0x15, 0xa2, 0xf3, 0x1f, 0x5c, 0xa4, 0xc8, 0x78, 0x65, 0xdd, 0xc7, 0x14, 0x67, 0xd6, 0xab,
-	0x95, 0x75, 0x89, 0x93, 0xf5, 0x1a, 0x91, 0xdf, 0xcf, 0x45, 0x1a, 0xbb, 0x96, 0x14, 0x63, 0x59,
-	0x27, 0x8e, 0x25, 0xf9, 0xe3, 0xbb, 0x83, 0xe1, 0x19, 0xdb, 0xe0, 0xeb, 0xb0, 0x52, 0x22, 0x47,
-	0x68, 0xb5, 0x88, 0x5c, 0xf3, 0x2e, 0x13, 0xd5, 0x93, 0xdc, 0x9e, 0x9c, 0x1f, 0x61, 0xa6, 0xf4,
-	0x94, 0x6d, 0xd2, 0x40, 0x5d, 0xa4, 0x8b, 0x11, 0xb1, 0x2b, 0x9c, 0xc3, 0x52, 0xbf, 0x1f, 0xe0,
-	0xfb, 0x39, 0x1a, 0x1b, 0x84, 0x11, 0xb2, 0xdf, 0x16, 0x76, 0x10, 0xc0, 0x99, 0xd1, 0x99, 0x23,
-	0xe7, 0xd0, 0xad, 0xa4, 0x63, 0x25, 0x91, 0x5d, 0xe2, 0x1d, 0x58, 0xbc, 0x27, 0x85, 0x31, 0x39,
-	0xc6, 0xcc, 0xa3, 0x16, 0x0d, 0xe4, 0xa9, 0x56, 0x09, 0x5d, 0x17, 0x6b, 0x90, 0xf6, 0x40, 0x48,
-	0x61, 0xc6, 0x6e, 0x39, 0x00, 0xe6, 0xcb, 0x5e, 0xb5, 0x68, 0xe7, 0x8a, 0xfa, 0x62, 0x36, 0xb7,
-	0xf3, 0x0e, 0x74, 0x86, 0x98, 0xd0, 0x52, 0x14, 0x89, 0xd6, 0x80, 0xd5, 0xe5, 0x2a, 0xd5, 0x8c,
-	0xae, 0x47, 0x01, 0x0e, 0xb5, 0x7a, 0x2c, 0x64, 0xc2, 0x1a, 0x14, 0x79, 0x88, 0x61, 0xea, 0xb2,
-	0xb4, 0x61, 0xe1, 0x20, 0xcd, 0x5d, 0xca, 0xd6, 0xce, 0xf3, 0x39, 0x77, 0xbc, 0xee, 0x06, 0x97,
-	0xc0, 0xbf, 0x27, 0x63, 0x3c, 0x17, 0x12, 0x63, 0x76, 0xc9, 0xf5, 0xd9, 0xcd, 0xa3, 0xda, 0x27,
-	0x16, 0x53, 0x8d, 0x7d, 0xad, 0x26, 0x35, 0x0c, 0xa9, 0x59, 0xb7, 0x43, 0x53, 0x83, 0xce, 0x69,
-	0x78, 0x7d, 0x34, 0x91, 0x16, 0xa3, 0xba, 0x7b, 0x42, 0x63, 0x1a, 0x8e, 0xd5, 0xe3, 0x0a, 0x33,
-	0x6c, 0x4c, 0x99, 0x0e, 0xd1, 0x0e, 0xa7, 0xc6, 0x62, 0xd6, 0x53, 0xf2, 0x5c, 0x24, 0x86, 0x09,
-	0xca, 0x74, 0x57, 0x85, 0x71, 0xcd, 0xfd, 0x3d, 0x1a, 0x5f, 0x80, 0x29, 0x86, 0xa6, 0x1e, 0xf5,
-	0x21, 0x5f, 0x83, 0xe5, 0x82, 0xea, 0x69, 0xa8, 0xad, 0x70, 0xe0, 0x77, 0x9e, 0x1b, 0x98, 0x56,
-	0x93, 0x0a, 0xfb, 0x9e, 0x0e, 0xb5, 0x73, 0x3b, 0x34, 0x15, 0xf4, 0x83, 0xc7, 0x37, 0x60, 0xe5,
-	0x82, 0x6a, 0x85, 0xff, 0xe8, 0xf1, 0x55, 0xe8, 0x12, 0xd5, 0x19, 0x66, 0xd8, 0x4f, 0x0e, 0x24,
-	0x52, 0x35, 0xf0, 0x67, 0x17, 0xa1, 0x64, 0x55, 0xc3, 0x7f, 0x71, 0xc9, 0x28, 0x42, 0x39, 0x2a,
-	0xc3, 0x9e, 0x7b, 0xc4, 0xf4, 0x22, 0x59, 0x09, 0xb3, 0x7f, 0x3c, 0xce, 0xa0, 0x5d, 0xf0, 0x77,
-	0xeb, 0xc3, 0x3e, 0x6e, 0x38, 0xee, 0xa5, 0x5d, 0x81, 0x7d, 0xd2, 0xe0, 0x5d, 0xf0, 0xa9, 0x9e,
-	0x42, 0xfe, 0xb4, 0xc1, 0xdb, 0x30, 0x3f, 0x90, 0x06, 0xb5, 0x65, 0x1f, 0xd0, 0x54, 0xe7, 0x8b,
-	0x7d, 0x61, 0x1f, 0xd2, 0x22, 0xcd, 0xb9, 0x11, 0xb3, 0x67, 0x4e, 0x51, 0x5c, 0x2e, 0xfb, 0xbd,
-	0xe9, 0x18, 0xd5, 0xcf, 0xf8, 0x8f, 0x26, 0x65, 0x3a, 0x44, 0x5b, 0xed, 0x2d, 0xfb, 0xb3, 0xc9,
-	0xb7, 0xe0, 0xf2, 0x21, 0xda, 0xaa, 0xc5, 0xa4, 0x10, 0xc6, 0x8a, 0xc8, 0xb0, 0xbf, 0x9a, 0xfc,
-	0x65, 0xd8, 0x38, 0x44, 0x3b, 0x2b, 0xb5, 0xa6, 0xfc, 0xbb, 0x49, 0xa5, 0x94, 0x85, 0x0d, 0xe4,
-	0xb9, 0x62, 0xbf, 0xb6, 0xf8, 0x12, 0x2c, 0x9e, 0x89, 0x0c, 0xcf, 0x44, 0xf4, 0x90, 0x7d, 0xe6,
-	0x53, 0x07, 0xdf, 0xce, 0x51, 0x4f, 0x8f, 0x55, 0x8c, 0xe4, 0x6a, 0xd8, 0xe7, 0x3e, 0x95, 0x46,
-	0x6d, 0x2d, 0x4a, 0xfb, 0xc2, 0xc9, 0xe5, 0xa5, 0x0d, 0xfa, 0xec, 0x4b, 0xfa, 0x83, 0x41, 0x29,
-	0x9f, 0x0d, 0x4f, 0xd8, 0x57, 0x3e, 0xf5, 0xf1, 0x66, 0x9a, 0xaa, 0x28, 0xb4, 0xb3, 0x3e, 0x7e,
-	0xed, 0xd3, 0x20, 0x6a, 0x77, 0x51, 0x92, 0xfa, 0xc6, 0xe7, 0xeb, 0xb3, 0x7b, 0x71, 0x6d, 0xe9,
-	0xd3, 0xbd, 0x7c, 0xeb, 0xef, 0xef, 0xbf, 0xfb, 0x56, 0x22, 0xec, 0x38, 0x1f, 0xd1, 0x23, 0xb0,
-	0xf7, 0x54, 0xa4, 0xa9, 0x78, 0x6a, 0x31, 0x1a, 0xef, 0x15, 0x0f, 0xc4, 0xf5, 0x58, 0x18, 0xab,
-	0xc5, 0x28, 0xb7, 0x18, 0xef, 0x09, 0x69, 0x51, 0xcb, 0x30, 0xdd, 0x73, 0xaf, 0xc6, 0x5e, 0xf1,
-	0x6a, 0x4c, 0x46, 0xa3, 0x79, 0x27, 0xbf, 0xfe, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9b, 0xfc,
-	0x13, 0xb2, 0x0f, 0x08, 0x00, 0x00,
+	// 1140 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x55, 0xdb, 0x6e, 0xdb, 0x46,
+	0x13, 0x0e, 0x25, 0xf9, 0xc0, 0x91, 0x2c, 0xaf, 0xd7, 0x87, 0x38, 0xff, 0x6f, 0x14, 0x81, 0xaf,
+	0x02, 0x03, 0xb1, 0x8b, 0x16, 0x68, 0xaf, 0x02, 0x34, 0x96, 0x62, 0x47, 0x48, 0x7c, 0x28, 0xe5,
+	0x04, 0x41, 0x6f, 0x02, 0x8a, 0x1c, 0x53, 0xdb, 0x90, 0xbb, 0xea, 0xee, 0x32, 0x89, 0xf2, 0x14,
+	0x6d, 0xde, 0xa1, 0x77, 0x6d, 0xd1, 0x73, 0x5f, 0xa1, 0xe7, 0xeb, 0x3e, 0x42, 0x1f, 0xa0, 0x27,
+	0xa4, 0x37, 0xc5, 0x2c, 0x69, 0x91, 0x05, 0xd2, 0xbb, 0x9d, 0x6f, 0x66, 0xbf, 0xf9, 0x66, 0x66,
+	0x87, 0x84, 0x4e, 0xa4, 0xb2, 0x4c, 0xc9, 0xdd, 0x89, 0x56, 0x56, 0xf1, 0xd5, 0x4c, 0xa4, 0x8f,
+	0x73, 0x53, 0x58, 0xbb, 0x85, 0x6b, 0xfb, 0x21, 0xcc, 0x0f, 0x6d, 0x68, 0x73, 0xc3, 0x6f, 0x00,
+	0xa0, 0xd6, 0x4a, 0x3f, 0x8c, 0x54, 0x8c, 0x9b, 0xde, 0x55, 0xef, 0x5a, 0xf7, 0xb5, 0x57, 0x76,
+	0x5f, 0x72, 0x67, 0xf7, 0x16, 0x85, 0xf5, 0x54, 0x8c, 0x81, 0x8f, 0x17, 0x47, 0xbe, 0x01, 0xf3,
+	0x1a, 0x43, 0xa3, 0xe4, 0x66, 0xe3, 0xaa, 0x77, 0xcd, 0x0f, 0x4a, 0x6b, 0xfb, 0x0d, 0xe8, 0xdc,
+	0xc1, 0xe9, 0xfd, 0x30, 0xcd, 0xf1, 0x34, 0x14, 0x9a, 0x33, 0x68, 0x3e, 0xc2, 0xa9, 0xe3, 0xf7,
+	0x03, 0x3a, 0xf2, 0x35, 0x98, 0x7b, 0x4c, 0xee, 0xf2, 0x62, 0x61, 0x6c, 0x6f, 0x41, 0x6b, 0x3f,
+	0x55, 0xa3, 0xca, 0x4b, 0x37, 0x3a, 0x17, 0xde, 0xeb, 0xb0, 0x70, 0x33, 0x8e, 0x35, 0x1a, 0xc3,
+	0xbb, 0xd0, 0x10, 0x93, 0x92, 0xaf, 0x21, 0x26, 0x9c, 0x43, 0x6b, 0xa2, 0xb4, 0x75, 0x6c, 0xcd,
+	0xc0, 0x9d, 0xb7, 0x9f, 0x7b, 0xb0, 0x70, 0x64, 0x92, 0xfd, 0xd0, 0x20, 0x7f, 0x13, 0x16, 0x33,
+	0x93, 0x3c, 0xb4, 0xd3, 0xc9, 0x45, 0x95, 0x5b, 0x2f, 0xad, 0xf2, 0xc8, 0x24, 0x67, 0xd3, 0x09,
+	0x06, 0x0b, 0x59, 0x71, 0x20, 0x25, 0x99, 0x49, 0x06, 0xfd, 0x92, 0xb9, 0x30, 0xf8, 0x16, 0xf8,
+	0x56, 0x64, 0x68, 0x6c, 0x98, 0x4d, 0x36, 0x9b, 0x57, 0xbd, 0x6b, 0xad, 0xa0, 0x02, 0xf8, 0xff,
+	0x60, 0xd1, 0xa8, 0x5c, 0x47, 0x38, 0xe8, 0x6f, 0xb6, 0xdc, 0xb5, 0x99, 0xbd, 0x7d, 0x03, 0xfc,
+	0x23, 0x93, 0xdc, 0xc6, 0x30, 0x46, 0xcd, 0x5f, 0x85, 0xd6, 0x28, 0x34, 0x85, 0xa2, 0xf6, 0x7f,
+	0x2b, 0xa2, 0x0a, 0x02, 0x17, 0xb9, 0xf3, 0x61, 0x0b, 0xfc, 0xd9, 0x24, 0x78, 0x1b, 0x16, 0x86,
+	0x79, 0x14, 0xa1, 0x31, 0xec, 0x12, 0x5f, 0x85, 0xe5, 0x7b, 0x12, 0x9f, 0x4e, 0x30, 0xb2, 0x18,
+	0xbb, 0x18, 0xe6, 0xf1, 0x15, 0x58, 0xea, 0x29, 0x29, 0x31, 0xb2, 0x07, 0xa1, 0x48, 0x31, 0x66,
+	0x0d, 0xbe, 0x06, 0xec, 0x14, 0x75, 0x26, 0x8c, 0x11, 0x4a, 0xf6, 0x51, 0x0a, 0x8c, 0x59, 0x93,
+	0x5f, 0x86, 0xd5, 0x9e, 0x4a, 0x53, 0x8c, 0xac, 0x50, 0xf2, 0x58, 0xd9, 0x5b, 0x4f, 0x85, 0xb1,
+	0x86, 0xb5, 0x88, 0x76, 0x90, 0xa6, 0x98, 0x84, 0xe9, 0x4d, 0x9d, 0xe4, 0x19, 0x4a, 0xcb, 0xe6,
+	0x88, 0xa3, 0x04, 0xfb, 0x22, 0x43, 0x49, 0x4c, 0x6c, 0xa1, 0x86, 0x0e, 0x64, 0x8c, 0x4f, 0xa9,
+	0x7f, 0x6c, 0x91, 0x5f, 0x81, 0xf5, 0x12, 0xad, 0x25, 0x08, 0x33, 0x64, 0x3e, 0x5f, 0x86, 0x76,
+	0xe9, 0x3a, 0x3b, 0x39, 0xbd, 0xc3, 0xa0, 0xc6, 0x10, 0xa8, 0x27, 0x01, 0x46, 0x4a, 0xc7, 0xac,
+	0x5d, 0x93, 0x70, 0x1f, 0x23, 0xab, 0xf4, 0xa0, 0xcf, 0x3a, 0x24, 0xb8, 0x04, 0x87, 0x18, 0xea,
+	0x68, 0x1c, 0xa0, 0xc9, 0x53, 0xcb, 0x96, 0x38, 0x83, 0xce, 0x81, 0x48, 0xf1, 0x58, 0xd9, 0x03,
+	0x95, 0xcb, 0x98, 0x75, 0x79, 0x17, 0xe0, 0x08, 0x6d, 0x58, 0x76, 0x60, 0x99, 0xd2, 0xf6, 0xc2,
+	0x68, 0x8c, 0x25, 0xc0, 0xf8, 0x06, 0xf0, 0x5e, 0x28, 0xa5, 0xb2, 0x3d, 0x8d, 0xa1, 0xc5, 0x03,
+	0x95, 0xc6, 0xa8, 0xd9, 0x0a, 0xc9, 0xf9, 0x17, 0x2e, 0x52, 0x64, 0xbc, 0x8a, 0xee, 0x63, 0x8a,
+	0xb3, 0xe8, 0xd5, 0x2a, 0xba, 0xc4, 0x29, 0x7a, 0x8d, 0xc4, 0xef, 0xe7, 0x22, 0x8d, 0x5d, 0x4b,
+	0x8a, 0xb1, 0xac, 0x93, 0xc6, 0x52, 0xfc, 0xf1, 0xdd, 0xc1, 0xf0, 0x8c, 0x6d, 0xf0, 0x75, 0x58,
+	0x29, 0x91, 0x23, 0xb4, 0x5a, 0x44, 0xae, 0x79, 0x97, 0x49, 0xea, 0x49, 0x6e, 0x4f, 0xce, 0x8f,
+	0x30, 0x53, 0x7a, 0xca, 0x36, 0x69, 0xa0, 0x8e, 0xe9, 0x62, 0x44, 0xec, 0x0a, 0xe7, 0xb0, 0xd4,
+	0xef, 0x07, 0xf8, 0x5e, 0x8e, 0xc6, 0x06, 0x61, 0x84, 0xec, 0xd7, 0x85, 0x9d, 0x07, 0x00, 0x2e,
+	0x8c, 0xd6, 0x1c, 0x39, 0x87, 0x6e, 0x65, 0x1d, 0x2b, 0x89, 0xec, 0x12, 0xef, 0xc0, 0xe2, 0x3d,
+	0x29, 0x8c, 0xc9, 0x31, 0x66, 0x1e, 0xb5, 0x68, 0x20, 0x4f, 0xb5, 0x4a, 0x68, 0xbb, 0x58, 0x83,
+	0xbc, 0x07, 0x42, 0x0a, 0x33, 0x76, 0x8f, 0x03, 0x60, 0xbe, 0xec, 0x55, 0x6b, 0xe7, 0x01, 0x74,
+	0x86, 0x98, 0xd0, 0x3b, 0x28, 0xb8, 0xd7, 0x80, 0xd5, 0xed, 0x8a, 0x7d, 0xa6, 0xd0, 0xa3, 0x77,
+	0x7a, 0xa8, 0xd5, 0x13, 0x21, 0x13, 0xd6, 0x20, 0xb2, 0x21, 0x86, 0xa9, 0x23, 0x6e, 0xc3, 0xc2,
+	0x41, 0x9a, 0xbb, 0x2c, 0xad, 0x9d, 0x17, 0x73, 0x6e, 0x5f, 0xdd, 0xda, 0x2d, 0x81, 0x7f, 0x4f,
+	0xc6, 0x78, 0x2e, 0x24, 0xc6, 0xec, 0x92, 0x6b, 0xad, 0x1b, 0x41, 0xf5, 0x84, 0x58, 0x4c, 0x65,
+	0xf5, 0xb5, 0x9a, 0xd4, 0x30, 0xa4, 0xfe, 0xdc, 0x0e, 0x4d, 0x0d, 0x3a, 0xa7, 0x79, 0xf5, 0xd1,
+	0x44, 0x5a, 0x8c, 0xea, 0xd7, 0x13, 0x9a, 0xcc, 0x70, 0xac, 0x9e, 0x54, 0x98, 0x61, 0x63, 0xca,
+	0x74, 0x88, 0x76, 0x38, 0x35, 0x16, 0xb3, 0x9e, 0x92, 0xe7, 0x22, 0x31, 0x4c, 0x50, 0xa6, 0xbb,
+	0x2a, 0x8c, 0x6b, 0xd7, 0xdf, 0xa5, 0x89, 0x05, 0x98, 0x62, 0x68, 0xea, 0xac, 0x8f, 0xf8, 0x1a,
+	0x2c, 0x17, 0x52, 0x4f, 0x43, 0x6d, 0x85, 0x03, 0xbf, 0xf5, 0xdc, 0x8c, 0xb4, 0x9a, 0x54, 0xd8,
+	0x77, 0xb4, 0x9b, 0x9d, 0xdb, 0xa1, 0xa9, 0xa0, 0xef, 0x3d, 0xbe, 0x01, 0x2b, 0x17, 0x52, 0x2b,
+	0xfc, 0x07, 0x8f, 0xaf, 0x42, 0x97, 0xa4, 0xce, 0x30, 0xc3, 0x7e, 0x74, 0x20, 0x89, 0xaa, 0x81,
+	0x3f, 0x39, 0x86, 0x52, 0x55, 0x0d, 0xff, 0xd9, 0x25, 0x23, 0x86, 0x72, 0x54, 0x86, 0xbd, 0xf0,
+	0x48, 0xe9, 0x45, 0xb2, 0x12, 0x66, 0x7f, 0x7b, 0x9c, 0x41, 0xbb, 0xd0, 0xef, 0x5e, 0x0c, 0xfb,
+	0xa8, 0xe1, 0xb4, 0x97, 0x71, 0x05, 0xf6, 0x71, 0x83, 0x77, 0xc1, 0xa7, 0x7a, 0x0a, 0xfb, 0x93,
+	0x06, 0x6f, 0xc3, 0xfc, 0x40, 0x1a, 0xd4, 0x96, 0xbd, 0x4f, 0x53, 0x9d, 0x2f, 0x56, 0x80, 0x7d,
+	0x40, 0x6f, 0x67, 0xce, 0x8d, 0x98, 0x3d, 0x77, 0x8e, 0x62, 0x59, 0xd9, 0x6f, 0x4d, 0xa7, 0xa8,
+	0xbe, 0xb9, 0xbf, 0x37, 0x29, 0xd3, 0x21, 0xda, 0xea, 0xa9, 0xb2, 0x3f, 0x9a, 0x7c, 0x0b, 0x2e,
+	0x1f, 0xa2, 0xad, 0x5a, 0x4c, 0x0e, 0x61, 0xac, 0x88, 0x0c, 0xfb, 0xb3, 0xc9, 0xff, 0x0f, 0x1b,
+	0x87, 0x68, 0x67, 0xa5, 0xd6, 0x9c, 0x7f, 0x35, 0xa9, 0x94, 0xb2, 0xb0, 0x81, 0x3c, 0x57, 0xec,
+	0x97, 0x16, 0x5f, 0x82, 0xc5, 0x33, 0x91, 0xe1, 0x99, 0x88, 0x1e, 0xb1, 0x4f, 0x7d, 0xea, 0xe0,
+	0xdb, 0x39, 0xea, 0xe9, 0xb1, 0x8a, 0x91, 0xae, 0x1a, 0xf6, 0x99, 0x4f, 0xa5, 0x51, 0x5b, 0x8b,
+	0xd2, 0x3e, 0x77, 0x76, 0xb9, 0x5c, 0x83, 0x3e, 0xfb, 0x82, 0x3e, 0x5a, 0x50, 0xda, 0x67, 0xc3,
+	0x13, 0xf6, 0xa5, 0x4f, 0x7d, 0xbc, 0x99, 0xa6, 0x2a, 0x0a, 0xed, 0xac, 0x8f, 0x5f, 0xf9, 0x34,
+	0x88, 0xda, 0x5e, 0x94, 0xa2, 0xbe, 0xf6, 0xf9, 0xfa, 0x6c, 0x5f, 0x5c, 0x5b, 0xfa, 0xb4, 0x2f,
+	0xdf, 0xf8, 0xfb, 0xfb, 0xef, 0xbc, 0x95, 0x08, 0x3b, 0xce, 0x47, 0xf4, 0xdd, 0xdf, 0x7b, 0x26,
+	0xd2, 0x54, 0x3c, 0xb3, 0x18, 0x8d, 0xf7, 0x8a, 0x7f, 0xc2, 0xf5, 0x58, 0x18, 0xab, 0xc5, 0x28,
+	0xb7, 0x18, 0xef, 0x09, 0x69, 0x51, 0xcb, 0x30, 0xdd, 0x73, 0x3f, 0x8a, 0xbd, 0xe2, 0x47, 0x31,
+	0x19, 0x8d, 0xe6, 0x9d, 0xfd, 0xfa, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x96, 0x8b, 0xf7, 0xcf,
+	0x02, 0x08, 0x00, 0x00,
 }
diff --git a/internal/proto/index_service.proto b/internal/proto/index_service.proto
index 45a2502cd7..87526d0b89 100644
--- a/internal/proto/index_service.proto
+++ b/internal/proto/index_service.proto
@@ -97,6 +97,7 @@ message IndexMeta {
   string fail_reason = 3;
   BuildIndexRequest req = 4;
   repeated string index_file_paths = 5;
+  bool mark_deleted = 6;
 }
 
 message DropIndexRequest {
diff --git a/internal/proto/indexpb/index_service.pb.go b/internal/proto/indexpb/index_service.pb.go
index ce135a3263..38059b7a3c 100644
--- a/internal/proto/indexpb/index_service.pb.go
+++ b/internal/proto/indexpb/index_service.pb.go
@@ -614,6 +614,7 @@ type IndexMeta struct {
 	FailReason           string              `protobuf:"bytes,3,opt,name=fail_reason,json=failReason,proto3" json:"fail_reason,omitempty"`
 	Req                  *BuildIndexRequest  `protobuf:"bytes,4,opt,name=req,proto3" json:"req,omitempty"`
 	IndexFilePaths       []string            `protobuf:"bytes,5,rep,name=index_file_paths,json=indexFilePaths,proto3" json:"index_file_paths,omitempty"`
+	MarkDeleted          bool                `protobuf:"varint,6,opt,name=mark_deleted,json=markDeleted,proto3" json:"mark_deleted,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
 	XXX_unrecognized     []byte              `json:"-"`
 	XXX_sizecache        int32               `json:"-"`
@@ -679,6 +680,13 @@ func (m *IndexMeta) GetIndexFilePaths() []string {
 	return nil
 }
 
+func (m *IndexMeta) GetMarkDeleted() bool {
+	if m != nil {
+		return m.MarkDeleted
+	}
+	return false
+}
+
 type DropIndexRequest struct {
 	IndexID              int64    `protobuf:"varint,1,opt,name=indexID,proto3" json:"indexID,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -737,64 +745,66 @@ func init() {
 func init() { proto.RegisterFile("index_service.proto", fileDescriptor_a5d2036b4df73e0a) }
 
 var fileDescriptor_a5d2036b4df73e0a = []byte{
-	// 910 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0x5f, 0x6f, 0x1b, 0x45,
-	0x10, 0xcf, 0xe5, 0x12, 0x47, 0x1e, 0x9b, 0x28, 0xd9, 0x96, 0x70, 0x18, 0xaa, 0xa6, 0x47, 0x01,
-	0x03, 0xad, 0x5d, 0xb9, 0x2a, 0x3c, 0x21, 0x68, 0x6a, 0x11, 0x59, 0xa8, 0x51, 0xb4, 0xad, 0x78,
-	0x40, 0x82, 0x68, 0xed, 0x1b, 0xdb, 0x2b, 0xee, 0xf6, 0x2e, 0xb7, 0xeb, 0x8a, 0xf4, 0x85, 0x17,
-	0x78, 0xe6, 0x0d, 0x89, 0xef, 0x81, 0xd4, 0xef, 0xc4, 0xa7, 0x40, 0xb7, 0x7b, 0x77, 0xf5, 0x9d,
-	0xcf, 0xae, 0x43, 0xf8, 0xf3, 0xd2, 0x37, 0xef, 0xdc, 0x6f, 0x66, 0x76, 0x7e, 0xf3, 0x9b, 0x59,
-	0xc3, 0x35, 0x2e, 0x3c, 0xfc, 0xf1, 0x4c, 0x62, 0xfc, 0x8c, 0x8f, 0xb0, 0x13, 0xc5, 0xa1, 0x0a,
-	0x09, 0x09, 0xb8, 0xff, 0x6c, 0x26, 0xcd, 0xa9, 0xa3, 0x11, 0xad, 0xe6, 0x28, 0x0c, 0x82, 0x50,
-	0x18, 0x5b, 0x6b, 0x97, 0x0b, 0x85, 0xb1, 0x60, 0x7e, 0x7a, 0x6e, 0xce, 0x7b, 0xb8, 0x3f, 0xc1,
-	0x35, 0x8a, 0x13, 0x2e, 0x15, 0xc6, 0x27, 0xa1, 0x87, 0x14, 0xcf, 0x67, 0x28, 0x15, 0xb9, 0x07,
-	0x5b, 0x43, 0x26, 0xd1, 0xb1, 0x0e, 0xad, 0x76, 0xa3, 0xf7, 0x6e, 0xa7, 0x90, 0x25, 0x0d, 0xff,
-	0x58, 0x4e, 0x8e, 0x98, 0x44, 0xaa, 0x91, 0xe4, 0x53, 0xd8, 0x61, 0x9e, 0x17, 0xa3, 0x94, 0xce,
-	0xe6, 0x0a, 0xa7, 0x87, 0x06, 0x43, 0x33, 0xb0, 0xfb, 0xab, 0x05, 0xd7, 0x8b, 0x37, 0x90, 0x51,
-	0x28, 0x24, 0x92, 0xfb, 0x50, 0x93, 0x8a, 0xa9, 0x99, 0x4c, 0x2f, 0xf1, 0x4e, 0x65, 0xbc, 0x27,
-	0x1a, 0x42, 0x53, 0x28, 0x39, 0x82, 0x06, 0x17, 0x5c, 0x9d, 0x45, 0x2c, 0x66, 0x41, 0x76, 0x93,
-	0x5b, 0x9d, 0x12, 0x49, 0x29, 0x1f, 0x03, 0xc1, 0xd5, 0xa9, 0x06, 0x52, 0xe0, 0xf9, 0x6f, 0xf7,
-	0x73, 0x78, 0xf3, 0x18, 0xd5, 0x20, 0xa1, 0x32, 0x89, 0x8e, 0x32, 0x23, 0xe5, 0x36, 0xbc, 0xa1,
-	0x09, 0x3e, 0x9a, 0x71, 0xdf, 0x1b, 0xf4, 0x93, 0x8b, 0xd9, 0x6d, 0x9b, 0x16, 0x8d, 0xee, 0x0b,
-	0x0b, 0xea, 0xda, 0x79, 0x20, 0xc6, 0x21, 0x79, 0x00, 0xdb, 0xc9, 0xd5, 0x0c, 0x93, 0xbb, 0xbd,
-	0x9b, 0x95, 0x45, 0xbc, 0xcc, 0x45, 0x0d, 0x9a, 0xb8, 0xd0, 0x9c, 0x8f, 0xaa, 0x0b, 0xb1, 0x69,
-	0xc1, 0x46, 0x1c, 0xd8, 0xd1, 0xe7, 0x41, 0xdf, 0xb1, 0xf5, 0xe7, 0xec, 0x48, 0x6e, 0x00, 0x18,
-	0xad, 0x08, 0x16, 0xa0, 0xb3, 0x75, 0x68, 0xb5, 0xeb, 0xb4, 0xae, 0x2d, 0x27, 0x2c, 0x40, 0x72,
-	0x00, 0xb5, 0x18, 0x99, 0x0c, 0x85, 0xb3, 0xad, 0x3f, 0xa5, 0x27, 0xf7, 0x67, 0x0b, 0x0e, 0xca,
-	0x95, 0x5f, 0xa5, 0x19, 0x0f, 0x8c, 0x13, 0x26, 0x7d, 0xb0, 0xdb, 0x8d, 0xde, 0x8d, 0xce, 0xa2,
-	0x58, 0x3b, 0x39, 0x55, 0x34, 0x05, 0xbb, 0xbf, 0x6f, 0xc2, 0xbe, 0xa9, 0x31, 0xf9, 0x94, 0x91,
-	0x5f, 0x66, 0xc4, 0xaa, 0x60, 0xa4, 0x58, 0xf7, 0x66, 0xb9, 0xee, 0x95, 0x84, 0x79, 0x4c, 0xb1,
-	0xb3, 0x88, 0xa9, 0xa9, 0x74, 0xb6, 0x0e, 0xed, 0xc4, 0x31, 0xb1, 0x9c, 0x26, 0x86, 0x44, 0x55,
-	0xea, 0x22, 0xc2, 0x4c, 0x55, 0xdb, 0xba, 0x9a, 0x5b, 0x95, 0x14, 0x7c, 0x8d, 0x17, 0xdf, 0x30,
-	0x7f, 0x86, 0xa7, 0x8c, 0xc7, 0x14, 0x12, 0x2f, 0xa3, 0x2a, 0xd2, 0x4f, 0xef, 0x9f, 0x05, 0xa9,
-	0xad, 0x1b, 0xa4, 0xa1, 0xdd, 0x52, 0x6d, 0x06, 0x40, 0xe6, 0xa9, 0xb9, 0x4a, 0x77, 0xd6, 0x90,
-	0x98, 0xfb, 0x87, 0x05, 0x6f, 0x9d, 0x84, 0x8a, 0x8f, 0x2f, 0x16, 0x1b, 0xf2, 0x6f, 0x25, 0x25,
-	0x6d, 0xd8, 0x33, 0x4c, 0x8d, 0xb9, 0x8f, 0x69, 0x4b, 0x6c, 0xdd, 0x92, 0x5d, 0x6d, 0xff, 0x8a,
-	0xfb, 0x68, 0xfa, 0x72, 0x00, 0x35, 0x11, 0x7a, 0x38, 0xe8, 0x6b, 0x8d, 0xdb, 0x34, 0x3d, 0xb9,
-	0x5f, 0x82, 0x93, 0xe9, 0x38, 0x07, 0x5f, 0x6e, 0x88, 0x7f, 0xb3, 0x60, 0xbf, 0xe0, 0xaf, 0x87,
-	0xf9, 0xff, 0x2f, 0x39, 0xb9, 0xd8, 0xdb, 0x15, 0xb5, 0x5d, 0x45, 0x08, 0x7d, 0x80, 0xb9, 0xb4,
-	0x66, 0x54, 0xdf, 0x5f, 0x3a, 0xaa, 0xf3, 0x84, 0xd0, 0xfa, 0x38, 0xbf, 0xd8, 0x9f, 0xd9, 0xda,
-	0x7b, 0x8c, 0x8a, 0xad, 0x35, 0xad, 0xf9, 0x6a, 0xdc, 0xbc, 0xd4, 0x6a, 0xbc, 0x09, 0x8d, 0x31,
-	0xe3, 0xfe, 0x59, 0xba, 0xc2, 0x6c, 0x3d, 0xe5, 0x90, 0x98, 0xa8, 0xb6, 0x90, 0xcf, 0xc0, 0x8e,
-	0xf1, 0x5c, 0x4b, 0x62, 0x49, 0x21, 0x0b, 0x62, 0xa6, 0x89, 0x47, 0x65, 0x17, 0xb6, 0x2b, 0xbb,
-	0x70, 0x07, 0xf6, 0xfa, 0x71, 0x18, 0x15, 0xe6, 0x61, 0x6e, 0xbb, 0x58, 0x85, 0xed, 0xd2, 0x7b,
-	0xb1, 0x03, 0x4d, 0x53, 0x87, 0x79, 0xba, 0x49, 0x04, 0xe4, 0x18, 0xd5, 0xa3, 0x30, 0x88, 0x42,
-	0x81, 0x42, 0x99, 0x5d, 0x4b, 0xee, 0x2d, 0x79, 0xa6, 0x16, 0xa1, 0x69, 0xca, 0xd6, 0x07, 0x4b,
-	0x3c, 0x4a, 0x70, 0x77, 0x83, 0x04, 0x3a, 0xe3, 0x53, 0x1e, 0xe0, 0x53, 0x3e, 0xfa, 0xe1, 0xd1,
-	0x94, 0x09, 0x81, 0xfe, 0xaa, 0x8c, 0x25, 0x68, 0x96, 0xf1, 0xbd, 0xa2, 0x47, 0x7a, 0x78, 0xa2,
-	0x62, 0x2e, 0x26, 0x99, 0x0a, 0xdd, 0x0d, 0x72, 0x0e, 0xd7, 0x8f, 0x51, 0x67, 0xe7, 0x52, 0xf1,
-	0x91, 0xcc, 0x12, 0xf6, 0x96, 0x27, 0x5c, 0x00, 0x5f, 0x32, 0xe5, 0x08, 0x9a, 0xf3, 0x7f, 0x23,
-	0xc8, 0x87, 0x55, 0x8d, 0xaf, 0xf8, 0xab, 0xd3, 0x6a, 0xbf, 0x1a, 0x98, 0x27, 0xf9, 0x0e, 0xe0,
-	0xa5, 0x76, 0xc8, 0x7a, 0xda, 0x5a, 0xec, 0x52, 0x19, 0x96, 0x87, 0xe7, 0xb0, 0x5b, 0x7c, 0x7f,
-	0xc9, 0x47, 0x55, 0xbe, 0x95, 0xff, 0x4e, 0x5a, 0x1f, 0xaf, 0x03, 0xcd, 0x53, 0xc5, 0xb0, 0xbf,
-	0xb0, 0x46, 0xc8, 0x9d, 0x55, 0x21, 0xca, 0x9b, 0xb4, 0x75, 0x77, 0x4d, 0x74, 0x9e, 0xf3, 0x7b,
-	0xd8, 0x2b, 0x3f, 0x26, 0xe4, 0x93, 0xaa, 0x20, 0x4b, 0x9e, 0x9c, 0xd6, 0xaa, 0x75, 0xe6, 0x6e,
-	0x90, 0x53, 0xa8, 0xe7, 0x53, 0x49, 0x6e, 0x57, 0x05, 0x2e, 0x0f, 0xed, 0x2b, 0x22, 0xf6, 0x7e,
-	0xd9, 0x4a, 0x97, 0x9a, 0x96, 0xd4, 0xeb, 0xb1, 0xfd, 0xe7, 0xc7, 0x96, 0xfe, 0x9d, 0x89, 0xfa,
-	0xaf, 0x75, 0x70, 0xf4, 0xf0, 0xdb, 0x2f, 0x26, 0x5c, 0x4d, 0x67, 0xc3, 0xe4, 0x4b, 0xf7, 0x39,
-	0xf7, 0x7d, 0xfe, 0x5c, 0xe1, 0x68, 0xda, 0x35, 0x5e, 0x77, 0x3d, 0x2e, 0x55, 0xcc, 0x87, 0x33,
-	0x85, 0x5e, 0x37, 0x63, 0xa7, 0xab, 0x43, 0x75, 0x75, 0xc2, 0x68, 0x38, 0xac, 0xe9, 0xe3, 0xfd,
-	0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x91, 0x78, 0x78, 0xa9, 0xc6, 0x0d, 0x00, 0x00,
+	// 931 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0xdf, 0x6f, 0x1b, 0x45,
+	0x10, 0xce, 0xf9, 0x12, 0x07, 0x8f, 0x4d, 0x94, 0x6c, 0x4b, 0x38, 0x0c, 0x55, 0x93, 0xa3, 0x80,
+	0x81, 0xd6, 0xae, 0x5c, 0x15, 0x9e, 0x10, 0x34, 0xb5, 0x88, 0x2c, 0xd4, 0xc8, 0xda, 0x56, 0x3c,
+	0x20, 0x81, 0xb5, 0xf6, 0x8d, 0xed, 0x55, 0xef, 0x57, 0x6e, 0xd7, 0x15, 0xe9, 0x0b, 0x2f, 0xf0,
+	0x88, 0x78, 0x43, 0xe2, 0xff, 0x40, 0xea, 0xbf, 0x87, 0x6e, 0xf7, 0xee, 0xea, 0x3b, 0x9f, 0x5d,
+	0x87, 0xf0, 0xe3, 0xa5, 0x6f, 0xde, 0xb9, 0x6f, 0x66, 0x76, 0xbe, 0xf9, 0x66, 0xd6, 0x70, 0x8d,
+	0xfb, 0x0e, 0xfe, 0x38, 0x14, 0x18, 0x3d, 0xe3, 0x63, 0x6c, 0x87, 0x51, 0x20, 0x03, 0x42, 0x3c,
+	0xee, 0x3e, 0x9b, 0x0b, 0x7d, 0x6a, 0x2b, 0x44, 0xb3, 0x31, 0x0e, 0x3c, 0x2f, 0xf0, 0xb5, 0xad,
+	0xb9, 0xc7, 0x7d, 0x89, 0x91, 0xcf, 0xdc, 0xe4, 0xdc, 0x58, 0xf4, 0xb0, 0x7f, 0x82, 0x6b, 0x14,
+	0xa7, 0x5c, 0x48, 0x8c, 0xce, 0x02, 0x07, 0x29, 0x9e, 0xcf, 0x51, 0x48, 0x72, 0x17, 0xb6, 0x47,
+	0x4c, 0xa0, 0x65, 0x1c, 0x19, 0xad, 0x7a, 0xf7, 0xbd, 0x76, 0x2e, 0x4b, 0x12, 0xfe, 0x91, 0x98,
+	0x9e, 0x30, 0x81, 0x54, 0x21, 0xc9, 0x67, 0xb0, 0xcb, 0x1c, 0x27, 0x42, 0x21, 0xac, 0xca, 0x1a,
+	0xa7, 0x07, 0x1a, 0x43, 0x53, 0xb0, 0xfd, 0x9b, 0x01, 0xd7, 0xf3, 0x37, 0x10, 0x61, 0xe0, 0x0b,
+	0x24, 0xf7, 0xa0, 0x2a, 0x24, 0x93, 0x73, 0x91, 0x5c, 0xe2, 0xdd, 0xd2, 0x78, 0x8f, 0x15, 0x84,
+	0x26, 0x50, 0x72, 0x02, 0x75, 0xee, 0x73, 0x39, 0x0c, 0x59, 0xc4, 0xbc, 0xf4, 0x26, 0xc7, 0xed,
+	0x02, 0x49, 0x09, 0x1f, 0x7d, 0x9f, 0xcb, 0x81, 0x02, 0x52, 0xe0, 0xd9, 0x6f, 0xfb, 0x0b, 0x78,
+	0xeb, 0x14, 0x65, 0x3f, 0xa6, 0x32, 0x8e, 0x8e, 0x22, 0x25, 0xe5, 0x16, 0xbc, 0xa9, 0x08, 0x3e,
+	0x99, 0x73, 0xd7, 0xe9, 0xf7, 0xe2, 0x8b, 0x99, 0x2d, 0x93, 0xe6, 0x8d, 0xf6, 0x0b, 0x03, 0x6a,
+	0xca, 0xb9, 0xef, 0x4f, 0x02, 0x72, 0x1f, 0x76, 0xe2, 0xab, 0x69, 0x26, 0xf7, 0xba, 0x37, 0x4b,
+	0x8b, 0x78, 0x99, 0x8b, 0x6a, 0x34, 0xb1, 0xa1, 0xb1, 0x18, 0x55, 0x15, 0x62, 0xd2, 0x9c, 0x8d,
+	0x58, 0xb0, 0xab, 0xce, 0xfd, 0x9e, 0x65, 0xaa, 0xcf, 0xe9, 0x91, 0xdc, 0x00, 0xd0, 0x5a, 0xf1,
+	0x99, 0x87, 0xd6, 0xf6, 0x91, 0xd1, 0xaa, 0xd1, 0x9a, 0xb2, 0x9c, 0x31, 0x0f, 0xc9, 0x21, 0x54,
+	0x23, 0x64, 0x22, 0xf0, 0xad, 0x1d, 0xf5, 0x29, 0x39, 0xd9, 0x3f, 0x1b, 0x70, 0x58, 0xac, 0xfc,
+	0x2a, 0xcd, 0xb8, 0xaf, 0x9d, 0x30, 0xee, 0x83, 0xd9, 0xaa, 0x77, 0x6f, 0xb4, 0x97, 0xc5, 0xda,
+	0xce, 0xa8, 0xa2, 0x09, 0xd8, 0xfe, 0xa3, 0x02, 0x07, 0xba, 0xc6, 0xf8, 0x53, 0x4a, 0x7e, 0x91,
+	0x11, 0xa3, 0x84, 0x91, 0x7c, 0xdd, 0x95, 0x62, 0xdd, 0x6b, 0x09, 0x73, 0x98, 0x64, 0xc3, 0x90,
+	0xc9, 0x99, 0xb0, 0xb6, 0x8f, 0xcc, 0xd8, 0x31, 0xb6, 0x0c, 0x62, 0x43, 0xac, 0x2a, 0x79, 0x11,
+	0x62, 0xaa, 0xaa, 0x1d, 0x55, 0xcd, 0x71, 0x29, 0x05, 0xdf, 0xe0, 0xc5, 0xb7, 0xcc, 0x9d, 0xe3,
+	0x80, 0xf1, 0x88, 0x42, 0xec, 0xa5, 0x55, 0x45, 0x7a, 0xc9, 0xfd, 0xd3, 0x20, 0xd5, 0x4d, 0x83,
+	0xd4, 0x95, 0x5b, 0xa2, 0x4d, 0x0f, 0xc8, 0x22, 0x35, 0x57, 0xe9, 0xce, 0x06, 0x12, 0xb3, 0xff,
+	0x34, 0xe0, 0xed, 0xb3, 0x40, 0xf2, 0xc9, 0xc5, 0x72, 0x43, 0xfe, 0xad, 0xa4, 0xa4, 0x05, 0xfb,
+	0x9a, 0xa9, 0x09, 0x77, 0x31, 0x69, 0x89, 0xa9, 0x5a, 0xb2, 0xa7, 0xec, 0x5f, 0x73, 0x17, 0x75,
+	0x5f, 0x0e, 0xa1, 0xea, 0x07, 0x0e, 0xf6, 0x7b, 0x4a, 0xe3, 0x26, 0x4d, 0x4e, 0xf6, 0x57, 0x60,
+	0xa5, 0x3a, 0xce, 0xc0, 0x97, 0x1b, 0xe2, 0xdf, 0x0d, 0x38, 0xc8, 0xf9, 0xab, 0x61, 0xfe, 0xff,
+	0x4b, 0x8e, 0x2f, 0xf6, 0x4e, 0x49, 0x6d, 0x57, 0x11, 0x42, 0x0f, 0x60, 0x21, 0xad, 0x1e, 0xd5,
+	0x0f, 0x56, 0x8e, 0xea, 0x22, 0x21, 0xb4, 0x36, 0xc9, 0x2e, 0xf6, 0x6b, 0x25, 0x59, 0x7b, 0x8f,
+	0x50, 0xb2, 0x8d, 0xa6, 0x35, 0x5b, 0x8d, 0x95, 0x4b, 0xad, 0xc6, 0x9b, 0x50, 0x9f, 0x30, 0xee,
+	0x0e, 0x93, 0x15, 0x66, 0xaa, 0x29, 0x87, 0xd8, 0x44, 0x95, 0x85, 0x7c, 0x0e, 0x66, 0x84, 0xe7,
+	0x4a, 0x12, 0x2b, 0x0a, 0x59, 0x12, 0x33, 0x8d, 0x3d, 0x4a, 0xbb, 0xb0, 0x53, 0x2a, 0xbc, 0x63,
+	0x68, 0x78, 0x2c, 0x7a, 0x3a, 0x74, 0xd0, 0x45, 0x89, 0x8e, 0x55, 0x3d, 0x32, 0x5a, 0x6f, 0xd0,
+	0x7a, 0x6c, 0xeb, 0x69, 0x93, 0x7d, 0x1b, 0xf6, 0x7b, 0x51, 0x10, 0xe6, 0x46, 0x66, 0x61, 0x01,
+	0x19, 0xb9, 0x05, 0xd4, 0x7d, 0xb1, 0x0b, 0x0d, 0x5d, 0xaa, 0x7e, 0xdd, 0x49, 0x08, 0xe4, 0x14,
+	0xe5, 0xc3, 0xc0, 0x0b, 0x03, 0x1f, 0x7d, 0xa9, 0xd7, 0x31, 0xb9, 0xbb, 0xe2, 0x25, 0x5b, 0x86,
+	0x26, 0x29, 0x9b, 0x1f, 0xae, 0xf0, 0x28, 0xc0, 0xed, 0x2d, 0xe2, 0xa9, 0x8c, 0x4f, 0xb8, 0x87,
+	0x4f, 0xf8, 0xf8, 0xe9, 0xc3, 0x19, 0xf3, 0x7d, 0x74, 0xd7, 0x65, 0x2c, 0x40, 0xd3, 0x8c, 0xef,
+	0xe7, 0x3d, 0x92, 0xc3, 0x63, 0x19, 0x71, 0x7f, 0x9a, 0x0a, 0xd5, 0xde, 0x22, 0xe7, 0x70, 0xfd,
+	0x14, 0x55, 0x76, 0x2e, 0x24, 0x1f, 0x8b, 0x34, 0x61, 0x77, 0x75, 0xc2, 0x25, 0xf0, 0x25, 0x53,
+	0x8e, 0xa1, 0xb1, 0xf8, 0x4f, 0x83, 0x7c, 0x54, 0xa6, 0x8d, 0x92, 0x7f, 0x43, 0xcd, 0xd6, 0xab,
+	0x81, 0x59, 0x92, 0xef, 0x01, 0x5e, 0xca, 0x8b, 0x6c, 0x26, 0xbf, 0xe5, 0x2e, 0x15, 0x61, 0x59,
+	0x78, 0x0e, 0x7b, 0xf9, 0x27, 0x9a, 0x7c, 0x5c, 0xe6, 0x5b, 0xfa, 0x07, 0xa6, 0xf9, 0xc9, 0x26,
+	0xd0, 0x2c, 0x55, 0x04, 0x07, 0x4b, 0x9b, 0x86, 0xdc, 0x5e, 0x17, 0xa2, 0xb8, 0x6c, 0x9b, 0x77,
+	0x36, 0x44, 0x67, 0x39, 0x7f, 0x80, 0xfd, 0xe2, 0x7b, 0x43, 0x3e, 0x2d, 0x0b, 0xb2, 0xe2, 0x55,
+	0x6a, 0xae, 0xdb, 0x78, 0xf6, 0x16, 0x19, 0x40, 0x2d, 0x9b, 0x4a, 0x72, 0xab, 0x2c, 0x70, 0x71,
+	0x68, 0x5f, 0x11, 0xb1, 0xfb, 0xcb, 0x76, 0xb2, 0xf7, 0x94, 0xa4, 0x5e, 0x8f, 0xed, 0x3f, 0x3f,
+	0xb6, 0xf4, 0xef, 0x4c, 0xd4, 0x7f, 0xad, 0x83, 0x93, 0x07, 0xdf, 0x7d, 0x39, 0xe5, 0x72, 0x36,
+	0x1f, 0xc5, 0x5f, 0x3a, 0xcf, 0xb9, 0xeb, 0xf2, 0xe7, 0x12, 0xc7, 0xb3, 0x8e, 0xf6, 0xba, 0xe3,
+	0x70, 0x21, 0x23, 0x3e, 0x9a, 0x4b, 0x74, 0x3a, 0x29, 0x3b, 0x1d, 0x15, 0xaa, 0xa3, 0x12, 0x86,
+	0xa3, 0x51, 0x55, 0x1d, 0xef, 0xfd, 0x15, 0x00, 0x00, 0xff, 0xff, 0x46, 0x91, 0x9a, 0xd3, 0xe9,
+	0x0d, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/scripts/start.sh b/scripts/start.sh
index 1bc2c1d432..93d629017b 100755
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -22,9 +22,6 @@ echo "starting querynode1"
 export QUERY_NODE_ID=1
 nohup ./bin/querynode > ~/querynode1.out 2>&1 &
 
-echo "starting querynode2"
-export QUERY_NODE_ID=2
-nohup ./bin/querynode > ~/querynode2.out 2>&1 &
 
 echo "starting indexservice"
 nohup ./bin/indexservice > ~/indexservice.out 2>&1 &