[BENCH] Fix a couple bugs in stress tester

1 files changed, 63 insertions, 72 deletions

diff --git a/src/bench/connection.c b/src/bench/connection.c
index 129ae3c..2e40019 100644
--- a/src/bench/connection.c
+++ b/src/bench/connection.c
@@ -18,23 +18,10 @@ static const size_t SHORTBUF = 100;
 #define SOCKET_KEEPALIVE_TIMEOUT (3)
 #define MAX_ALTS (8)
 #define MAX_HOSTS_PER_ADDRESS (2)
-// If a server wasn't reachable this many times, we slowly start skipping it on measurements
-static const int FAIL_BACKOFF_START_COUNT = 8;
 #define RTT_COUNT (4)
 
 /* Module variables */
-
-// Init guard
-static bool connectionInitDone = false;
-static bool keepRunning = true;
-
-static struct {
-	int sockFd;
-	pthread_mutex_t sendMutex;
-	dnbd3_signal_t* panicSignal;
-	dnbd3_host_t currentServer;
-	uint64_t startupTime;
-} connection;
+static char trash[4096];
 
 // Known alt servers
 typedef struct _alt_server {
@@ -54,13 +41,13 @@ bool connection_init_n_times(
 		const char *lowerImage,
 		const uint16_t rid,
 		int ntimes,
-		BenchCounters* counters,
-		bool closeSockets
+		BenchCounters* counters
 		) {
 	for (int run_i = 0; run_i < ntimes; ++run_i) {
 		counters->attempts++;
 
-		printf(".");
+		putchar('.');
+		fflush(stdout);
 		int sock = -1;
 		char host[SHORTBUF];
 		serialized_buffer_t buffer;
@@ -68,66 +55,70 @@ bool connection_init_n_times(
 		char *remoteName;
 		uint64_t remoteSize;
 
-		if ( !connectionInitDone && keepRunning ) {
-			dnbd3_host_t tempHosts[MAX_HOSTS_PER_ADDRESS];
-			const char *current, *end;
-			int altIndex = 0;
-			memset( altservers, 0, sizeof altservers );
-			connection.sockFd = -1;
-			current = hosts;
-			do {
-				// Get next host from string
-				while ( *current == ' ' ) current++;
-				end = strchr( current, ' ' );
-				size_t len = (end == NULL ? SHORTBUF : (size_t)( end - current ) + 1);
-				if ( len > SHORTBUF ) len = SHORTBUF;
-				snprintf( host, len, "%s", current );
-				int newHosts = sock_resolveToDnbd3Host( host, tempHosts, MAX_HOSTS_PER_ADDRESS );
-				for ( int i = 0; i < newHosts; ++i ) {
-					if ( altIndex >= MAX_ALTS )
-						break;
-					altservers[altIndex].host = tempHosts[i];
-					altIndex += 1;
-				}
-				current = end + 1;
-			} while ( end != NULL && altIndex < MAX_ALTS );
-			logadd( LOG_INFO, "Got %d servers from init call", altIndex );
-			// Connect
-			for ( int i = 0; i < altIndex; ++i ) {
-				if ( altservers[i].host.type == 0 )
-					continue;
-				// Try to connect
-				sock = sock_connect( &altservers[i].host, 500, SOCKET_KEEPALIVE_TIMEOUT * 1000 );
-				if ( sock == -1 ) {
-					counters->fails++;
-					logadd( LOG_ERROR, "Could not connect to host" );
-				} else if ( !dnbd3_select_image( sock, lowerImage, rid, 0 ) ) {
-					counters->fails++;
-					logadd( LOG_ERROR, "Could not send select image" );
-				} else if ( !dnbd3_select_image_reply( &buffer, sock, &remoteVersion, &remoteName, &remoteRid, &remoteSize ) ) {
-					counters->fails++;
-					logadd( LOG_ERROR, "Could not read select image reply (%d)", errno );
-				} else if ( rid != 0 && rid != remoteRid ) {
-					counters->fails++;
-					logadd( LOG_ERROR, "rid mismatch" );
-				} else {
-					counters->success++;
+		dnbd3_host_t tempHosts[MAX_HOSTS_PER_ADDRESS];
+		const char *current, *end;
+		int altIndex = 0;
+		memset( altservers, 0, sizeof altservers );
+		current = hosts;
+		do {
+			// Get next host from string
+			while ( *current == ' ' ) current++;
+			end = strchr( current, ' ' );
+			size_t len = (end == NULL ? SHORTBUF : (size_t)( end - current ) + 1);
+			if ( len > SHORTBUF ) len = SHORTBUF;
+			snprintf( host, len, "%s", current );
+			int newHosts = sock_resolveToDnbd3Host( host, tempHosts, MAX_HOSTS_PER_ADDRESS );
+			for ( int i = 0; i < newHosts; ++i ) {
+				if ( altIndex >= MAX_ALTS )
 					break;
-				}
-				// Failed
-				logadd( LOG_DEBUG1, "Server does not offer requested image... " );
-				if ( sock != -1 ) {
-					close( sock );
-					sock = -1;
-				}
+				altservers[altIndex].host = tempHosts[i];
+				altIndex += 1;
 			}
+			current = end + 1;
+		} while ( end != NULL && altIndex < MAX_ALTS );
+		// Connect
+		for ( int i = 0; i < altIndex; ++i ) {
+			if ( altservers[i].host.type == 0 )
+				continue;
+			// Try to connect
+			dnbd3_reply_t reply;
+			sock = sock_connect( &altservers[i].host, 500, SOCKET_KEEPALIVE_TIMEOUT * 1000 );
+			if ( sock == -1 ) {
+				counters->fails++;
+				logadd( LOG_ERROR, "Could not connect to host" );
+			} else if ( !dnbd3_select_image( sock, lowerImage, rid, 0 ) ) {
+				counters->fails++;
+				logadd( LOG_ERROR, "Could not send select image" );
+			} else if ( !dnbd3_select_image_reply( &buffer, sock, &remoteVersion, &remoteName, &remoteRid, &remoteSize ) ) {
+				counters->fails++;
+				logadd( LOG_ERROR, "Could not read select image reply (%d)", errno );
+			} else if ( rid != 0 && rid != remoteRid ) {
+				counters->fails++;
+				logadd( LOG_ERROR, "rid mismatch" );
+			} else if ( !dnbd3_get_block( sock, run_i * 4096, 4096, 0, 0 ) ) {
+				counters->fails++;
+				logadd( LOG_ERROR, "send: get block failed" );
+			} else if ( !dnbd3_get_reply( sock, &reply ) ) {
+				counters->fails++;
+				logadd( LOG_ERROR, "recv: get block header failed" );
+			} else if ( recv( sock, trash, sizeof(trash), 0 ) != sizeof(trash) ) {
+				counters->fails++;
+				logadd( LOG_ERROR, "recv: get block payload failed" );
+			} else {
+				counters->success++;
+				close( sock );
+				sock = -1;
+				continue;
+			}
+			// Failed
 			if ( sock != -1 ) {
-				// connectionInitDone = true;
-				if (closeSockets) {
-					close( sock );
-				}
+				close( sock );
+				sock = -1;
 			}
 		}
+		if ( sock != -1 ) {
+			close( sock );
+		}
 	}
 	return true;
 }