From: "Benjamin Marzinski" <bmarzins@redhat.com>
To: Martin Wilck <mwilck@suse.com>
Cc: dm-devel@redhat.com
Subject: Re: [PATCH 6/8] libmultipath: test code for "zombie" TUR threads
Date: Fri, 12 Oct 2018 16:51:53 -0500 [thread overview]
Message-ID: <20181012215153.GI29125@octiron.msp.redhat.com> (raw)
In-Reply-To: <20181010200506.15796-7-mwilck@suse.com>
On Wed, Oct 10, 2018 at 10:05:04PM +0200, Martin Wilck wrote:
> This patch adds test code that simulates hanging, non-cancellable
> TUR threads, for testing multipathd's behavior in that situation.
> Compile libmultipath with CFLAGS=-DTUR_TEST_MAJOR=8 to activate
> the test code. Without that flag, the patch has no effect.
>
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
> Signed-off-by: Martin Wilck <mwilck@suse.com>
> ---
> libmultipath/checkers/tur.c | 45 +++++++++++++++++++++++++++++++++++++
> 1 file changed, 45 insertions(+)
>
> diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c
> index b2a21707..a986a244 100644
> --- a/libmultipath/checkers/tur.c
> +++ b/libmultipath/checkers/tur.c
> @@ -196,6 +196,50 @@ static void cleanup_func(void *data)
> rcu_unregister_thread();
> }
>
> +/*
> + * Test code for "zombie tur thread" handling.
> + * Compile e.g. with CFLAGS=-DTUR_TEST_MAJOR=8
> + * Additional parameters can be configure with the macros below.
> + *
> + * Everty nth started TUR thread will hang in non-cancellable state
> + * for given number of seconds, for device given by major/minor.
> + */
> +#ifdef TUR_TEST_MAJOR
> +
> +#ifndef TUR_TEST_MINOR
> +#define TUR_TEST_MINOR 0
> +#endif
> +#ifndef TUR_SLEEP_INTERVAL
> +#define TUR_SLEEP_INTERVAL 3
> +#endif
> +#ifndef TUR_SLEEP_SECS
> +#define TUR_SLEEP_SECS 60
> +#endif
> +
> +static void tur_deep_sleep(const struct tur_checker_context *ct)
> +{
> + static int sleep_cnt;
> + const struct timespec ts = { .tv_sec = TUR_SLEEP_SECS, .tv_nsec = 0 };
> + int oldstate;
> +
> + if (ct->devt != makedev(TUR_TEST_MAJOR, TUR_TEST_MINOR) ||
> + ++sleep_cnt % TUR_SLEEP_INTERVAL != 0)
> + return;
> +
> + condlog(1, "tur thread going to sleep for %ld seconds", ts.tv_sec);
> + if (pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate) != 0)
> + condlog(0, "pthread_setcancelstate: %m");
> + if (nanosleep(&ts, NULL) != 0)
> + condlog(0, "nanosleep: %m");
> + condlog(1, "tur zombie thread woke up");
> + if (pthread_setcancelstate(oldstate, NULL) != 0)
> + condlog(0, "pthread_setcancelstate (2): %m");
> + pthread_testcancel();
> +}
> +#else
> +#define tur_deep_sleep(x) do {} while (0)
> +#endif /* TUR_TEST_MAJOR */
> +
> static void *tur_thread(void *ctx)
> {
> struct tur_checker_context *ct = ctx;
> @@ -209,6 +253,7 @@ static void *tur_thread(void *ctx)
> condlog(3, "%d:%d : tur checker starting up", major(ct->devt),
> minor(ct->devt));
>
> + tur_deep_sleep(ct);
> state = tur_check(ct->fd, ct->timeout, msg);
> pthread_testcancel();
>
> --
> 2.19.0
next prev parent reply other threads:[~2018-10-12 21:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-10 20:04 [PATCH 0/8] various multipath-tools patches Martin Wilck
2018-10-10 20:04 ` [PATCH 1/8] test-kpartx: add test for invocation on image file Martin Wilck
2018-10-12 21:45 ` Benjamin Marzinski
2018-10-10 20:05 ` [PATCH 2/8] libmultipath: scsi_ioctl_pathinfo doesn't fail Martin Wilck
2018-10-12 21:46 ` Benjamin Marzinski
2018-10-10 20:05 ` [PATCH 3/8] libmultipath: cciss_ioctl_pathinfo " Martin Wilck
2018-10-12 21:47 ` Benjamin Marzinski
2018-10-10 20:05 ` [PATCH 4/8] multipath.rules: add comment about DM_MULTIPATH_DEVICE_PATH=2 Martin Wilck
2018-10-12 21:49 ` Benjamin Marzinski
2018-10-10 20:05 ` [PATCH 5/8] multipath.8: man page update Martin Wilck
2018-10-12 21:51 ` Benjamin Marzinski
2018-10-10 20:05 ` [PATCH 6/8] libmultipath: test code for "zombie" TUR threads Martin Wilck
2018-10-12 21:51 ` Benjamin Marzinski [this message]
2018-10-10 20:05 ` [PATCH 7/8] libmultipath: handle TUR threads that can't be cancelled Martin Wilck
2018-10-12 22:11 ` Benjamin Marzinski
2018-10-23 10:58 ` Martin Wilck
2018-10-10 20:05 ` [PATCH 8/8] multipathd: handle repeated udev retrigger failure Martin Wilck
2018-10-12 22:30 ` Benjamin Marzinski
2018-10-13 8:48 ` [PATCH 0/8] various multipath-tools patches Christophe Varoqui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181012215153.GI29125@octiron.msp.redhat.com \
--to=bmarzins@redhat.com \
--cc=dm-devel@redhat.com \
--cc=mwilck@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox