Merge pull request #281 from devtron-labs/kubelink-grpc-service-config-expose

fix: git sensor update repo lock after update status fix and kubelink grpc service config expose

Author: kartik-579

common-lib/utils/grpc/GrpcConfig.go

@@ -2,9 +2,11 @@ package grpc
 
 import "github.com/caarlos0/env"
 
+// CATEGORY=INFRA_SETUP
 type Configuration struct {
-	KubelinkMaxRecvMsgSize int `env:"KUBELINK_GRPC_MAX_RECEIVE_MSG_SIZE" envDefault:"20"` // In mb
-	KubelinkMaxSendMsgSize int `env:"KUBELINK_GRPC_MAX_SEND_MSG_SIZE" envDefault:"4"`     // In mb
+	KubelinkMaxRecvMsgSize    int    `env:"KUBELINK_GRPC_MAX_RECEIVE_MSG_SIZE" envDefault:"20"` // In mb
+	KubelinkMaxSendMsgSize    int    `env:"KUBELINK_GRPC_MAX_SEND_MSG_SIZE" envDefault:"4"`     // In mb
+	KubelinkGRPCServiceConfig string `env:"KUBELINK_GRPC_SERVICE_CONFIG" envDefault:"{\"loadBalancingPolicy\":\"round_robin\"}" description:"kubelink grpc service config"`
 }
 
 func GetConfiguration() (*Configuration, error) {

git-sensor/pkg/RepoManages.go

@@ -288,6 +288,14 @@ func (impl RepoManagerImpl) backupGitMaterialBeforeUpdate(existingMaterial *sql.
 
 func (impl RepoManagerImpl) UpdateRepo(gitCtx git.GitContext, material *sql.GitMaterial) (*sql.GitMaterial, error) {
 	updateInitiatedTime := time.Now()
+
+	repoLock := impl.locker.LeaseLocker(material.Id)
+	repoLock.Mutex.Lock()
+	defer func() {
+		repoLock.Mutex.Unlock()
+		impl.locker.ReturnLocker(material.Id)
+	}()
+
 	existingMaterial, err := impl.materialRepository.FindById(material.Id)
 	if err != nil {
 		impl.logger.Errorw("error in fetching material", "material", material, "timeTaken", time.Since(updateInitiatedTime), "err", err)
@@ -314,13 +322,6 @@ func (impl RepoManagerImpl) UpdateRepo(gitCtx git.GitContext, material *sql.GitM
 		return nil, err
 	}
 
-	repoLock := impl.locker.LeaseLocker(material.Id)
-	repoLock.Mutex.Lock()
-	defer func() {
-		repoLock.Mutex.Unlock()
-		impl.locker.ReturnLocker(material.Id)
-	}()
-
 	err = impl.repositoryManager.Clean(existingMaterial.CheckoutLocation)
 	if err != nil {
 		impl.logger.Errorw("error in refreshing material", "dir", existingMaterial.CheckoutLocation, "timeTaken", time.Since(updateInitiatedTime), "err", err)