.

wcfs/internal/wcfs.cpp

@@ -52,6 +52,7 @@
 #include <wendelin/bigfile/virtmem.h>
 #include <wendelin/bigfile/ram.h>
 
+#include <golang/errors.h>
 #include <golang/fmt.h>
 
 #include <algorithm>
@@ -102,6 +103,9 @@ pair<Conn, error> WCFS::connect(zodb::Tid at) {
     return make_pair(wconn, nil);
 }
 
+
+static global<error> errConnClosed = errors::New("connection closed");
+
 // close releases resources associated with wconn.
 //
 // opened fileh and mappings becomes invalid to use.
@@ -118,12 +122,16 @@ error _Conn::close() {
             eret = err;
     };
 
+    wconn._downMu.lock();
+    wconn._downErr = errConnClosed; // XXX ok to change even if it was !nil before?
+    wconn._downMu.unlock();
+
     err = wconn._wlink->close();
     if (err != nil)
         reterr1(err);
     wconn._pinCancel();
     err = wconn._pinWG->wait();
-    if (err != context::canceled)  // canceled - ok
+    if (err != context::canceled)  // canceled - ok     XXX check ok?
         reterr1(err);
 
     // close all files - both that have no mappings and that still have opened mappings.
@@ -152,6 +160,20 @@ error _Conn::close() {
 
 // _pinner receives pin messages from wcfs and adjusts wconn mappings.
 error _Conn::_pinner(context::Context ctx) {
+    _Conn& wconn = *this;
+    error err = wconn.__pinner(ctx);
+
+    // mark the connection non-operational if the pinner fails
+    wconn._downMu.lock();
+    if (wconn._downErr == nil)
+        wconn._downErr = fmt::errorf("no longer operational due to: %s", v(err));
+    wconn._downMu.unlock();
+
+    return err;
+
+}
+
+error _Conn::__pinner(context::Context ctx) {
     _Conn& wconn = *this;
     xerr::Contextf E("pinner"); // NOTE pinner error goes to Conn::close who has its own context
 
@@ -177,8 +199,13 @@ error _Conn::_pinner(context::Context ctx) {
     while (1) {
         err = wconn._wlink->recvReq(ctx, &req);
         if (err != nil) {
-            // XXX -> err, handle EOF, abort on *
-            return E(err); // XXX ok? (EOF - when wcfs closes wlink)
+            // it is ok if we receive EOF due to us closing the connection
+            if (err == io::EOF_) {
+                wconn._downMu.lock();
+                err = (wconn._downErr == errConnClosed) ? nil : io::ErrUnexpectedEOF;
+                wconn._downMu.unlock();
+            }
+            return E(err);
         }
 
         // we received request to pin/unpin file block. handle it
@@ -273,6 +300,9 @@ pair<FileH, error> _Conn::open(zodb::Oid foid) {
         wconn._filehmu.unlock();
     });
 
+    if (wconn._downErr != nil)
+        return make_pair(nil, E(wconn._downErr));
+
     FileH f; bool ok;
     tie(f, ok) = wconn._filehtab.get(foid);
     if (f != nil) {
@@ -395,6 +425,9 @@ error _Conn::resync(zodb::Tid at) {
 
     // XXX locking
 
+    if (wconn._downErr != nil)      // XXX lock with _filehmu
+        return E(wconn._downErr);
+
     for (auto fit : wconn._filehtab) {
         zodb::Oid  foid = fit.first;
         FileH      f    = fit.second;

wcfs/internal/wcfs.h

@@ -104,6 +104,9 @@ struct _Conn : object {
     zodb::Tid   at;
     WatchLink   _wlink; // watch/receive pins for mappings created under this conn
 
+    sync::Mutex _downMu;
+    error       _downErr; // !nil if connection is closed or no longer operational
+
     sync::Mutex             _filehmu;
     dict<zodb::Oid, FileH>  _filehtab; // {} foid -> fileh
 
@@ -125,6 +128,7 @@ public:
 
 private:
     error _pinner(context::Context ctx);
+    error __pinner(context::Context ctx);
     error _pin1(PinReq *req);
     error __pin1(PinReq *req);
 };
@@ -139,7 +143,7 @@ private:
 typedef refptr<struct _FileH> FileH;
 struct _FileH : object {
     Conn        wconn;
-    zodb::Oid   foid;	    // ZBigFile root object ID
+    zodb::Oid   foid;       // ZBigFile root object ID
     size_t      blksize;    // block size of this file  XXX -> off_t ?
     os::File    _headf;     // file object of head/file
     off_t       _headfsize; // head/file size is known to be at least headfsize (size ↑=)

wcfs/internal/wcfs_watchlink.cpp

@@ -311,7 +311,7 @@ tuple</*rxq*/chan<rxPkt>, error> _WatchLink::_sendReq(context::Context ctx, cons
 
 // replyReq sends reply to client <- server request received by recvReq.
 //
-// XXX document EOF.
+// XXX document EOF. XXX -> no EOF here - only ErrUnexpectedEOF
 error _WatchLink::replyReq(context::Context ctx, const PinReq *req, const string& answer) {
     _WatchLink *wlink = this;
     xerr::Contextf E("wlink X: replyReq");  // XXX +wlink details
@@ -339,6 +339,8 @@ error _WatchLink::replyReq(context::Context ctx, const PinReq *req, const string
 }
 
 // recvReq receives client <- server request.
+//
+// it returns EOF when server closes the link.
 static error _parsePinReq(PinReq *pin, const rxPkt *pkt);
 error _WatchLink::recvReq(context::Context ctx, PinReq *prx) {
     _WatchLink& wlink = *this;

wcfs/wcfs_test.py

@@ -1821,6 +1821,9 @@ def test_wcfs_virtmem():
 
     # XXX fh close then open again and use
 
+    # XXX wconn.open()      after wconn.close() -> error
+    # XXX wconn.resync()    after wconn.close() -> error
+
 
 
 # ---- misc ---