diff options
| author | Sage Weil <sage@inktank.com> | 2012-07-30 16:24:21 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-07-30 18:15:29 -0700 |
| commit | 3a140a0d5c4b9e35373b016e41dfc85f1e526bdb (patch) | |
| tree | e145ddbb09f0493fa60c98406f6b84f36b94fb95 /net/ceph | |
| parent | 546f04ef716dd49521774653d8b032a7d64c05d9 (diff) | |
| download | linux-3a140a0d5c4b9e35373b016e41dfc85f1e526bdb.tar.bz2 | |
libceph: report socket read/write error message
We need to set error_msg to something useful before calling ceph_fault();
do so here for try_{read,write}(). This is more informative than
libceph: osd0 192.168.106.220:6801 (null)
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/messenger.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 63e1252d3af5..6e2f67816f61 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2287,14 +2287,18 @@ restart: ret = try_read(con); if (ret == -EAGAIN) goto restart; - if (ret < 0) + if (ret < 0) { + con->error_msg = "socket error on read"; goto fault; + } ret = try_write(con); if (ret == -EAGAIN) goto restart; - if (ret < 0) + if (ret < 0) { + con->error_msg = "socket error on write"; goto fault; + } done: mutex_unlock(&con->mutex); |