[Nbd] [PATCH 2 of 3] Add write test to test suite
This adds a write test to the test suite, in preparation for adding a test
for flush and FUA.
Also at:
http:/www.alex.org.uk/nbd-add-write-test.patch
--
Alex Bligh
Signed-Off-By: Alex Bligh <alex@...872...>
commit b1189ad841ff11990530e297c1a1e0484e358a83
Author: Alex Bligh <alex@...872...>
Date: Tue May 17 08:00:56 2011 +0100
Add write test to test suite
diff --git a/Makefile.am b/Makefile.am
index 20edd8c..f2da3e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = nbd-server
sbin_PROGRAMS = @NBD_CLIENT_NAME@
EXTRA_PROGRAMS = nbd-client knbd-client
TESTS_ENVIRONMENT=$(srcdir)/simple_test
-TESTS = cmd cfg1 cfgmulti cfgnew cfgsize
+TESTS = cmd cfg1 cfgmulti cfgnew cfgsize write
check_PROGRAMS = nbd-tester-client
knbd_client_SOURCES = nbd-client.c cliserv.h
nbd_client_SOURCES = nbd-client.c cliserv.h
@@ -21,3 +21,4 @@ cfg1:
cfgmulti:
cfgnew:
cfgsize:
+write:
diff --git a/nbd-tester-client.c b/nbd-tester-client.c
index beb6d06..1ead4f1 100644
--- a/nbd-tester-client.c
+++ b/nbd-tester-client.c
@@ -224,13 +224,15 @@ int read_packet_check_header(int sock, size_t
datasize, long long int curhandle)
retval=-1;
goto end;
}
- READ_ALL_ERR_RT(sock, &buf, datasize, end, -1, "Could not read data: %s",
strerror(errno));
+ if (datasize)
+ READ_ALL_ERR_RT(sock, &buf, datasize, end, -1, "Could not read data:
%s", strerror(errno));
end:
return retval;
}
-int oversize_test(gchar* hostname, int port, char* name, int sock, char
sock_is_open, char close_sock) {
+int oversize_test(gchar* hostname, int port, char* name, int sock,
+ char sock_is_open, char close_sock, int write) {
int retval=0;
struct nbd_request req;
struct nbd_reply rep;
@@ -298,9 +300,11 @@ int oversize_test(gchar* hostname, int port, char*
name, int sock, char sock_is_
return retval;
}
-int throughput_test(gchar* hostname, int port, char* name, int sock, char
sock_is_open, char close_sock) {
+int throughput_test(gchar* hostname, int port, char* name, int sock,
+ char sock_is_open, char close_sock, int write) {
long long int i;
char buf[1024];
+ char writebuf[1024];
struct nbd_request req;
int requests=0;
fd_set set;
@@ -315,6 +319,7 @@ int throughput_test(gchar* hostname, int port, char*
name, int sock, char sock_i
signed int do_write=TRUE;
pid_t mypid = getpid();
+ memset (writebuf, 'X', sizeof(1024));
size=0;
if(!sock_is_open) {
if((sock=setup_connection(hostname, port, name,
CONNECTION_TYPE_FULL))<0) {
@@ -324,7 +329,7 @@ int throughput_test(gchar* hostname, int port, char*
name, int sock, char sock_i
}
}
req.magic=htonl(NBD_REQUEST_MAGIC);
- req.type=htonl(NBD_CMD_READ);
+ req.type=htonl(write?NBD_CMD_WRITE:NBD_CMD_READ);
req.len=htonl(1024);
if(gettimeofday(&start, NULL)<0) {
retval=-1;
@@ -339,6 +344,12 @@ int throughput_test(gchar* hostname, int port, char*
name, int sock, char sock_i
retval=-1;
goto err_open;
}
+ if (write) {
+ if (write_all(sock, writebuf, 1024) <0) {
+ retval=-1;
+ goto err_open;
+ }
+ }
printf("%d: Requests(+): %d\n", (int)mypid, ++requests);
}
do {
@@ -350,7 +361,7 @@ int throughput_test(gchar* hostname, int port, char*
name, int sock, char sock_i
if(FD_ISSET(sock, &set)) {
/* Okay, there's something ready for
* reading here */
- if(read_packet_check_header(sock, 1024, i)<0) {
+ if(read_packet_check_header(sock, write?0:1024, i)<0) {
retval=-1;
goto err_open;
}
@@ -381,7 +392,7 @@ int throughput_test(gchar* hostname, int port, char*
name, int sock, char sock_i
if(FD_ISSET(sock, &set)) {
/* Okay, there's something ready for
* reading here */
- read_packet_check_header(sock, 1024, i);
+ read_packet_check_header(sock, write?0:1024, i);
printf("%d: Requests(-): %d\n", (int)mypid, --requests);
}
} while (requests);
@@ -404,7 +415,7 @@ int throughput_test(gchar* hostname, int port, char*
name, int sock, char sock_i
speed>>=10;
speedchar[0]='G';
}
- g_message("%d: Throughput test complete. Took %.3f seconds to complete,
%d%siB/s", (int)getpid(), timespan,speed,speedchar);
+ g_message("%d: Throughput %s test complete. Took %.3f seconds to
complete, %d%siB/s", (int)getpid(), write?"write":"read", timespan, speed,
speedchar);
err_open:
if(close_sock) {
@@ -414,7 +425,7 @@ err:
return retval;
}
-typedef int (*testfunc)(gchar*, int, char*, int, char, char);
+typedef int (*testfunc)(gchar*, int, char*, int, char, char, int);
int main(int argc, char**argv) {
gchar *hostname;
@@ -424,6 +435,7 @@ int main(int argc, char**argv) {
int c;
bool want_port = TRUE;
int nonopt=0;
+ int write=0;
testfunc test = throughput_test;
if(argc<3) {
@@ -433,7 +445,7 @@ int main(int argc, char**argv) {
exit(EXIT_FAILURE);
}
logging();
- while((c=getopt(argc, argv, "-N:o"))>=0) {
+ while((c=getopt(argc, argv, "-N:ow"))>=0) {
switch(c) {
case 1:
switch(nonopt) {
@@ -459,10 +471,13 @@ int main(int argc, char**argv) {
case 'o':
test=oversize_test;
break;
+ case 'w':
+ write=1;
+ break;
}
}
- if(test(hostname, (int)p, name, sock, FALSE, TRUE)<0) {
+ if(test(hostname, (int)p, name, sock, FALSE, TRUE, write)<0) {
g_warning("Could not run test: %s", errstr);
exit(EXIT_FAILURE);
}
diff --git a/simple_test b/simple_test
index 9acb4e1..fcb402f 100755
--- a/simple_test
+++ b/simple_test
@@ -99,6 +99,19 @@ EOF
./nbd-tester-client localhost -N export1
retval=$?
;;
+ */write)
+ # Test new-style exports
+ cat >nbd-server.conf <<EOF
+[generic]
+[export1]
+ exportname = $tmpnam
+EOF
+ ./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid &
+ PID=$!
+ sleep 1
+ ./nbd-tester-client localhost -N export1 -w
+ retval=$?
+ ;;
*)
echo "E: unknown test $1"
exit 1
Reply to: