Skip to content
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

Jump to bottom

fix(repo-server): excess git request when using multi-source and ref sources (Issue #14725) #16309

Closed
wants to merge 5 commits into from
Closed

fix(repo-server): excess git request when using multi-source and ref sources (Issue #14725) #16309

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e6e3a5a
fix: ref and multi-source git cache logic
nromriell Nov 12, 2023
39745d0
chore: add unit testing for repo server getRefs, cleanup, fixes
nromriell Nov 13, 2023
617ae72
chore: finish up tests, fixes, cleanup
nromriell Nov 13, 2023
aafad63
chore: lint fixes
nromriell Nov 13, 2023
33808ec
feat: move to two level cache, reconfigure cache interface to provide…
nromriell Nov 19, 2023
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
4 changes: 2 additions & 2 deletions cmd/argocd/commands/headless/headless.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ func (c *forwardCacheClient) Set(item *cache.Item) error {
})
}

func (c *forwardCacheClient) Get(key string, obj interface{}) error {
func (c *forwardCacheClient) Get(item *cache.Item) error {
return c.doLazy(func(client cache.CacheClient) error {
return client.Get(key, obj)
return client.Get(item)
})
}

Expand Down
18 changes: 0 additions & 18 deletions manifests/base/repo-server/argocd-repo-server-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,24 +90,6 @@ spec:
name: argocd-cmd-params-cm
key: reposerver.repo.cache.expiration
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_WAIT_ENABLED
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.enabled
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_TIMEOUT
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.timeout
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_WAIT_INTERVAL
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.interval
name: argocd-cmd-params-cm
optional: true
- name: REDIS_SERVER
valueFrom:
configMapKeyRef:
Expand Down
18 changes: 0 additions & 18 deletions manifests/core-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21232,24 +21232,6 @@ spec:
key: reposerver.repo.cache.expiration
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_WAIT_ENABLED
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.enabled
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_TIMEOUT
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.timeout
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_WAIT_INTERVAL
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.interval
name: argocd-cmd-params-cm
optional: true
- name: REDIS_SERVER
valueFrom:
configMapKeyRef:
Expand Down
18 changes: 0 additions & 18 deletions manifests/ha/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22719,24 +22719,6 @@ spec:
key: reposerver.repo.cache.expiration
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_WAIT_ENABLED
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.enabled
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_TIMEOUT
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.timeout
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_WAIT_INTERVAL
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.interval
name: argocd-cmd-params-cm
optional: true
- name: REDIS_SERVER
valueFrom:
configMapKeyRef:
Expand Down
18 changes: 0 additions & 18 deletions manifests/ha/namespace-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2106,24 +2106,6 @@ spec:
key: reposerver.repo.cache.expiration
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_WAIT_ENABLED
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.enabled
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_TIMEOUT
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.timeout
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_WAIT_INTERVAL
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.interval
name: argocd-cmd-params-cm
optional: true
- name: REDIS_SERVER
valueFrom:
configMapKeyRef:
Expand Down
18 changes: 0 additions & 18 deletions manifests/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21765,24 +21765,6 @@ spec:
key: reposerver.repo.cache.expiration
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_WAIT_ENABLED
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.enabled
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_TIMEOUT
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.timeout
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_WAIT_INTERVAL
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.interval
name: argocd-cmd-params-cm
optional: true
- name: REDIS_SERVER
valueFrom:
configMapKeyRef:
Expand Down
18 changes: 0 additions & 18 deletions manifests/namespace-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,24 +1152,6 @@ spec:
key: reposerver.repo.cache.expiration
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_WAIT_ENABLED
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.enabled
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_TIMEOUT
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.timeout
name: argocd-cmd-params-cm
optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_WAIT_INTERVAL
valueFrom:
configMapKeyRef:
key: reposerver.repo.cache.lock.interval
name: argocd-cmd-params-cm
optional: true
- name: REDIS_SERVER
valueFrom:
configMapKeyRef:
Expand Down
Loading
Loading