Whamcloud - gitweb
LU-13402 target: never exclude MDT/OST from last_rcvd 38/38138/6
authorAlex Zhuravlev <bzzz@whamcloud.com>
Mon, 6 Apr 2020 09:32:18 +0000 (12:32 +0300)
committerOleg Drokin <green@whamcloud.com>
Fri, 1 May 2020 04:26:12 +0000 (04:26 +0000)
as it's supposed to be a mandatory part of recovery process

Fixes: 8bd04b4e5766 ("LU-12722 target: disable recovery for local clients")
Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Change-Id: I5a41c500df04dc9eeecd3b94f69e4d2722e63410
Reviewed-on: https://review.whamcloud.com/38138
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
lustre/target/tgt_lastrcvd.c

index 97f76d3..8961215 100644 (file)
@@ -951,14 +951,15 @@ static int tgt_is_local_client(const struct lu_env *env,
        struct tgt_session_info *tsi = tgt_ses_info(env);
        struct ptlrpc_request   *req = tgt_ses_req(tsi);
 
        struct tgt_session_info *tsi = tgt_ses_info(env);
        struct ptlrpc_request   *req = tgt_ses_req(tsi);
 
+       if (exp_connect_flags(exp) & OBD_CONNECT_MDS ||
+           exp_connect_flags(exp) & OBD_CONNECT_MDS_MDS)
+               return 0;
        if (tgt->lut_local_recovery)
                return 0;
        if (!req)
                return 0;
        if (!LNetIsPeerLocal(req->rq_peer.nid))
                return 0;
        if (tgt->lut_local_recovery)
                return 0;
        if (!req)
                return 0;
        if (!LNetIsPeerLocal(req->rq_peer.nid))
                return 0;
-       if (exp_connect_flags(exp) & OBD_CONNECT_MDS)
-               return 0;
 
        return 1;
 }
 
        return 1;
 }