Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kartik-579 merged 3 commits into from
May 26, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
948e785
exposed grpc service config
kartik-579 May 26, 2025
53f4b45
updated lock position for git-sensor.UpdateRepo
kartik-579 May 26, 2025
92902b3
added env var category
kartik-579 May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions common-lib/utils/grpc/GrpcConfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
15 changes: 8 additions & 7 deletions git-sensor/pkg/RepoManages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down