From: ira.weiny@intel.com
To: fstests@vger.kernel.org, Eryu Guan <guaneryu@gmail.com>
Cc: john.hubbard@gmail.com, Dave Chinner <david@fromorbit.com>,
Jan Kara <jack@suse.cz>, Jason Gunthorpe <jgg@ziepe.ca>,
dan.j.williams@intel.com, Jeff Layton <jlayton@kernel.org>,
Ira Weiny <ira.weiny@intel.com>
Subject: [PATCH V2 14/16] src/locktest: Add truncate lease tests
Date: Mon, 23 Sep 2019 10:53:34 -0700 [thread overview]
Message-ID: <20190923175336.2287-15-ira.weiny@intel.com> (raw)
In-Reply-To: <20190923175336.2287-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
Add verification of signal reception on truncate:
/* 9 */"Write lease gets SIGIO on truncate",
/* 10 */"Read lease gets SIGIO on truncate",
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
Changes from V1:
Tests are now a separate array and are run with '-L' option.
src/locktest.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/src/locktest.c b/src/locktest.c
index 9f8a892a21a0..2e7f2a19b1af 100644
--- a/src/locktest.c
+++ b/src/locktest.c
@@ -102,6 +102,7 @@ static HANDLE f_fd = INVALID_HANDLE; /* shared file */
#define CMD_GETLEASE 8
#define CMD_SIGIO 9
#define CMD_WAIT_SIGIO 10
+#define CMD_TRUNCATE 11
#define PASS 1
#define FAIL 0
@@ -133,6 +134,7 @@ static char *get_cmd_str(int cmd)
case CMD_GETLEASE: return "Get Lease"; break;
case CMD_SIGIO: return "Setup SIGIO"; break;
case CMD_WAIT_SIGIO: return "Wait for SIGIO"; break;
+ case CMD_TRUNCATE: return "Truncate"; break;
}
return "unknown";
}
@@ -574,6 +576,8 @@ char *lease_descriptions[] = {
/* 6 */"Write lease gets SIGIO on read open",
/* 7 */"Read lease does _not_ get SIGIO on read open",
/* 8 */"Read lease gets SIGIO on write open",
+ /* 9 */"Write lease gets SIGIO on truncate",
+ /* 10 */"Read lease gets SIGIO on truncate",
};
static int64_t lease_tests[][6] =
@@ -654,6 +658,25 @@ static int64_t lease_tests[][6] =
{8, CMD_CLOSE, 0, 0, PASS, SERVER },
{8, CMD_CLOSE, 0, 0, PASS, CLIENT },
+ /* Get SIGIO when Write lease is broken by Truncate */
+ {9, CMD_OPEN, O_RDWR, 0, PASS, CLIENT },
+ {9, CMD_SETLEASE, F_WRLCK, 0, PASS, CLIENT },
+ {9, CMD_GETLEASE, F_WRLCK, 0, PASS, CLIENT },
+ {9, CMD_SIGIO, 0, 0, PASS, CLIENT },
+ {9, CMD_TRUNCATE, FILE_SIZE/2, 0, PASS, CLIENT },
+ {9, CMD_WAIT_SIGIO, 5, 0, PASS, CLIENT },
+ {9, CMD_CLOSE, 0, 0, PASS, CLIENT },
+
+ /* Get SIGIO when Read lease is broken by Truncate */
+ {10, CMD_OPEN, O_RDONLY, 0, PASS, CLIENT },
+ {10, CMD_SETLEASE, F_RDLCK, 0, PASS, CLIENT },
+ {10, CMD_GETLEASE, F_RDLCK, 0, PASS, CLIENT },
+ {10, CMD_SIGIO, 0, 0, PASS, CLIENT },
+ {10, CMD_TRUNCATE, FILE_SIZE/2, 0, PASS, SERVER },
+ {10, CMD_WAIT_SIGIO, 5, 0, PASS, CLIENT },
+ {10, CMD_CLOSE, 0, 0, PASS, CLIENT },
+
+
/* indicate end of array */
{0,0,0,0,0,SERVER},
{0,0,0,0,0,CLIENT}
@@ -717,6 +740,27 @@ initialize(HANDLE fd)
}
}
+static int do_truncate(size_t length)
+{
+ int rc;
+
+ if (debug)
+ fprintf(stderr, "truncating to %ld\n", length);
+
+again:
+ rc = truncate(filename, length);
+ if (rc && errno == EINTR)
+ goto again;
+
+ saved_errno = errno;
+
+ if (rc)
+ fprintf(stderr, "%s %d : %s\n",
+ __FILE__, errno, strerror(errno));
+
+ return (rc == 0 ? PASS:FAIL);
+}
+
void release_lease(int fd)
{
int rc;
@@ -1245,6 +1289,9 @@ int run(int64_t tests[][6], char *descriptions[])
case CMD_WAIT_SIGIO:
result = do_wait_sigio(tests[index][TIME]);
break;
+ case CMD_TRUNCATE:
+ result = do_truncate(tests[index][OFFSET]);
+ break;
}
if( result != tests[index][RESULT]) {
fail_flag++;
@@ -1356,6 +1403,9 @@ int run(int64_t tests[][6], char *descriptions[])
case CMD_WAIT_SIGIO:
result = do_wait_sigio(ctl.offset);
break;
+ case CMD_TRUNCATE:
+ result = do_truncate(ctl.offset);
+ break;
}
if( result != ctl.result ) {
fprintf(stderr,"Failure in %d:%s\n",
--
2.20.1
next prev parent reply other threads:[~2019-09-23 17:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-23 17:53 [PATCH V2 00/16] Fix locktest and add lease testing to it ira.weiny
2019-09-23 17:53 ` [PATCH V2 01/16] src/locktest: Remove unnecessary sleep ira.weiny
2019-09-23 17:53 ` [PATCH V2 02/16] src/locktest: Remove OPEN macro ira.weiny
2019-09-23 17:53 ` [PATCH V2 03/16] src/locktest: Change command macro names ira.weiny
2019-09-23 17:53 ` [PATCH V2 04/16] src/locktest: Add get_cmd_str ira.weiny
2019-09-23 17:53 ` [PATCH V2 05/16] src/locktest.c: Clean up client command passing ira.weiny
2019-09-23 17:53 ` [PATCH V2 06/16] src/locktest.c: Fix return code if last test fails ira.weiny
2019-09-23 17:53 ` [PATCH V2 07/16] generic/131: Clean up pid variables ira.weiny
2019-09-23 17:53 ` [PATCH V2 08/16] generic/131: Save stderr for debugging ira.weiny
2019-09-23 17:53 ` [PATCH V2 09/16] src/locktest: Clean up error output ira.weiny
2019-09-23 17:53 ` [PATCH V2 10/16] src/locktest: Audit all debug output ira.weiny
2019-09-23 17:53 ` [PATCH V2 11/16] src/locktest: Add run() function ira.weiny
2019-09-23 17:53 ` [PATCH V2 12/16] src/locktest: Add simple lease testing ira.weiny
2019-09-23 17:53 ` [PATCH V2 13/16] src/locktest: Add lease testing for basic signal reception ira.weiny
2019-09-23 17:53 ` ira.weiny [this message]
2019-09-23 17:59 ` [PATCH V2 15/16] common/locktest: Add common locktest functions ira.weiny
2019-09-23 17:59 ` [PATCH V2 16/16] generic/568: Add lease testing ira.weiny
2019-10-01 21:54 ` [PATCH V2 00/16] Fix locktest and add lease testing to it Ira Weiny
2019-10-02 8:24 ` Eryu Guan
2019-10-02 17:59 ` Ira Weiny
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=20190923175336.2287-15-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=dan.j.williams@intel.com \
--cc=david@fromorbit.com \
--cc=fstests@vger.kernel.org \
--cc=guaneryu@gmail.com \
--cc=jack@suse.cz \
--cc=jgg@ziepe.ca \
--cc=jlayton@kernel.org \
--cc=john.hubbard@gmail.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;
as well as URLs for NNTP newsgroup(s).