Commit c9f9181a authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 385d813a
...@@ -44,7 +44,7 @@ runtime/HACKING.md ...@@ -44,7 +44,7 @@ runtime/HACKING.md
-> go-slab -> 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: e.g. having r as io.ReadSeeker and converting it to io.Reader e.g. this way:
......
...@@ -94,8 +94,7 @@ EOF ...@@ -94,8 +94,7 @@ EOF
pushd src/lab.nexedi.com/kirr 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 test -d neo || git clone -o kirr -b t https://lab.nexedi.com/kirr/neo.git neo # XXX t is temp
cd neo cd neo
pip install -e . pip install -e .[admin,client,ctl,master,storage-sqlite,storage-mysqldb]
pip install mysqlclient # XXX better ^^^ `pip install .` pick this up
popd popd
go get -v lab.nexedi.com/kirr/neo/go/... go get -v lab.nexedi.com/kirr/neo/go/...
...@@ -314,7 +313,7 @@ datadir = $neosql/data ...@@ -314,7 +313,7 @@ datadir = $neosql/data
log_error = $log/mdb.log log_error = $log/mdb.log
# the following comes from # 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< ---- # ---- 8< ----
# kirr: disabled # kirr: disabled
......
...@@ -42,6 +42,7 @@ import ( ...@@ -42,6 +42,7 @@ import (
"lab.nexedi.com/kirr/neo/go/zodb" "lab.nexedi.com/kirr/neo/go/zodb"
_ "lab.nexedi.com/kirr/neo/go/zodb/wks" _ "lab.nexedi.com/kirr/neo/go/zodb/wks"
"github.com/pkg/errors"
"github.com/pkg/profile" "github.com/pkg/profile"
) )
...@@ -173,14 +174,14 @@ loop: ...@@ -173,14 +174,14 @@ loop:
prefetchBlk(ctx, xid) prefetchBlk(ctx, xid)
} }
buf, _, err := stor.Load(ctx, xid) buf, _, err := stor.Load(ctx, xid)
switch err.(type) { if err != nil {
case nil: switch errors.Cause(err).(type) {
// ok case *zodb.NoObjectError:
case *zodb.ErrOidMissing:
break loop break loop
default: default:
return err return err
} }
}
h.Write(buf.Data) 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