Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
wendelin.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Kirill Smelkov
wendelin.core
Commits
7649e798
Commit
7649e798
authored
Jul 15, 2021
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
9c90d3f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
15 deletions
+52
-15
wcfs/internal/zdata/δftail.go
wcfs/internal/zdata/δftail.go
+24
-7
wcfs/wcfs.go
wcfs/wcfs.go
+28
-8
No files found.
wcfs/internal/zdata/δftail.go
View file @
7649e798
...
...
@@ -305,6 +305,7 @@ func (δFtail *ΔFtail) Update(δZ *zodb.EventCommit) (_ ΔF, err error) {
}
if
δ
!=
nil
{
// XXX rebuild first
δzfile
[
oid
]
=
δ
δftail
.
vδE
=
append
(
δftail
.
vδE
,
_ΔFileEpoch
{
Rev
:
δZ
.
Tid
,
...
...
@@ -390,6 +391,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
xtail
.
AssertSlice
(
δFtail
,
lo
,
hi
)
// XXX locking
// XXX rebuild
// query .δBtail.SliceByRootRev(file.blktab, lo, hi) +
// merge δZBlk history with that.
...
...
@@ -409,11 +411,6 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
// δFile ────────o───────o──────x─────x────────────────────────
δftail
:=
δFtail
.
byFile
[
zfile
.
POid
()]
root
:=
δftail
.
root
// XXX take epochs into account
vδT
:=
δFtail
.
δBtail
.
SliceByRootRev
(
root
,
lo
,
δFtail
.
Head
())
// NOTE @head, not hi
vδZ
:=
δFtail
.
δBtail
.
ΔZtail
()
.
SliceByRev
(
lo
,
hi
)
var
vδf
[]
*
ΔFile
// vδfTail returns or creates vδf entry for revision tail
// tail must be <= all vδf revisions
...
...
@@ -433,6 +430,18 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
return
δfTail
}
δftail
:=
δFtail
.
byFile
[
zfile
.
POid
()]
vδE
:=
δftail
.
vδE
ie
:=
len
(
vδE
)
-
1
_
=
ie
vδZ
:=
δFtail
.
δBtail
.
ΔZtail
()
.
SliceByRev
(
lo
,
hi
)
iz
:=
len
(
vδZ
)
-
1
root
:=
δftail
.
root
// XXX take epochs into account
vδT
:=
δFtail
.
δBtail
.
SliceByRootRev
(
root
,
lo
,
δFtail
.
Head
())
// NOTE @head, not hi
// state of Zinblk as we are scanning ←
// initially corresponds to @head = vδT[-1]
...
...
@@ -451,8 +460,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
ZinblkAt
=
lo
}
iz
:=
len
(
vδZ
)
-
1
for
(
iz
>=
0
||
it
>=
0
)
{
for
(
iz
>=
0
||
it
>=
0
)
{
// XXX + ie
// δZ that is covered by current Zinblk
// -> update δf
if
iz
>=
0
{
...
...
@@ -531,6 +539,9 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
func
(
δFtail
*
ΔFtail
)
LastBlkRev
(
ctx
context
.
Context
,
zf
*
ZBigFile
,
blk
int64
,
at
zodb
.
Tid
)
(
_
zodb
.
Tid
,
exact
bool
)
{
//defer xerr.Contextf(&err, "") // XXX text
//δftail := δFtail.byFile[zf.POid()]
//root := δftail.root // XXX handle epochs
err
:=
zf
.
PActivate
(
ctx
)
if
err
!=
nil
{
panic
(
err
)
// XXX
...
...
@@ -538,14 +549,20 @@ func (δFtail *ΔFtail) LastBlkRev(ctx context.Context, zf *ZBigFile, blk int64,
defer
zf
.
PDeactivate
()
// XXX take epochs into account
epoch
:=
zodb
.
Tid
(
0
)
// XXX stub
// XXX tabRev -> treeRev ?
//zblkOid, ok, tabRev, tabRevExact, err := δFtail.δBtail.GetAt(ctx, root, blk, at)
zblkOid
,
ok
,
tabRev
,
tabRevExact
,
err
:=
δFtail
.
δBtail
.
GetAt
(
ctx
,
zf
.
blktab
,
blk
,
at
)
//fmt.Printf("GetAt #%d @%s -> %s, %v, @%s, %v\n", blk, at, zblkOid, ok, tabRev, tabRevExact)
if
err
!=
nil
{
panic
(
err
)
// XXX
}
if
tabRev
<
epoch
{
tabRev
=
epoch
}
// block was removed
// XXX or not in tracked set?
if
!
ok
{
...
...
wcfs/wcfs.go
View file @
7649e798
...
...
@@ -901,9 +901,14 @@ retry:
file
:=
bfdir
.
fileTab
[
foid
]
if
δfile
.
Epoch
{
wg
.
Go
(
func
(
ctx
context
.
Context
)
error
{
return
file
.
invalidateAll
()
// NOTE does not accept ctx
})
// XXX while invalidating whole file at epoch is easy,
// it becomes not so easy to handle isolation if epochs
// could be present. For this reason we forbid changes
// to ZBigFile objects for now.
return
fmt
.
Errorf
(
"ZBigFile<%s> changed @%s"
,
foid
,
δF
.
Rev
)
// wg.Go(func(ctx context.Context) error {
// return file.invalidateAll() // NOTE does not accept ctx
// })
}
else
{
for
blk
:=
range
δfile
.
Blocks
{
blk
:=
blk
...
...
@@ -1313,7 +1318,7 @@ func (f *BigFile) readBlk(ctx context.Context, blk int64, dest []byte) (err erro
// and thus would trigger DB access again.
//
// TODO if direct-io: don't touch pagecache
// TODO upload parts only not covered by curr
r
ent read (not to e.g. wait for page lock)
// TODO upload parts only not covered by current read (not to e.g. wait for page lock)
// TODO skip upload completely if read is wide to cover whole blksize
go
f
.
uploadBlk
(
blk
,
loading
)
...
...
@@ -1703,7 +1708,7 @@ func (wlink *WatchLink) setupWatch(ctx context.Context, foid zodb.Oid, at zodb.T
// rlocked during pin setup.
//
// δ δ
//
----x----.------------]----x----
//
────x────.────────────]────x────
// ↑ ↑
// w.at head
//
...
...
@@ -1722,6 +1727,21 @@ func (wlink *WatchLink) setupWatch(ctx context.Context, foid zodb.Oid, at zodb.T
δFtail
:=
bfdir
.
δFtail
for
_
,
δfile
:=
range
δFtail
.
SliceByFileRev
(
f
.
zfile
,
at
,
headAt
)
{
// XXX locking δFtail
if
δfile
.
Epoch
{
// file epochs are currently forbidden (see watcher), so the only
// case when we could see an epoch here is creation of
// the file if w.at is before that time:
//
// create file
// ────.────────x────────]────
// ↑ ↑
// w.at head
//
// but then the file should not be normally accessed in that case.
//
// -> reject such watches with an error
return
fmt
.
Errorf
(
"file epoch detected @%s in between (at,head=@%s]"
,
δfile
.
Rev
,
headAt
)
}
for
blk
:=
range
δfile
.
Blocks
{
_
,
already
:=
toPin
[
blk
]
if
already
{
...
...
@@ -1736,7 +1756,7 @@ func (wlink *WatchLink) setupWatch(ctx context.Context, foid zodb.Oid, at zodb.T
// XXX adjust wcfs tests to not require only accessed
// blocks to be in setup pins? But that would mean that
// potentially more blocks would be potentially
// _unnec
c
essarily_ pinned if they are not going to be
// _unnecessarily_ pinned if they are not going to be
// accessed at all.
if
!
f
.
accessed
.
Has
(
blk
)
{
continue
...
...
@@ -2110,7 +2130,7 @@ func (root *Root) lookup(name string, fctx *fuse.Context) (_ *Head, err error) {
root
.
revMu
.
Unlock
()
if
already
{
// XXX race wrt sim
lu
taneous "FORGET @<rev>" ?
// XXX race wrt sim
ul
taneous "FORGET @<rev>" ?
return
revDir
,
nil
}
...
...
@@ -2555,7 +2575,7 @@ func _main() (err error) {
}
// wait for unmount
// XXX the kernel does not sen
t
d FORGETs on unmount - release left node resources ourselves?
// XXX the kernel does not send FORGETs on unmount - release left node resources ourselves?
<-
serveCtx
.
Done
()
log
.
Infof
(
"stop %q %q"
,
mntpt
,
zurl
)
return
nil
// XXX serveErr | zwatchErr ?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment