[LU-129] quotacheck fails when an OST is permanently deactivated

• Status: Resolved
• Project: Lustre
• Affects Version/s: Lustre 1.8.6
• Fix Version/s: Lustre 1.8.6
• Type: Bug
• Priority: Blocker
• Reporter: Johann Lombardi (Inactive)
• Assignee: Niu Yawei (Inactive)
• Resolution: Fixed
• Severity: 3
• Bugzilla ID: 24,488

Description

The patch from bugzilla ticket 21174 helped to support sparse OSTs indexes by skipping holes in lov->lov_tgts[i].
However, it is still not sufficient for permanently deactivated OSTs which have lov_tgts[i]->ltd_active = 0 and imp->imp_deactive = 1.
Checking for lov->lov_tgts[i]->ltd_activate should do the trick. A new regression test would also be welcomed.

Comments

[Build Master (Inactive)]

Integrated in reviews-centos5 #531
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 1efe8f344f7a215a709f0cc4640287458ec2d7c2
Files :

• lustre/tests/conf-sanity.sh
• lustre/quota/quota_ctl.c
• lustre/quota/quota_check.c

[Build Master (Inactive)]

Integrated in reviews-centos5 #563
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 25b4cbf2c6bc72b87b85f935e3492c9d9c4ba449
Files :

• lustre/quota/quota_ctl.c
• lustre/include/obd.h
• lustre/osc/osc_request.c
• lustre/lov/lov_obd.c
• lustre/tests/conf-sanity.sh
• lustre/ptlrpc/recover.c
• lustre/quota/quota_check.c
• lustre/include/lustre_import.h

[Build Master (Inactive)]

Integrated in reviews-centos5 #589
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : c3d9233d74be37001f26a141b305c4b6aeb683a3
Files :

• lustre/quota/quota_check.c
• lustre/tests/conf-sanity.sh
• lustre/lov/lov_obd.c
• lustre/ptlrpc/recover.c
• lustre/quota/quota_ctl.c
• lustre/osc/osc_request.c
• lustre/include/lustre_import.h
• lustre/include/obd.h

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el5 #13
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : c3d9233d74be37001f26a141b305c4b6aeb683a3
Files :

• lustre/include/lustre_import.h
• lustre/osc/osc_request.c
• lustre/ptlrpc/recover.c
• lustre/lov/lov_obd.c
• lustre/quota/quota_ctl.c
• lustre/tests/conf-sanity.sh
• lustre/include/obd.h
• lustre/quota/quota_check.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el5 #13
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : c3d9233d74be37001f26a141b305c4b6aeb683a3
Files :

• lustre/osc/osc_request.c
• lustre/ptlrpc/recover.c
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_check.c
• lustre/include/lustre_import.h
• lustre/include/obd.h
• lustre/quota/quota_ctl.c
• lustre/lov/lov_obd.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el6 #13
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : c3d9233d74be37001f26a141b305c4b6aeb683a3
Files :

• lustre/lov/lov_obd.c
• lustre/quota/quota_check.c
• lustre/include/obd.h
• lustre/include/lustre_import.h
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_ctl.c
• lustre/ptlrpc/recover.c
• lustre/osc/osc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el6 #13
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : c3d9233d74be37001f26a141b305c4b6aeb683a3
Files :

• lustre/osc/osc_request.c
• lustre/include/lustre_import.h
• lustre/lov/lov_obd.c
• lustre/quota/quota_check.c
• lustre/include/obd.h
• lustre/quota/quota_ctl.c
• lustre/ptlrpc/recover.c
• lustre/tests/conf-sanity.sh

[Build Master (Inactive)]

Integrated in lustre-reviews » client,ubuntu #13
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : c3d9233d74be37001f26a141b305c4b6aeb683a3
Files :

• lustre/ptlrpc/recover.c
• lustre/quota/quota_ctl.c
• lustre/osc/osc_request.c
• lustre/lov/lov_obd.c
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_check.c
• lustre/include/obd.h
• lustre/include/lustre_import.h

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el5 #33
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : c3d9233d74be37001f26a141b305c4b6aeb683a3
Files :

• lustre/lov/lov_obd.c
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_ctl.c
• lustre/quota/quota_check.c
• lustre/include/lustre_import.h
• lustre/ptlrpc/recover.c
• lustre/osc/osc_request.c
• lustre/include/obd.h

[Build Master (Inactive)]

Integrated in lustre-reviews » client,ubuntu #33
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : c3d9233d74be37001f26a141b305c4b6aeb683a3
Files :

• lustre/osc/osc_request.c
• lustre/quota/quota_ctl.c
• lustre/ptlrpc/recover.c
• lustre/include/lustre_import.h
• lustre/lov/lov_obd.c
• lustre/include/obd.h
• lustre/quota/quota_check.c
• lustre/tests/conf-sanity.sh

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el6 #33
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : c3d9233d74be37001f26a141b305c4b6aeb683a3
Files :

• lustre/include/lustre_import.h
• lustre/tests/conf-sanity.sh
• lustre/include/obd.h
• lustre/ptlrpc/recover.c
• lustre/quota/quota_ctl.c
• lustre/quota/quota_check.c
• lustre/osc/osc_request.c
• lustre/lov/lov_obd.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el5 #33
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : c3d9233d74be37001f26a141b305c4b6aeb683a3
Files :

• lustre/quota/quota_check.c
• lustre/ptlrpc/recover.c
• lustre/include/lustre_import.h
• lustre/tests/conf-sanity.sh
• lustre/lov/lov_obd.c
• lustre/include/obd.h
• lustre/osc/osc_request.c
• lustre/quota/quota_ctl.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el6 #33
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : c3d9233d74be37001f26a141b305c4b6aeb683a3
Files :

• lustre/lov/lov_obd.c
• lustre/include/lustre_import.h
• lustre/quota/quota_check.c
• lustre/osc/osc_request.c
• lustre/tests/conf-sanity.sh
• lustre/ptlrpc/recover.c
• lustre/quota/quota_ctl.c
• lustre/include/obd.h

[Peter Jones]

Niu

Now that you have all the necessary inspections could you please open a bz ticket to push this fix upstream to Oracle? Also, does this fix need landing on master too?

Thanks

Peter

[Niu Yawei (Inactive)]

Ok, I've open a ticket b24488 for it, it needs be landed on master too, will push the master patch for review soon.

[Build Master (Inactive)]

Integrated in reviews-centos5 #628
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : bd6534d3df85582e54336e0bd8ca765247b1f785
Files :

• lustre/include/obd.h
• lustre/ptlrpc/recover.c
• lustre/quota/quota_ctl.c
• lustre/osc/osc_request.c
• lustre/tests/conf-sanity.sh
• lustre/lov/lov_obd.c
• lustre/quota/quota_check.c
• lustre/include/lustre_import.h

[Peter Jones]

Patch landed upstream by Oracle for 1.8.6. Keeping ticket open for now to track landing to master

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el6-x86_64 #95
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : fe85e91cdb3afef039575fa72a57eb7c8c7aaf32
Files :

• lustre/ptlrpc/recover.c
• lustre/quota/quota_check.c
• lustre/lov/lov_obd.c
• lustre/include/obd.h
• lustre/mdc/mdc_request.c
• lustre/include/lustre_import.h
• lustre/quota/quota_ctl.c
• lustre/osc/osc_request.c
• lustre/mgc/mgc_request.c
• lustre/tests/conf-sanity.sh

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el6-i686 #95
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : fe85e91cdb3afef039575fa72a57eb7c8c7aaf32
Files :

• lustre/quota/quota_ctl.c
• lustre/osc/osc_request.c
• lustre/mgc/mgc_request.c
• lustre/include/obd.h
• lustre/ptlrpc/recover.c
• lustre/quota/quota_check.c
• lustre/include/lustre_import.h
• lustre/tests/conf-sanity.sh
• lustre/mdc/mdc_request.c
• lustre/lov/lov_obd.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el6-i686 #95
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : fe85e91cdb3afef039575fa72a57eb7c8c7aaf32
Files :

• lustre/lov/lov_obd.c
• lustre/tests/conf-sanity.sh
• lustre/include/obd.h
• lustre/quota/quota_check.c
• lustre/osc/osc_request.c
• lustre/include/lustre_import.h
• lustre/mdc/mdc_request.c
• lustre/ptlrpc/recover.c
• lustre/mgc/mgc_request.c
• lustre/quota/quota_ctl.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,ubuntu-x86_64 #95
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : fe85e91cdb3afef039575fa72a57eb7c8c7aaf32
Files :

• lustre/quota/quota_check.c
• lustre/include/lustre_import.h
• lustre/ptlrpc/recover.c
• lustre/osc/osc_request.c
• lustre/include/obd.h
• lustre/tests/conf-sanity.sh
• lustre/mgc/mgc_request.c
• lustre/mdc/mdc_request.c
• lustre/lov/lov_obd.c
• lustre/quota/quota_ctl.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el5-x86_64 #95
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : fe85e91cdb3afef039575fa72a57eb7c8c7aaf32
Files :

• lustre/mdc/mdc_request.c
• lustre/include/obd.h
• lustre/include/lustre_import.h
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_ctl.c
• lustre/quota/quota_check.c
• lustre/osc/osc_request.c
• lustre/ptlrpc/recover.c
• lustre/mgc/mgc_request.c
• lustre/lov/lov_obd.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el5-i686 #95
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : fe85e91cdb3afef039575fa72a57eb7c8c7aaf32
Files :

• lustre/ptlrpc/recover.c
• lustre/include/lustre_import.h
• lustre/mgc/mgc_request.c
• lustre/mdc/mdc_request.c
• lustre/quota/quota_check.c
• lustre/include/obd.h
• lustre/quota/quota_ctl.c
• lustre/osc/osc_request.c
• lustre/tests/conf-sanity.sh
• lustre/lov/lov_obd.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el5-x86_64 #95
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : fe85e91cdb3afef039575fa72a57eb7c8c7aaf32
Files :

• lustre/quota/quota_check.c
• lustre/include/obd.h
• lustre/osc/osc_request.c
• lustre/ptlrpc/recover.c
• lustre/mdc/mdc_request.c
• lustre/mgc/mgc_request.c
• lustre/quota/quota_ctl.c
• lustre/lov/lov_obd.c
• lustre/include/lustre_import.h
• lustre/tests/conf-sanity.sh

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el5-i686 #95
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : fe85e91cdb3afef039575fa72a57eb7c8c7aaf32
Files :

• lustre/osc/osc_request.c
• lustre/mdc/mdc_request.c
• lustre/lov/lov_obd.c
• lustre/include/lustre_import.h
• lustre/quota/quota_check.c
• lustre/quota/quota_ctl.c
• lustre/mgc/mgc_request.c
• lustre/include/obd.h
• lustre/ptlrpc/recover.c
• lustre/tests/conf-sanity.sh

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el6-x86_64 #97
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 70f87a2b6fe2546232062b890bda9b6954e7dc4b
Files :

• lustre/quota/quota_ctl.c
• lustre/include/obd.h
• lustre/ptlrpc/recover.c
• lustre/osc/osc_request.c
• lustre/lov/lov_obd.c
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_check.c
• lustre/mdc/mdc_request.c
• lustre/include/lustre_import.h
• lustre/mgc/mgc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el6-i686 #97
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 70f87a2b6fe2546232062b890bda9b6954e7dc4b
Files :

• lustre/include/lustre_import.h
• lustre/osc/osc_request.c
• lustre/include/obd.h
• lustre/lov/lov_obd.c
• lustre/quota/quota_ctl.c
• lustre/mgc/mgc_request.c
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_check.c
• lustre/ptlrpc/recover.c
• lustre/mdc/mdc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el6-i686 #97
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 70f87a2b6fe2546232062b890bda9b6954e7dc4b
Files :

• lustre/quota/quota_ctl.c
• lustre/osc/osc_request.c
• lustre/mgc/mgc_request.c
• lustre/lov/lov_obd.c
• lustre/mdc/mdc_request.c
• lustre/quota/quota_check.c
• lustre/tests/conf-sanity.sh
• lustre/include/lustre_import.h
• lustre/ptlrpc/recover.c
• lustre/include/obd.h

[Build Master (Inactive)]

Integrated in lustre-reviews » client,ubuntu-x86_64 #97
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 70f87a2b6fe2546232062b890bda9b6954e7dc4b
Files :

• lustre/quota/quota_check.c
• lustre/osc/osc_request.c
• lustre/quota/quota_ctl.c
• lustre/mdc/mdc_request.c
• lustre/tests/conf-sanity.sh
• lustre/mgc/mgc_request.c
• lustre/include/lustre_import.h
• lustre/ptlrpc/recover.c
• lustre/lov/lov_obd.c
• lustre/include/obd.h

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el5-x86_64 #97
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 70f87a2b6fe2546232062b890bda9b6954e7dc4b
Files :

• lustre/quota/quota_ctl.c
• lustre/mgc/mgc_request.c
• lustre/tests/conf-sanity.sh
• lustre/include/obd.h
• lustre/osc/osc_request.c
• lustre/mdc/mdc_request.c
• lustre/include/lustre_import.h
• lustre/lov/lov_obd.c
• lustre/quota/quota_check.c
• lustre/ptlrpc/recover.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el5-i686 #97
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 70f87a2b6fe2546232062b890bda9b6954e7dc4b
Files :

• lustre/mgc/mgc_request.c
• lustre/include/obd.h
• lustre/lov/lov_obd.c
• lustre/mdc/mdc_request.c
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_check.c
• lustre/include/lustre_import.h
• lustre/ptlrpc/recover.c
• lustre/quota/quota_ctl.c
• lustre/osc/osc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el5-x86_64 #97
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 70f87a2b6fe2546232062b890bda9b6954e7dc4b
Files :

• lustre/tests/conf-sanity.sh
• lustre/quota/quota_ctl.c
• lustre/include/lustre_import.h
• lustre/quota/quota_check.c
• lustre/mgc/mgc_request.c
• lustre/lov/lov_obd.c
• lustre/include/obd.h
• lustre/osc/osc_request.c
• lustre/ptlrpc/recover.c
• lustre/mdc/mdc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el5-i686 #97
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 70f87a2b6fe2546232062b890bda9b6954e7dc4b
Files :

• lustre/include/lustre_import.h
• lustre/quota/quota_ctl.c
• lustre/mgc/mgc_request.c
• lustre/quota/quota_check.c
• lustre/osc/osc_request.c
• lustre/tests/conf-sanity.sh
• lustre/mdc/mdc_request.c
• lustre/ptlrpc/recover.c
• lustre/include/obd.h
• lustre/lov/lov_obd.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el5-x86_64 #109
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/mgc/mgc_request.c
• lustre/quota/quota_ctl.c
• lustre/quota/quota_check.c
• lustre/ptlrpc/recover.c
• lustre/tests/conf-sanity.sh
• lustre/lov/lov_obd.c
• lustre/include/obd.h
• lustre/include/lustre_import.h
• lustre/osc/osc_request.c
• lustre/mdc/mdc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el6-x86_64 #109
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/lov/lov_obd.c
• lustre/include/lustre_import.h
• lustre/tests/conf-sanity.sh
• lustre/mdc/mdc_request.c
• lustre/mgc/mgc_request.c
• lustre/include/obd.h
• lustre/ptlrpc/recover.c
• lustre/quota/quota_check.c
• lustre/osc/osc_request.c
• lustre/quota/quota_ctl.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,ubuntu-x86_64 #109
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/tests/conf-sanity.sh
• lustre/osc/osc_request.c
• lustre/include/lustre_import.h
• lustre/mgc/mgc_request.c
• lustre/include/obd.h
• lustre/mdc/mdc_request.c
• lustre/quota/quota_ctl.c
• lustre/quota/quota_check.c
• lustre/ptlrpc/recover.c
• lustre/lov/lov_obd.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el6-i686 #109
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/quota/quota_ctl.c
• lustre/ptlrpc/recover.c
• lustre/quota/quota_check.c
• lustre/include/obd.h
• lustre/tests/conf-sanity.sh
• lustre/mgc/mgc_request.c
• lustre/lov/lov_obd.c
• lustre/osc/osc_request.c
• lustre/mdc/mdc_request.c
• lustre/include/lustre_import.h

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el6-i686 #109
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/osc/osc_request.c
• lustre/mgc/mgc_request.c
• lustre/mdc/mdc_request.c
• lustre/include/obd.h
• lustre/lov/lov_obd.c
• lustre/ptlrpc/recover.c
• lustre/include/lustre_import.h
• lustre/quota/quota_ctl.c
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_check.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el5-i686 #109
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/quota/quota_check.c
• lustre/mdc/mdc_request.c
• lustre/include/obd.h
• lustre/tests/conf-sanity.sh
• lustre/lov/lov_obd.c
• lustre/ptlrpc/recover.c
• lustre/quota/quota_ctl.c
• lustre/osc/osc_request.c
• lustre/include/lustre_import.h
• lustre/mgc/mgc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el5-x86_64 #109
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/lov/lov_obd.c
• lustre/ptlrpc/recover.c
• lustre/include/obd.h
• lustre/mdc/mdc_request.c
• lustre/mgc/mgc_request.c
• lustre/include/lustre_import.h
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_check.c
• lustre/quota/quota_ctl.c
• lustre/osc/osc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el5-i686 #109
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/osc/osc_request.c
• lustre/lov/lov_obd.c
• lustre/include/obd.h
• lustre/include/lustre_import.h
• lustre/mdc/mdc_request.c
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_ctl.c
• lustre/mgc/mgc_request.c
• lustre/quota/quota_check.c
• lustre/ptlrpc/recover.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el6-x86_64 #109
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/quota/quota_ctl.c
• lustre/mgc/mgc_request.c
• lustre/tests/conf-sanity.sh
• lustre/lov/lov_obd.c
• lustre/mdc/mdc_request.c
• lustre/ptlrpc/recover.c
• lustre/quota/quota_check.c
• lustre/osc/osc_request.c
• lustre/include/obd.h
• lustre/include/lustre_import.h

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el5-x86_64 #111
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/quota/quota_check.c
• lustre/mdc/mdc_request.c
• lustre/include/obd.h
• lustre/tests/conf-sanity.sh
• lustre/osc/osc_request.c
• lustre/quota/quota_ctl.c
• lustre/ptlrpc/recover.c
• lustre/lov/lov_obd.c
• lustre/include/lustre_import.h
• lustre/mgc/mgc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,ubuntu-x86_64 #111
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/tests/conf-sanity.sh
• lustre/include/lustre_import.h
• lustre/ptlrpc/recover.c
• lustre/mgc/mgc_request.c
• lustre/mdc/mdc_request.c
• lustre/osc/osc_request.c
• lustre/lov/lov_obd.c
• lustre/include/obd.h
• lustre/quota/quota_check.c
• lustre/quota/quota_ctl.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el6-i686 #111
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/mgc/mgc_request.c
• lustre/quota/quota_ctl.c
• lustre/mdc/mdc_request.c
• lustre/ptlrpc/recover.c
• lustre/include/obd.h
• lustre/osc/osc_request.c
• lustre/lov/lov_obd.c
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_check.c
• lustre/include/lustre_import.h

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el6-i686 #111
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/osc/osc_request.c
• lustre/include/lustre_import.h
• lustre/tests/conf-sanity.sh
• lustre/mdc/mdc_request.c
• lustre/ptlrpc/recover.c
• lustre/mgc/mgc_request.c
• lustre/quota/quota_check.c
• lustre/include/obd.h
• lustre/quota/quota_ctl.c
• lustre/lov/lov_obd.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el5-x86_64 #111
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/tests/conf-sanity.sh
• lustre/quota/quota_ctl.c
• lustre/quota/quota_check.c
• lustre/lov/lov_obd.c
• lustre/mdc/mdc_request.c
• lustre/include/obd.h
• lustre/include/lustre_import.h
• lustre/mgc/mgc_request.c
• lustre/ptlrpc/recover.c
• lustre/osc/osc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el5-i686 #111
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/osc/osc_request.c
• lustre/include/obd.h
• lustre/tests/conf-sanity.sh
• lustre/mdc/mdc_request.c
• lustre/lov/lov_obd.c
• lustre/quota/quota_check.c
• lustre/quota/quota_ctl.c
• lustre/include/lustre_import.h
• lustre/ptlrpc/recover.c
• lustre/mgc/mgc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el5-i686 #111
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/ptlrpc/recover.c
• lustre/include/lustre_import.h
• lustre/quota/quota_check.c
• lustre/lov/lov_obd.c
• lustre/tests/conf-sanity.sh
• lustre/osc/osc_request.c
• lustre/include/obd.h
• lustre/quota/quota_ctl.c
• lustre/mdc/mdc_request.c
• lustre/mgc/mgc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el6-x86_64 #111
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/quota/quota_check.c
• lustre/mdc/mdc_request.c
• lustre/quota/quota_ctl.c
• lustre/mgc/mgc_request.c
• lustre/osc/osc_request.c
• lustre/lov/lov_obd.c
• lustre/include/lustre_import.h
• lustre/tests/conf-sanity.sh
• lustre/ptlrpc/recover.c
• lustre/include/obd.h

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el6-x86_64 #111
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/mdc/mdc_request.c
• lustre/quota/quota_ctl.c
• lustre/include/obd.h
• lustre/quota/quota_check.c
• lustre/osc/osc_request.c
• lustre/lov/lov_obd.c
• lustre/include/lustre_import.h
• lustre/tests/conf-sanity.sh
• lustre/ptlrpc/recover.c
• lustre/mgc/mgc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el6-i686 #115
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/ptlrpc/recover.c
• lustre/lov/lov_obd.c
• lustre/include/lustre_import.h
• lustre/quota/quota_ctl.c
• lustre/mgc/mgc_request.c
• lustre/tests/conf-sanity.sh
• lustre/osc/osc_request.c
• lustre/include/obd.h
• lustre/quota/quota_check.c
• lustre/mdc/mdc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el5-x86_64 #115
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/quota/quota_ctl.c
• lustre/ptlrpc/recover.c
• lustre/quota/quota_check.c
• lustre/lov/lov_obd.c
• lustre/osc/osc_request.c
• lustre/include/lustre_import.h
• lustre/include/obd.h
• lustre/tests/conf-sanity.sh
• lustre/mgc/mgc_request.c
• lustre/mdc/mdc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el6-x86_64 #115
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/quota/quota_ctl.c
• lustre/quota/quota_check.c
• lustre/ptlrpc/recover.c
• lustre/include/obd.h
• lustre/osc/osc_request.c
• lustre/tests/conf-sanity.sh
• lustre/lov/lov_obd.c
• lustre/mgc/mgc_request.c
• lustre/include/lustre_import.h
• lustre/mdc/mdc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,ubuntu-x86_64 #115
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/include/lustre_import.h
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_ctl.c
• lustre/quota/quota_check.c
• lustre/mgc/mgc_request.c
• lustre/lov/lov_obd.c
• lustre/include/obd.h
• lustre/osc/osc_request.c
• lustre/mdc/mdc_request.c
• lustre/ptlrpc/recover.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el6-i686 #115
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/mdc/mdc_request.c
• lustre/quota/quota_check.c
• lustre/include/obd.h
• lustre/mgc/mgc_request.c
• lustre/lov/lov_obd.c
• lustre/quota/quota_ctl.c
• lustre/ptlrpc/recover.c
• lustre/include/lustre_import.h
• lustre/tests/conf-sanity.sh
• lustre/osc/osc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el5-i686 #115
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/quota/quota_ctl.c
• lustre/include/obd.h
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_check.c
• lustre/mdc/mdc_request.c
• lustre/include/lustre_import.h
• lustre/mgc/mgc_request.c
• lustre/lov/lov_obd.c
• lustre/ptlrpc/recover.c
• lustre/osc/osc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el5-x86_64 #115
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/quota/quota_check.c
• lustre/mgc/mgc_request.c
• lustre/lov/lov_obd.c
• lustre/ptlrpc/recover.c
• lustre/include/obd.h
• lustre/tests/conf-sanity.sh
• lustre/osc/osc_request.c
• lustre/include/lustre_import.h
• lustre/quota/quota_ctl.c
• lustre/mdc/mdc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » server,el6-x86_64 #115
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/tests/conf-sanity.sh
• lustre/ptlrpc/recover.c
• lustre/quota/quota_check.c
• lustre/lov/lov_obd.c
• lustre/mgc/mgc_request.c
• lustre/mdc/mdc_request.c
• lustre/include/lustre_import.h
• lustre/quota/quota_ctl.c
• lustre/include/obd.h
• lustre/osc/osc_request.c

[Build Master (Inactive)]

Integrated in lustre-reviews » client,el5-i686 #115
LU-129 Skip quotacheck on administratively disabled OSTs

Niu Yawei : 04ad0b55e0cee37977b4ef4edf557bff10b4379e
Files :

• lustre/tests/conf-sanity.sh
• lustre/quota/quota_check.c
• lustre/mgc/mgc_request.c
• lustre/mdc/mdc_request.c
• lustre/include/obd.h
• lustre/include/lustre_import.h
• lustre/ptlrpc/recover.c
• lustre/lov/lov_obd.c
• lustre/quota/quota_ctl.c
• lustre/osc/osc_request.c

[Build Master (Inactive)]

Integrated in lustre-b1_8 » client,el5-x86_64 #10
LU-129 Skip quotacheck on administratively disabled OSTs

Johann Lombardi : eaa7b878bf08dc8493313f176ba00b8a38a8b77f
Files :

• lustre/ptlrpc/recover.c
• lustre/lov/lov_obd.c
• lustre/mgc/mgc_request.c
• lustre/tests/conf-sanity.sh
• lustre/osc/osc_request.c
• lustre/quota/quota_ctl.c
• lustre/include/obd.h
• lustre/quota/quota_check.c
• lustre/mdc/mdc_request.c
• lustre/include/lustre_import.h

[Build Master (Inactive)]

Integrated in lustre-b1_8 » client,el6-x86_64 #10
LU-129 Skip quotacheck on administratively disabled OSTs

Johann Lombardi : eaa7b878bf08dc8493313f176ba00b8a38a8b77f
Files :

• lustre/tests/conf-sanity.sh
• lustre/lov/lov_obd.c
• lustre/osc/osc_request.c
• lustre/mgc/mgc_request.c
• lustre/quota/quota_ctl.c
• lustre/ptlrpc/recover.c
• lustre/quota/quota_check.c
• lustre/mdc/mdc_request.c
• lustre/include/obd.h
• lustre/include/lustre_import.h

[Build Master (Inactive)]

Integrated in lustre-b1_8 » client,ubuntu-x86_64 #10
LU-129 Skip quotacheck on administratively disabled OSTs

Johann Lombardi : eaa7b878bf08dc8493313f176ba00b8a38a8b77f
Files :

• lustre/tests/conf-sanity.sh
• lustre/include/obd.h
• lustre/ptlrpc/recover.c
• lustre/include/lustre_import.h
• lustre/quota/quota_ctl.c
• lustre/mgc/mgc_request.c
• lustre/mdc/mdc_request.c
• lustre/quota/quota_check.c
• lustre/lov/lov_obd.c
• lustre/osc/osc_request.c

[Build Master (Inactive)]

Integrated in lustre-b1_8-centos5 #250
LU-129 Skip quotacheck on administratively disabled OSTs

Johann Lombardi : eaa7b878bf08dc8493313f176ba00b8a38a8b77f
Files :

• lustre/quota/quota_ctl.c
• lustre/include/lustre_import.h
• lustre/mdc/mdc_request.c
• lustre/lov/lov_obd.c
• lustre/quota/quota_check.c
• lustre/tests/conf-sanity.sh
• lustre/ptlrpc/recover.c
• lustre/osc/osc_request.c
• lustre/mgc/mgc_request.c
• lustre/include/obd.h

[Build Master (Inactive)]

Integrated in lustre-b1_8 » server,el5-i686 #10
LU-129 Skip quotacheck on administratively disabled OSTs

Johann Lombardi : eaa7b878bf08dc8493313f176ba00b8a38a8b77f
Files :

• lustre/quota/quota_check.c
• lustre/tests/conf-sanity.sh
• lustre/include/obd.h
• lustre/include/lustre_import.h
• lustre/quota/quota_ctl.c
• lustre/mgc/mgc_request.c
• lustre/lov/lov_obd.c
• lustre/osc/osc_request.c
• lustre/ptlrpc/recover.c
• lustre/mdc/mdc_request.c

[Build Master (Inactive)]

Integrated in lustre-b1_8 » client,el6-i686 #10
LU-129 Skip quotacheck on administratively disabled OSTs

Johann Lombardi : eaa7b878bf08dc8493313f176ba00b8a38a8b77f
Files :

• lustre/tests/conf-sanity.sh
• lustre/osc/osc_request.c
• lustre/mgc/mgc_request.c
• lustre/quota/quota_check.c
• lustre/lov/lov_obd.c
• lustre/include/obd.h
• lustre/ptlrpc/recover.c
• lustre/quota/quota_ctl.c
• lustre/mdc/mdc_request.c
• lustre/include/lustre_import.h

[Build Master (Inactive)]

Integrated in lustre-b1_8 » server,el5-x86_64 #10
LU-129 Skip quotacheck on administratively disabled OSTs

Johann Lombardi : eaa7b878bf08dc8493313f176ba00b8a38a8b77f
Files :

• lustre/mgc/mgc_request.c
• lustre/ptlrpc/recover.c
• lustre/mdc/mdc_request.c
• lustre/quota/quota_check.c
• lustre/include/lustre_import.h
• lustre/quota/quota_ctl.c
• lustre/lov/lov_obd.c
• lustre/osc/osc_request.c
• lustre/tests/conf-sanity.sh
• lustre/include/obd.h

[Build Master (Inactive)]

Integrated in lustre-b1_8 » client,el5-i686 #10
LU-129 Skip quotacheck on administratively disabled OSTs

Johann Lombardi : eaa7b878bf08dc8493313f176ba00b8a38a8b77f
Files :

• lustre/quota/quota_ctl.c
• lustre/osc/osc_request.c
• lustre/mdc/mdc_request.c
• lustre/ptlrpc/recover.c
• lustre/mgc/mgc_request.c
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_check.c
• lustre/include/lustre_import.h
• lustre/lov/lov_obd.c
• lustre/include/obd.h

[Build Master (Inactive)]

Integrated in lustre-master » x86_64,server,el5,inkernel #40
LU-129 Skip quotacheck on administratively disabled OSTs

Oleg Drokin : 9ab78a5bec154492c70f780706d9eaebeaaa5e54
Files :

• lustre/quota/quota_ctl.c
• lustre/lov/lov_obd.c
• lustre/include/lustre_import.h
• lustre/mgc/mgc_request.c
• lustre/mdc/mdc_request.c
• lustre/quota/quota_check.c
• lustre/tests/conf-sanity.sh
• lustre/osc/osc_request.c
• lustre/include/obd.h
• lustre/ptlrpc/recover.c

[Build Master (Inactive)]

Integrated in lustre-master » x86_64,client,ubuntu1004,inkernel #40
LU-129 Skip quotacheck on administratively disabled OSTs

Oleg Drokin : 9ab78a5bec154492c70f780706d9eaebeaaa5e54
Files :

• lustre/quota/quota_check.c
• lustre/osc/osc_request.c
• lustre/include/obd.h
• lustre/quota/quota_ctl.c
• lustre/mgc/mgc_request.c
• lustre/mdc/mdc_request.c
• lustre/ptlrpc/recover.c
• lustre/include/lustre_import.h
• lustre/lov/lov_obd.c
• lustre/tests/conf-sanity.sh

[Build Master (Inactive)]

Integrated in lustre-master » x86_64,client,el5,inkernel #40
LU-129 Skip quotacheck on administratively disabled OSTs

Oleg Drokin : 9ab78a5bec154492c70f780706d9eaebeaaa5e54
Files :

• lustre/include/lustre_import.h
• lustre/include/obd.h
• lustre/mgc/mgc_request.c
• lustre/mdc/mdc_request.c
• lustre/lov/lov_obd.c
• lustre/quota/quota_ctl.c
• lustre/ptlrpc/recover.c
• lustre/osc/osc_request.c
• lustre/tests/conf-sanity.sh
• lustre/quota/quota_check.c

[Build Master (Inactive)]

Integrated in lustre-master » i686,client,el6,inkernel #40
LU-129 Skip quotacheck on administratively disabled OSTs

Oleg Drokin : 9ab78a5bec154492c70f780706d9eaebeaaa5e54
Files :

• lustre/osc/osc_request.c
• lustre/tests/conf-sanity.sh
• lustre/mgc/mgc_request.c
• lustre/include/obd.h
• lustre/quota/quota_ctl.c
• lustre/ptlrpc/recover.c
• lustre/include/lustre_import.h
• lustre/lov/lov_obd.c
• lustre/quota/quota_check.c
• lustre/mdc/mdc_request.c

[Build Master (Inactive)]

Integrated in lustre-master » x86_64,server,el6,inkernel #40
LU-129 Skip quotacheck on administratively disabled OSTs

Oleg Drokin : 9ab78a5bec154492c70f780706d9eaebeaaa5e54
Files :

• lustre/include/obd.h
• lustre/tests/conf-sanity.sh
• lustre/lov/lov_obd.c
• lustre/quota/quota_ctl.c
• lustre/osc/osc_request.c
• lustre/include/lustre_import.h
• lustre/mgc/mgc_request.c
• lustre/mdc/mdc_request.c
• lustre/quota/quota_check.c
• lustre/ptlrpc/recover.c

[Build Master (Inactive)]

Integrated in lustre-master » x86_64,server,el5,ofa #40
LU-129 Skip quotacheck on administratively disabled OSTs

Oleg Drokin : 9ab78a5bec154492c70f780706d9eaebeaaa5e54
Files :

• lustre/tests/conf-sanity.sh
• lustre/ptlrpc/recover.c
• lustre/mgc/mgc_request.c
• lustre/mdc/mdc_request.c
• lustre/quota/quota_ctl.c
• lustre/lov/lov_obd.c
• lustre/quota/quota_check.c
• lustre/include/lustre_import.h
• lustre/include/obd.h
• lustre/osc/osc_request.c

[Build Master (Inactive)]

Integrated in lustre-master » x86_64,client,el6,inkernel #40
LU-129 Skip quotacheck on administratively disabled OSTs

Oleg Drokin : 9ab78a5bec154492c70f780706d9eaebeaaa5e54
Files :

• lustre/osc/osc_request.c
• lustre/include/obd.h
• lustre/include/lustre_import.h
• lustre/quota/quota_check.c
• lustre/quota/quota_ctl.c
• lustre/mdc/mdc_request.c
• lustre/ptlrpc/recover.c
• lustre/mgc/mgc_request.c
• lustre/tests/conf-sanity.sh
• lustre/lov/lov_obd.c

[Build Master (Inactive)]

Integrated in lustre-master » x86_64,client,ubuntu1004,ofa #40
LU-129 Skip quotacheck on administratively disabled OSTs

Oleg Drokin : 9ab78a5bec154492c70f780706d9eaebeaaa5e54
Files :

• lustre/include/lustre_import.h
• lustre/mgc/mgc_request.c
• lustre/quota/quota_ctl.c
• lustre/tests/conf-sanity.sh
• lustre/include/obd.h
• lustre/quota/quota_check.c
• lustre/osc/osc_request.c
• lustre/ptlrpc/recover.c
• lustre/lov/lov_obd.c
• lustre/mdc/mdc_request.c

[Build Master (Inactive)]

Integrated in lustre-master » x86_64,client,el5,ofa #40
LU-129 Skip quotacheck on administratively disabled OSTs

Oleg Drokin : 9ab78a5bec154492c70f780706d9eaebeaaa5e54
Files :

• lustre/quota/quota_ctl.c
• lustre/mgc/mgc_request.c
• lustre/lov/lov_obd.c
• lustre/include/lustre_import.h
• lustre/quota/quota_check.c
• lustre/tests/conf-sanity.sh
• lustre/mdc/mdc_request.c
• lustre/osc/osc_request.c
• lustre/include/obd.h
• lustre/ptlrpc/recover.c

[Build Master (Inactive)]

Integrated in lustre-master » i686,server,el5,inkernel #40
LU-129 Skip quotacheck on administratively disabled OSTs

Oleg Drokin : 9ab78a5bec154492c70f780706d9eaebeaaa5e54
Files :

• lustre/osc/osc_request.c
• lustre/mdc/mdc_request.c
• lustre/tests/conf-sanity.sh
• lustre/ptlrpc/recover.c
• lustre/mgc/mgc_request.c
• lustre/quota/quota_check.c
• lustre/include/lustre_import.h
• lustre/lov/lov_obd.c
• lustre/include/obd.h
• lustre/quota/quota_ctl.c

[Build Master (Inactive)]

Integrated in lustre-master » i686,client,el5,ofa #40
LU-129 Skip quotacheck on administratively disabled OSTs

Oleg Drokin : 9ab78a5bec154492c70f780706d9eaebeaaa5e54
Files :

• lustre/quota/quota_check.c
• lustre/osc/osc_request.c
• lustre/lov/lov_obd.c
• lustre/quota/quota_ctl.c
• lustre/ptlrpc/recover.c
• lustre/include/obd.h
• lustre/mgc/mgc_request.c
• lustre/mdc/mdc_request.c
• lustre/include/lustre_import.h
• lustre/tests/conf-sanity.sh

[Build Master (Inactive)]

Integrated in lustre-master » i686,server,el5,ofa #40
LU-129 Skip quotacheck on administratively disabled OSTs

Oleg Drokin : 9ab78a5bec154492c70f780706d9eaebeaaa5e54
Files :

• lustre/quota/quota_check.c
• lustre/osc/osc_request.c
• lustre/mdc/mdc_request.c
• lustre/include/obd.h
• lustre/quota/quota_ctl.c
• lustre/include/lustre_import.h
• lustre/lov/lov_obd.c
• lustre/tests/conf-sanity.sh
• lustre/ptlrpc/recover.c
• lustre/mgc/mgc_request.c

[Build Master (Inactive)]

Integrated in lustre-master » i686,client,el5,inkernel #40
LU-129 Skip quotacheck on administratively disabled OSTs

Oleg Drokin : 9ab78a5bec154492c70f780706d9eaebeaaa5e54
Files :

• lustre/tests/conf-sanity.sh
• lustre/include/lustre_import.h
• lustre/mdc/mdc_request.c
• lustre/mgc/mgc_request.c
• lustre/osc/osc_request.c
• lustre/quota/quota_ctl.c
• lustre/include/obd.h
• lustre/lov/lov_obd.c
• lustre/ptlrpc/recover.c
• lustre/quota/quota_check.c

[Peter Jones]

Landed for 1.8.6 and 2.1 so can mark as resolved