Revert "Add index correction internal logic (#2194)"

This reverts commit 001f741.
vdaas · Nov 30, 2023 · be7faa1 · be7faa1
1 parent 7474fcf
commit be7faa1
Show file tree

Hide file tree

Showing 22 changed files with 10 additions and 3,103 deletions.
diff --git a/.github/workflows/dockers-index-correction.yml b/.github/workflows/dockers-index-correction.yml
diff --git a/.golangci.yml b/.golangci.yml
@@ -51,6 +51,7 @@ linters:
     - gochecknoinits
     - goconst
     - godot
+    - godox
     - gofumpt
     - goimports
     - gomnd
@@ -98,7 +99,6 @@ linters:
     # - gocognit
     # - gocritic
     # - gocyclo
-    # - godox
     # - goerr113
     # - gofmt
     # - goheader

diff --git a/Makefile b/Makefile
@@ -30,7 +30,6 @@ FILTER_GATEWAY_IMAGE            = $(NAME)-filter-gateway
 HELM_OPERATOR_IMAGE             = $(NAME)-helm-operator
 LB_GATEWAY_IMAGE                = $(NAME)-lb-gateway
 LOADTEST_IMAGE                  = $(NAME)-loadtest
-INDEX_CORRECTION_IMAGE      	= $(NAME)-index-correction
 MANAGER_INDEX_IMAGE             = $(NAME)-manager-index
 MAINTAINER                      = "$(ORG).org $(NAME) team <$(NAME)@$(ORG).org>"
 

diff --git a/Makefile.d/build.mk b/Makefile.d/build.mk
@@ -206,35 +206,6 @@ cmd/manager/index/index: \
 		$(dir $@)main.go
 	$@ -version
 
-cmd/index/job/correction/index-correction: \
-	$(GO_SOURCES_INTERNAL) \
-	$(PBGOS) \
-	$(shell find $(ROOTDIR)/cmd/index/job/correction/correction -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \
-	$(shell find $(ROOTDIR)/pkg/index/job/correction -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go')
-	$(eval CGO_ENABLED = 0)
-	CGO_ENABLED=$(CGO_ENABLED) \
-	GO111MODULE=on \
-	GOPRIVATE=$(GOPRIVATE) \
-	go build \
-		--ldflags "-w -extldflags=-static \
-		-X '$(GOPKG)/internal/info.Version=$(VERSION)' \
-		-X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \
-		-X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \
-		-X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \
-		-X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \
-		-X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \
-		-X '$(GOPKG)/internal/info.CGOEnabled=$(CGO_ENABLED)' \
-		-X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \
-		-buildid=" \
-		-mod=readonly \
-		-modcacherw \
-		-a \
-		-tags "osusergo netgo static_build" \
-		-trimpath \
-		-o $@ \
-		$(dir $@)main.go
-	$@ -version
-
 .PHONY: binary/build/zip
 ## build all binaries and zip them
 binary/build/zip: \

diff --git a/Makefile.d/docker.mk b/Makefile.d/docker.mk
@@ -188,17 +188,3 @@ docker/build/loadtest:
 	    -t $(ORG)/$(LOADTEST_IMAGE):$(TAG) . \
 	    --build-arg MAINTAINER=$(MAINTAINER) \
 	    --build-arg GO_VERSION=$(GO_VERSION)
-
-.PHONY: docker/name/index-correction
-docker/name/index-correction:
-	@echo "$(ORG)/$(INDEX_CORRECTION_IMAGE)"
-
-.PHONY: docker/build/index-correction
-## build index-correction image
-docker/build/index-correction:
-	$(DOCKER) build \
-	    $(DOCKER_OPTS) \
-	    -f dockers/index/job/correction/Dockerfile \
-	    -t $(ORG)/$(INDEX_CORRECTION_IMAGE):$(TAG) . \
-	    --build-arg MAINTAINER=$(MAINTAINER) \
-	    --build-arg GO_VERSION=$(GO_VERSION)
diff --git a/charts/vald/values.yaml b/charts/vald/values.yaml
@@ -2631,38 +2631,3 @@ manager:
             net:
               dialer:
                 keepalive: 15m #indexer fetches uncommitted index length, which includes huge payload so we need to set keepalive longer than usual
-    # @schema {"name": "manager.index.corrector", "type": "object"}
-    corrector:
-      # @schema {"name": "manager.index.corrector.enabled", "type": "boolean"}
-      # manager.index.corrector.enabled -- enable index correction CronJob
-      enabled: false
-      # @schema {"name": "manager.index.corrector.check_duration", "type": "string"}
-      # manager.index.corrector.enabled -- check duration of index correction CronJob
-      check_duration: 24h
-      # @schema {"name": "manager.index.corrector.stream_list_concurrency", "type": "integer", "minimum": 1}
-      # manager.index.corrector.stream_list_concurrency -- concurrency for stream list object rpc
-      stream_list_concurrency: 200
-      # @schema {"name": "manager.index.corrector.bbolt_async_write_concurrency", "type": "integer", "minimum": 1}
-      # manager.index.corrector.bbolt_async_write_concurrency -- concurrency for bbolt async write
-      bbolt_async_write_concurrency: 2048
-      # @schema {"name": "manager.index.corrector.agent_namespace", "type": "string"}
-      # manager.index.corrector.agent_namespace -- namespace of agent pods to manage
-      agent_namespace: _MY_POD_NAMESPACE_
-      # @schema {"name": "manager.index.corrector.node_name", "type": "string"}
-      # manager.index.corrector.node_name -- node name
-      node_name: "" # _MY_NODE_NAME_
-      # @schema {"name": "manager.index.corrector.discoverer", "type": "object"}
-      discoverer:
-        # @schema {"name": "manager.index.corrector.discoverer.duration", "type": "string"}
-        # manager.index.corrector.discoverer.duration -- refresh duration to discover
-        duration: 500ms
-        # @schema {"name": "manager.index.corrector.discoverer.client", "alias": "grpc.client"}
-        # manager.index.corrector.discoverer.client -- gRPC client for discoverer (overrides defaults.grpc.client)
-        client: {}
-        # @schema {"name": "manager.index.corrector.discoverer.agent_client_options", "alias": "grpc.client"}
-        # manager.index.corrector.discoverer.agent_client_options -- gRPC client options for agents (overrides defaults.grpc.client)
-        agent_client_options:
-          dial_option:
-            net:
-              dialer:
-                keepalive: 15m #indexer fetches uncommitted index length, which includes huge payload so we need to set keepalive longer than usual
diff --git a/cmd/index/job/correction/main.go b/cmd/index/job/correction/main.go