mirrors/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-04-27 14:10:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

tpl/partials: Fix recently introduced deadlock in partials cache

Browse source 
The change in lock logic for `partialCached` in  0927cf739f was naive as it didn't consider cached partials calling other cached partials.

This changeset may look on the large side for this particular issue, but it pulls in part of a working branch, introducing `context.Context` in the template execution.

Note that the context is only partially implemented in this PR, but the upcoming use cases will, as one example, include having access to the top "dot" (e.g. `Page`) all the way down into partials and shortcodes etc.

The earlier benchmarks rerun against master:

```bash
name              old time/op    new time/op    delta
IncludeCached-10    13.6ms ± 2%    13.8ms ± 1%    ~     (p=0.343 n=4+4)

name              old alloc/op   new alloc/op   delta
IncludeCached-10    5.30MB ± 0%    5.35MB ± 0%  +0.96%  (p=0.029 n=4+4)

name              old allocs/op  new allocs/op  delta
IncludeCached-10     74.7k ± 0%     75.3k ± 0%  +0.77%  (p=0.029 n=4+4)
```

Fixes #9519
This commit is contained in:
Bjørn Erik Pedersen 2022-02-17 16:51:19 +01:00
parent 667f3a4ba8
commit 929808190f
9 changed files with 207 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tpl/tplimpl/template_funcs_test.go
View file

@ -15,6 +15,7 @@ package tplimpl
import (
"bytes"
"context"
"fmt"
"path/filepath"
"reflect"
@ -145,8 +146,7 @@ func TestPartialCached(t *testing.T) {
partial := `Now: {{ now.UnixNano }}`
name := "testing"
var data struct {
}
var data struct{}
v := newTestConfig()
@ -168,19 +168,19 @@ func TestPartialCached(t *testing.T) {
ns := partials.New(de)
res1, err := ns.IncludeCached(name, &data)
res1, err := ns.IncludeCached(context.Background(), name, &data)
c.Assert(err, qt.IsNil)
for j := 0; j < 10; j++ {
time.Sleep(2 * time.Nanosecond)
res2, err := ns.IncludeCached(name, &data)
res2, err := ns.IncludeCached(context.Background(), name, &data)
c.Assert(err, qt.IsNil)
if !reflect.DeepEqual(res1, res2) {
t.Fatalf("cache mismatch")
}
res3, err := ns.IncludeCached(name, &data, fmt.Sprintf("variant%d", j))
res3, err := ns.IncludeCached(context.Background(), name, &data, fmt.Sprintf("variant%d", j))
c.Assert(err, qt.IsNil)
if reflect.DeepEqual(res1, res3) {
@ -191,14 +191,14 @@ func TestPartialCached(t *testing.T) {
func BenchmarkPartial(b *testing.B) {
doBenchmarkPartial(b, func(ns *partials.Namespace) error {
_, err := ns.Include("bench1")
_, err := ns.Include(context.Background(), "bench1")
return err
})
}
func BenchmarkPartialCached(b *testing.B) {
doBenchmarkPartial(b, func(ns *partials.Namespace) error {
_, err := ns.IncludeCached("bench1", nil)
_, err := ns.IncludeCached(context.Background(), "bench1", nil)
return err
})
}