Some logging and load-test improvements

cmd/rqbench/simple_load.sh

@@ -14,11 +14,13 @@ handle_ctrl_c() {
     exit 1
 }
 
+COUNT=10000
+
 trap 'handle_ctrl_c' SIGINT
 
-$RQBENCH -o 'CREATE TABLE IF NOT EXISTS foo (id INTEGER NOT NULL PRIMARY KEY, name TEXT, surname TEXT)' -m 100 -n 500000 -a $EXECUTE_HOST 'INSERT INTO foo(name) VALUES("fiona")' &
-$RQBENCH -o 'CREATE TABLE IF NOT EXISTS bar (id INTEGER NOT NULL PRIMARY KEY, name TEXT, surname TEXT)' -m 100 -n 500000 -a $EXECUTE_HOST 'INSERT INTO bar(name, surname) VALUES("fiona", "OTOOLE")' &
-$RQBENCH -o 'CREATE TABLE IF NOT EXISTS qux (id INTEGER NOT NULL PRIMARY KEY, name TEXT)' -m 100 -n 500000 -a $EXECUTE_HOST 'INSERT INTO qux(name) VALUES("fionafionafionafionafionafionafionafionafionafionafionafionafionafionafionafionafionafiona")' &
+$RQBENCH -o 'CREATE TABLE IF NOT EXISTS foo (id INTEGER NOT NULL PRIMARY KEY, name TEXT, surname TEXT)' -m 100 -n $COUNT -a $EXECUTE_HOST 'INSERT INTO foo(name) VALUES("fiona")' &
+$RQBENCH -o 'CREATE TABLE IF NOT EXISTS bar (id INTEGER NOT NULL PRIMARY KEY, name TEXT, surname TEXT)' -m 100 -n $COUNT -a $EXECUTE_HOST 'INSERT INTO bar(name, surname) VALUES("fiona", "OTOOLE")' &
+$RQBENCH -o 'CREATE TABLE IF NOT EXISTS qux (id INTEGER NOT NULL PRIMARY KEY, name TEXT)' -m 100 -n $COUNT -a $EXECUTE_HOST 'INSERT INTO qux(name) VALUES("fionafionafionafionafionafionafionafionafionafionafionafionafionafionafionafionafionafiona")' &
 
 echo "Waiting for tables to be created before starting queries"
 sleep 5

http/service.go

@@ -772,21 +772,21 @@ func (s *Service) handleLoad(w http.ResponseWriter, r *http.Request) {
 				// Allow this if block to exit without return, so response remains as before request
 				// forwarding was put in place.
 			}
+			nChunks, nr, nw := chunker.Counts()
 			if chunk.IsLast {
-				nChunks, nr, nw := chunker.Counts()
 				s.logger.Printf("%d bytes read, %d chunks generated, containing %d bytes of compressed data (compression ratio %.2f)",
 					nr, nChunks, nw, float64(nr)/float64(nw))
 				break
 			}
 			if chunk.Abort {
 				stats.Add(numLoadAborted, 1)
-				s.logger.Printf("load request aborted")
+				s.logger.Printf("load request aborted after %d bytes read, %d chunks generated", nr, nChunks)
 				break
 			}
 		}
 	}
 
-	s.logger.Printf("load request completed in %s", time.Since(startTime).String())
+	s.logger.Printf("load request finished in %s", time.Since(startTime).String())
 	s.writeResponse(w, r, resp)
 }