Commit c9f9181a authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 385d813a
......@@ -44,7 +44,7 @@ runtime/HACKING.md
-> go-slab
- interfaces conversion in hot codepaths are costly:
- interfaces conversion in very hot codepaths are costly:
e.g. having r as io.ReadSeeker and converting it to io.Reader e.g. this way:
......
......@@ -94,8 +94,7 @@ EOF
pushd src/lab.nexedi.com/kirr
test -d neo || git clone -o kirr -b t https://lab.nexedi.com/kirr/neo.git neo # XXX t is temp
cd neo
pip install -e .
pip install mysqlclient # XXX better ^^^ `pip install .` pick this up
pip install -e .[admin,client,ctl,master,storage-sqlite,storage-mysqldb]
popd
go get -v lab.nexedi.com/kirr/neo/go/...
......@@ -314,7 +313,7 @@ datadir = $neosql/data
log_error = $log/mdb.log
# the following comes from
# https://lab.nexedi.com/nexedi/slapos/blob/master/software/neoppod/my.cnf.in#L18
# https://lab.nexedi.com/nexedi/slapos/blob/bd197876/software/neoppod/my.cnf.in#L18
# ---- 8< ----
# kirr: disabled
......
......@@ -42,6 +42,7 @@ import (
"lab.nexedi.com/kirr/neo/go/zodb"
_ "lab.nexedi.com/kirr/neo/go/zodb/wks"
"github.com/pkg/errors"
"github.com/pkg/profile"
)
......@@ -173,13 +174,13 @@ loop:
prefetchBlk(ctx, xid)
}
buf, _, err := stor.Load(ctx, xid)
switch err.(type) {
case nil:
// ok
case *zodb.ErrOidMissing:
break loop
default:
return err
if err != nil {
switch errors.Cause(err).(type) {
case *zodb.NoObjectError:
break loop
default:
return err
}
}
h.Write(buf.Data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment