Commit 374d89ad authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent f447d0d1
...@@ -120,7 +120,7 @@ def join(zurl, autostart=_default_autostart()): ...@@ -120,7 +120,7 @@ def join(zurl, autostart=_default_autostart()):
raise RuntimeError("wcfs: join %s: server not started" % zurl) raise RuntimeError("wcfs: join %s: server not started" % zurl)
# start wcfs with telling it to automatically exit when there is no client activity. # start wcfs with telling it to automatically exit when there is no client activity.
return _start(zurl, "-autoexit", '-d') return _start(zurl, "-autoexit", '-d', '-alsologtostderr')
# _start starts wcfs server for ZODB @ zurl. # _start starts wcfs server for ZODB @ zurl.
......
...@@ -444,6 +444,7 @@ func (bfroot *BigFileRoot) Mkdir(name string, mode uint32, fctx *fuse.Context) ( ...@@ -444,6 +444,7 @@ func (bfroot *BigFileRoot) Mkdir(name string, mode uint32, fctx *fuse.Context) (
bfdata := &BigFileData{ bfdata := &BigFileData{
Node: nodefs.NewDefaultNode(), Node: nodefs.NewDefaultNode(),
bigfile: bf, bigfile: bf,
loading: make(map[int64]*blkLoadState),
} }
bfhead.data = bfdata bfhead.data = bfdata
...@@ -587,7 +588,7 @@ func (bfdata *BigFileData) readBlk(ctx context.Context, blk int64, dest []byte) ...@@ -587,7 +588,7 @@ func (bfdata *BigFileData) readBlk(ctx context.Context, blk int64, dest []byte)
// XXX locking - invalidation must make sure this workers are finished. // XXX locking - invalidation must make sure this workers are finished.
// XXX if direct-io: don't touch pagecache // XXX if direct-io: don't touch pagecache
st := gfsconn.FileNotifyStoreCache(bfdata.Inode(), blk*blksize, blkdata) st := gfsconn.FileNotifyStoreCache(bfdata.Inode(), blk*zbf.blksize, blkdata)
bfdata.loadMu.Lock() bfdata.loadMu.Lock()
delete(bfdata.loading, blk) delete(bfdata.loading, blk)
...@@ -653,7 +654,7 @@ var gfsconn *nodefs.FileSystemConnector ...@@ -653,7 +654,7 @@ var gfsconn *nodefs.FileSystemConnector
func main() { func main() {
stdlog.SetPrefix("wcfs: ") stdlog.SetPrefix("wcfs: ")
log.CopyStandardLogTo("WARNING") // XXX -> "DEBUG" if -d ? //log.CopyStandardLogTo("WARNING") // XXX -> "DEBUG" if -d ?
defer log.Flush() defer log.Flush()
debug := flag.Bool("d", false, "debug") debug := flag.Bool("d", false, "debug")
......
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