Commit 8f62953d authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent a54b4f4c
...@@ -161,10 +161,7 @@ error _Conn::close() { ...@@ -161,10 +161,7 @@ error _Conn::close() {
// _pinner receives pin messages from wcfs and adjusts wconn mappings. // _pinner receives pin messages from wcfs and adjusts wconn mappings.
error _Conn::_pinner(context::Context ctx) { error _Conn::_pinner(context::Context ctx) {
_Conn& wconn = *this; _Conn& wconn = *this;
xerr::Contextf E("pinner"); // NOTE pinner error goes to Conn::close who has its own context
error err = wconn.__pinner(ctx); error err = wconn.__pinner(ctx);
err = E(err);
// if pinner fails, wcfs will kill us. // if pinner fails, wcfs will kill us.
// log pinner error so the error is not hidden. // log pinner error so the error is not hidden.
...@@ -190,6 +187,7 @@ error _Conn::_pinner(context::Context ctx) { ...@@ -190,6 +187,7 @@ error _Conn::_pinner(context::Context ctx) {
error _Conn::__pinner(context::Context ctx) { error _Conn::__pinner(context::Context ctx) {
_Conn& wconn = *this; _Conn& wconn = *this;
xerr::Contextf E("pinner"); // NOTE pinner error goes to Conn::close who has its own context
PinReq req; PinReq req;
error err; error err;
...@@ -203,13 +201,13 @@ error _Conn::__pinner(context::Context ctx) { ...@@ -203,13 +201,13 @@ error _Conn::__pinner(context::Context ctx) {
err = (wconn._downErr == errConnClosed) ? nil : io::ErrUnexpectedEOF; err = (wconn._downErr == errConnClosed) ? nil : io::ErrUnexpectedEOF;
wconn._downMu.unlock(); wconn._downMu.unlock();
} }
return err; return E(err);
} }
// we received request to pin/unpin file block. handle it // we received request to pin/unpin file block. handle it
err = wconn._pin1(&req); err = wconn._pin1(&req);
if (err != nil) { if (err != nil) {
return err; return E(err);
} }
} }
} }
......
...@@ -168,7 +168,7 @@ public: ...@@ -168,7 +168,7 @@ public:
} // xerr:: } // xerr::
// golang::log:: TODO -> pygolang // golang::log:: XXX -> pygolang ?
namespace golang { namespace golang {
namespace log { namespace log {
......
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