On Wed, Sep 16, 2020 at 4:16 AM Xiubo Li <xiubli@xxxxxxxxxx> wrote:
>
> On 2020/9/16 4:33, Ilya Dryomov wrote:
> > Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>
> > ---
> > Documentation/filesystems/ceph.rst | 6 +++---
> > drivers/block/rbd.c | 8 ++++----
> > fs/ceph/addr.c | 24 ++++++++++++------------
> > fs/ceph/file.c | 4 ++--
> > fs/ceph/mds_client.c | 16 ++++++++--------
> > fs/ceph/super.c | 4 ++--
> > fs/ceph/super.h | 4 ++--
> > include/linux/ceph/mon_client.h | 2 +-
> > include/linux/ceph/rados.h | 2 +-
> > net/ceph/mon_client.c | 8 ++++----
> > 10 files changed, 39 insertions(+), 39 deletions(-)
> >
> > diff --git a/Documentation/filesystems/ceph.rst b/Documentation/filesystems/ceph.rst
> > index 0aa70750df0f..7d2ef4e27273 100644
> > --- a/Documentation/filesystems/ceph.rst
> > +++ b/Documentation/filesystems/ceph.rst
> > @@ -163,14 +163,14 @@ Mount Options
> > to the default VFS implementation if this option is used.
> >
> > recover_session=<no|clean>
> > - Set auto reconnect mode in the case where the client is blacklisted. The
> > + Set auto reconnect mode in the case where the client is blocklisted. The
> > available modes are "no" and "clean". The default is "no".
> >
> > * no: never attempt to reconnect when client detects that it has been
> > - blacklisted. Operations will generally fail after being blacklisted.
> > + blocklisted. Operations will generally fail after being blocklisted.
> >
> > * clean: client reconnects to the ceph cluster automatically when it
> > - detects that it has been blacklisted. During reconnect, client drops
> > + detects that it has been blocklisted. During reconnect, client drops
> > dirty data/metadata, invalidates page caches and writable file handles.
> > After reconnect, file locks become stale because the MDS loses track
> > of them. If an inode contains any stale file locks, read/write on the
> > diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> > index 180587ce606c..d21fecfe3eba 100644
> > --- a/drivers/block/rbd.c
> > +++ b/drivers/block/rbd.c
> > @@ -4010,10 +4010,10 @@ static int rbd_try_lock(struct rbd_device *rbd_dev)
> > rbd_warn(rbd_dev, "breaking header lock owned by %s%llu",
> > ENTITY_NAME(lockers[0].id.name));
> >
> > - ret = ceph_monc_blacklist_add(&client->monc,
> > + ret = ceph_monc_blocklist_add(&client->monc,
> > &lockers[0].info.addr);
> > if (ret) {
> > - rbd_warn(rbd_dev, "blacklist of %s%llu failed: %d",
> > + rbd_warn(rbd_dev, "blocklist of %s%llu failed: %d",
> > ENTITY_NAME(lockers[0].id.name), ret);
> > goto out;
> > }
> > @@ -4077,7 +4077,7 @@ static int rbd_try_acquire_lock(struct rbd_device *rbd_dev)
> > ret = rbd_try_lock(rbd_dev);
> > if (ret < 0) {
> > rbd_warn(rbd_dev, "failed to lock header: %d", ret);
> > - if (ret == -EBLACKLISTED)
> > + if (ret == -EBLOCKLISTED)
> > goto out;
> >
> > ret = 1; /* request lock anyway */
> > @@ -4613,7 +4613,7 @@ static void rbd_reregister_watch(struct work_struct *work)
> > ret = __rbd_register_watch(rbd_dev);
> > if (ret) {
> > rbd_warn(rbd_dev, "failed to reregister watch: %d", ret);
> > - if (ret != -EBLACKLISTED && ret != -ENOENT) {
> > + if (ret != -EBLOCKLISTED && ret != -ENOENT) {
> > queue_delayed_work(rbd_dev->task_wq,
> > &rbd_dev->watch_dwork,
> > RBD_RETRY_DELAY);
> > diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
> > index b03dbaa9d345..7b1f3dad576f 100644
> > --- a/fs/ceph/addr.c
> > +++ b/fs/ceph/addr.c
> > @@ -271,8 +271,8 @@ static int ceph_do_readpage(struct file *filp, struct page *page)
> > if (err < 0) {
> > SetPageError(page);
> > ceph_fscache_readpage_cancel(inode, page);
> > - if (err == -EBLACKLISTED)
> > - fsc->blacklisted = true;
> > + if (err == -EBLOCKLISTED)
> > + fsc->blocklisted = true;
> > goto out;
> > }
> > if (err < PAGE_SIZE)
> > @@ -312,8 +312,8 @@ static void finish_read(struct ceph_osd_request *req)
> > int i;
> >
> > dout("finish_read %p req %p rc %d bytes %d\n", inode, req, rc, bytes);
> > - if (rc == -EBLACKLISTED)
> > - ceph_inode_to_client(inode)->blacklisted = true;
> > + if (rc == -EBLOCKLISTED)
> > + ceph_inode_to_client(inode)->blocklisted = true;
> >
> > /* unlock all pages, zeroing any data we didn't read */
> > osd_data = osd_req_op_extent_osd_data(req, 0);
> > @@ -737,8 +737,8 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc)
> > end_page_writeback(page);
> > return err;
> > }
> > - if (err == -EBLACKLISTED)
> > - fsc->blacklisted = true;
> > + if (err == -EBLOCKLISTED)
> > + fsc->blocklisted = true;
> > dout("writepage setting page/mapping error %d %p\n",
> > err, page);
> > mapping_set_error(&inode->i_data, err);
> > @@ -801,8 +801,8 @@ static void writepages_finish(struct ceph_osd_request *req)
> > if (rc < 0) {
> > mapping_set_error(mapping, rc);
> > ceph_set_error_write(ci);
> > - if (rc == -EBLACKLISTED)
> > - fsc->blacklisted = true;
> > + if (rc == -EBLOCKLISTED)
> > + fsc->blocklisted = true;
> > } else {
> > ceph_clear_error_write(ci);
> > }
> > @@ -2038,16 +2038,16 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci,
> > if (err >= 0 || err == -ENOENT)
> > have |= POOL_READ;
> > else if (err != -EPERM) {
> > - if (err == -EBLACKLISTED)
> > - fsc->blacklisted = true;
> > + if (err == -EBLOCKLISTED)
> > + fsc->blocklisted = true;
> > goto out_unlock;
> > }
> >
> > if (err2 == 0 || err2 == -EEXIST)
> > have |= POOL_WRITE;
> > else if (err2 != -EPERM) {
> > - if (err2 == -EBLACKLISTED)
> > - fsc->blacklisted = true;
> > + if (err2 == -EBLOCKLISTED)
> > + fsc->blocklisted = true;
> > err = err2;
> > goto out_unlock;
> > }
> > diff --git a/fs/ceph/file.c b/fs/ceph/file.c
> > index 762a280b7037..209535d5b8d3 100644
> > --- a/fs/ceph/file.c
> > +++ b/fs/ceph/file.c
> > @@ -933,8 +933,8 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to,
> > ceph_release_page_vector(pages, num_pages);
> >
> > if (ret < 0) {
> > - if (ret == -EBLACKLISTED)
> > - fsc->blacklisted = true;
> > + if (ret == -EBLOCKLISTED)
> > + fsc->blocklisted = true;
> > break;
> > }
> >
> > diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
> > index 76d8d9495d1d..bb2d938a17ac 100644
> > --- a/fs/ceph/mds_client.c
> > +++ b/fs/ceph/mds_client.c
> > @@ -3303,7 +3303,7 @@ static void handle_forward(struct ceph_mds_client *mdsc,
> > }
> >
> > static int __decode_session_metadata(void **p, void *end,
> > - bool *blacklisted)
> > + bool *blocklisted)
> > {
> > /* map<string,string> */
> > u32 n;
> > @@ -3318,7 +3318,7 @@ static int __decode_session_metadata(void **p, void *end,
> > ceph_decode_32_safe(p, end, len, bad);
> > ceph_decode_need(p, end, len, bad);
> > if (err_str && strnstr(*p, "blacklisted", len))
>
> BTW, for new MDS shouldn't we check "blocklisted" first ? And then
> "blacklisted" ?
>
> https://github.com/ceph/ceph/blob/master/src/mds/Server.cc#L617
We could, but it would be fixed in a better way by [1], see [2] for
context.
[1] https://tracker.ceph.com/issues/47450
[2] https://github.com/ceph/ceph/pull/37072
Thanks,
Ilya
