LU-10143 osd-zfs: allocate sequence in advance

on the controller, so that we have it ready before any potential
read-only makeup. this is what osd-ldiskfs is doing already.

Change-Id: I3d27f112b0d013ac923c5d250b296b5528b8112d
Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/34069
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Lai Siyao <lai.siyao@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index dec2abf..c7d890b 100644 (file)
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -1521,6 +1521,16 @@ static int osd_fid_init(const struct lu_env *env, struct osd_device *osd)
                osd->od_cl_seq = NULL;
        }
 
+       if (ss->ss_node_id == 0) {
+               /*
+                * If the OSD on the sequence controller(MDT0), then allocate
+                * sequence here, otherwise allocate sequence after connected
+                * to MDT0 (see mdt_register_lwp_callback()).
+                */
+               rc = seq_server_alloc_meta(osd->od_cl_seq->lcs_srv,
+                                  &osd->od_cl_seq->lcs_space, env);
+       }
+
        RETURN(rc);
 }
 

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 8b3810c..232ba70 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -31,10 +31,10 @@ ALWAYS_EXCEPT="$REPLAY_SINGLE_EXCEPT "
 if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then
 # bug number for skipped test: LU-11388
        ALWAYS_EXCEPT+="131b"
-       if [ $MDSCOUNT -gt 1 ]; then
-# bug number for skipped test:   LU-10740 LU-11330 LU-9157 LU-11336
-               ALWAYS_EXCEPT+=" 2d       70d      80c     80d"
-       fi
+       if [ $MDSCOUNT -gt 1 ]; then
+# bug number for skipped test:   LU-11330
+               ALWAYS_EXCEPT+="  70d"
+       fi
 fi
 if $SHARED_KEY; then
 # bug number for skipped tests: LU-9795 (all below)