oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-08-11 17:50:58 +00:00
Code Wiki Activity

fix: move reading cache to separate function

Browse source
This commit is contained in:
Kwonunn 2025-03-24 10:48:28 +01:00
parent 639b83c26c
commit 835a9d2068
1 changed files with 25 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

60
act/artifactcache/handler.go
View file

@ -260,16 +260,10 @@ func (h *Handler) upload(w http.ResponseWriter, r *http.Request, params httprout
return return
} }
cache := &Cache{} cache, err := h.readCache(id)
db, err := h.openDB()
if err != nil { if err != nil {
h.responseJSON(w, r, 500, fmt.Errorf("cache openDB: %w", err))
return
}
defer db.Close()
if err := db.Get(id, cache); err != nil {
if errors.Is(err, bolthold.ErrNotFound) { if errors.Is(err, bolthold.ErrNotFound) {
h.responseJSON(w, r, 400, fmt.Errorf("cache %d: not reserved", id)) h.responseJSON(w, r, 404, fmt.Errorf("cache %d: not reserved", id))
return return
} }
h.responseJSON(w, r, 500, fmt.Errorf("cache Get: %w", err)) h.responseJSON(w, r, 500, fmt.Errorf("cache Get: %w", err))
@ -286,7 +280,6 @@ func (h *Handler) upload(w http.ResponseWriter, r *http.Request, params httprout
h.responseJSON(w, r, 400, fmt.Errorf("cache %v %q: already complete", cache.ID, cache.Key)) h.responseJSON(w, r, 400, fmt.Errorf("cache %v %q: already complete", cache.ID, cache.Key))
return return
} }
db.Close()
start, _, err := parseContentRange(r.Header.Get("Content-Range")) start, _, err := parseContentRange(r.Header.Get("Content-Range"))
if err != nil { if err != nil {
h.responseJSON(w, r, 400, fmt.Errorf("cache parseContentRange(%s): %w", r.Header.Get("Content-Range"), err)) h.responseJSON(w, r, 400, fmt.Errorf("cache parseContentRange(%s): %w", r.Header.Get("Content-Range"), err))
@ -318,19 +311,13 @@ func (h *Handler) commit(w http.ResponseWriter, r *http.Request, params httprout
return return
} }
cache := &Cache{} cache, err := h.readCache(id)
db, err := h.openDB()
if err != nil { if err != nil {
h.responseJSON(w, r, 500, err)
return
}
defer db.Close()
if err := db.Get(id, cache); err != nil {
if errors.Is(err, bolthold.ErrNotFound) { if errors.Is(err, bolthold.ErrNotFound) {
h.responseJSON(w, r, 400, fmt.Errorf("cache %d: not reserved", id)) h.responseJSON(w, r, 404, fmt.Errorf("cache %d: not reserved", id))
return return
} }
h.responseJSON(w, r, 500, err) h.responseJSON(w, r, 500, fmt.Errorf("cache Get: %w", err))
return return
} }
@ -345,8 +332,6 @@ func (h *Handler) commit(w http.ResponseWriter, r *http.Request, params httprout
return return
} }
db.Close()
size, err := h.storage.Commit(cache.ID, cache.Size) size, err := h.storage.Commit(cache.ID, cache.Size)
if err != nil { if err != nil {
h.responseJSON(w, r, 500, err) h.responseJSON(w, r, 500, err)
@ -355,7 +340,7 @@ func (h *Handler) commit(w http.ResponseWriter, r *http.Request, params httprout
// write real size back to cache, it may be different from the current value when the request doesn't specify it. // write real size back to cache, it may be different from the current value when the request doesn't specify it.
cache.Size = size cache.Size = size
db, err = h.openDB() db, err := h.openDB()
if err != nil { if err != nil {
h.responseJSON(w, r, 500, err) h.responseJSON(w, r, 500, err)
return return
@ -386,22 +371,14 @@ func (h *Handler) get(w http.ResponseWriter, r *http.Request, params httprouter.
return return
} }
cache := &Cache{} cache, err := h.readCache(id)
{ if err != nil {
db, err := h.openDB() if errors.Is(err, bolthold.ErrNotFound) {
if err != nil { h.responseJSON(w, r, 404, fmt.Errorf("cache %d: not reserved", id))
h.responseJSON(w, r, 500, fmt.Errorf("cache openDB: %w", err))
return
}
defer db.Close()
if err := db.Get(id, cache); err != nil {
if errors.Is(err, bolthold.ErrNotFound) {
h.responseJSON(w, r, 404, fmt.Errorf("cache %d: not reserved", id))
return
}
h.responseJSON(w, r, 500, fmt.Errorf("cache Get: %w", err))
return return
} }
h.responseJSON(w, r, 500, fmt.Errorf("cache Get: %w", err))
return
} }
// Should not happen // Should not happen
@ -487,6 +464,19 @@ func insertCache(db *bolthold.Store, cache *Cache) error {
return nil return nil
} }
func (h *Handler) readCache(id uint64) (*Cache, error) {
db, err := h.openDB()
if err != nil {
return nil, err
}
defer db.Close()
cache := &Cache{}
if err := db.Get(id, cache); err != nil {
return nil, err
}
return cache, nil
}
func (h *Handler) useCache(id uint64) error { func (h *Handler) useCache(id uint64) error {
db, err := h.openDB() db, err := h.openDB()
if err != nil { if err != nil {