WT-2463 Test validity via WT stats instead of system CPU usage.

2 files changed, 66 insertions, 61 deletions

diff --git a/test/manydbs/manydbs.c b/test/manydbs/manydbs.c
index 897f57d4b11..e35ac72d231 100644
--- a/test/manydbs/manydbs.c
+++ b/test/manydbs/manydbs.c
@@ -60,18 +60,18 @@ static const char * const uri = "table:main";
     WTOPEN_CFG_COMMON						\
     "transaction_sync=(enabled,method=fsync)"
 
-#define	MAX_DBS		10
+#define	MAX_DBS	10
 #define	MAX_IDLE_TIME	30
 #define	IDLE_INCR	5
 
-#define	MAX_KV		100
-#define	MAX_VAL		128
+#define	MAX_KV	100
+#define	MAX_VAL	128
 
 static void
 usage(void)
 {
 	fprintf(stderr,
-	    "usage: %s [-I] [-C maxcpu%%] [-D maxdbs] [-h dir]\n", progname);
+	    "usage: %s [-I] [-D maxdbs] [-h dir]\n", progname);
 	exit(EXIT_FAILURE);
 }
 
@@ -82,10 +82,24 @@ void (*custom_die)(void) = NULL;
 
 WT_CONNECTION **conn = NULL;
 WT_CURSOR **cursor = NULL;
+WT_CURSOR **statc = NULL;
 WT_RAND_STATE rnd;
 WT_SESSION **session = NULL;
 
 static int
+get_stat(WT_CURSOR *cursor, int stat_field, uint64_t *valuep)
+{
+	const char *desc, *pvalue;
+	int ret;
+
+	cursor->set_key(cursor, stat_field);
+	if ((ret = cursor->search(cursor)) != 0)
+		return (ret);
+
+	return (cursor->get_value(cursor, &desc, &pvalue, valuep));
+}
+
+static int
 run_ops(int dbs)
 {
 	WT_ITEM data;
@@ -94,26 +108,6 @@ run_ops(int dbs)
 	uint8_t buf[MAX_VAL];
 
 	memset(buf, 0, sizeof(buf));
-	/*
-	 * First time through, set up sessions, create the tables and
-	 * open cursors.
-	 */
-	if (session == NULL) {
-		__wt_random_init(&rnd);
-		if ((session =
-		    calloc((size_t)dbs, sizeof(WT_SESSION *))) == NULL)
-			testutil_die(ENOMEM, "session array malloc");
-		if ((cursor = calloc((size_t)dbs, sizeof(WT_CURSOR *))) == NULL)
-			testutil_die(ENOMEM, "cursor array malloc");
-		for (i = 0; i < dbs; ++i) {
-			testutil_check(conn[i]->open_session(conn[i],
-			    NULL, NULL, &session[i]));
-			testutil_check(session[i]->create(session[i],
-			    uri, "key_format=Q,value_format=u"));
-			testutil_check(session[i]->open_cursor(session[i],
-			    uri, NULL, NULL, &cursor[i]));
-		}
-	}
 	for (i = 0; i < MAX_VAL; ++i)
 		buf[i] = (uint8_t)__wt_random(&rnd);
 	data.data = buf;
@@ -137,12 +131,10 @@ run_ops(int dbs)
 int
 main(int argc, char *argv[])
 {
-	FILE *fp;
-	float cpu, max;
+	uint64_t cond_reset, cond_wait;
 	int cfg, ch, dbs, i;
-	const char *working_dir;
-	bool idle, setmax;
-	const char *wt_cfg;
+	bool idle;
+	const char *working_dir, *wt_cfg;
 	char cmd[128];
 
 	if ((progname = strrchr(argv[0], DIR_DELIM)) == NULL)
@@ -151,14 +143,9 @@ main(int argc, char *argv[])
 		++progname;
 	dbs = MAX_DBS;
 	working_dir = HOME_BASE;
-	max = (float)dbs;
-	idle = setmax = false;
-	while ((ch = __wt_getopt(progname, argc, argv, "C:D:h:I")) != EOF)
+	idle = false;
+	while ((ch = __wt_getopt(progname, argc, argv, "D:h:I")) != EOF)
 		switch (ch) {
-		case 'C':
-			max = (float)atof(__wt_optarg);
-			setmax = true;
-			break;
 		case 'D':
 			dbs = atoi(__wt_optarg);
 			break;
@@ -173,29 +160,37 @@ main(int argc, char *argv[])
 		}
 	argc -= __wt_optind;
 	argv += __wt_optind;
-	/*
-	 * Adjust the maxcpu in relation to the number of databases, unless
-	 * the user set it explicitly.
-	 */
-	if (!setmax)
-		max = (float)dbs;
 	if (argc != 0)
 		usage();
 
+	/*
+	 * Allocate arrays for connection handles, sessions, statistics
+	 * cursors and, if needed, data cursors.
+	 */
 	if ((conn = calloc((size_t)dbs, sizeof(WT_CONNECTION *))) == NULL)
 		testutil_die(ENOMEM, "connection array malloc");
+	if ((session = calloc(
+	    (size_t)dbs, sizeof(WT_SESSION *))) == NULL)
+		testutil_die(ENOMEM, "session array malloc");
+	if ((statc = calloc((size_t)dbs, sizeof(WT_CURSOR *))) == NULL)
+		testutil_die(ENOMEM, "cursor array malloc");
+	if (!idle && ((cursor = calloc(
+	    (size_t)dbs, sizeof(WT_CURSOR *))) == NULL))
+		testutil_die(ENOMEM, "cursor array malloc");
 	memset(cmd, 0, sizeof(cmd));
 	/*
 	 * Set up all the directory names.
 	 */
 	testutil_work_dir_from_path(home, HOME_SIZE, working_dir);
 	testutil_make_work_dir(home);
+	__wt_random_init(&rnd);
 	for (i = 0; i < dbs; ++i) {
 		snprintf(hometmp, HOME_SIZE, "%s/%s.%d", home, HOME_BASE, i);
 		testutil_make_work_dir(hometmp);
 		/*
 		 * Open each database.  Rotate different configurations
-		 * among them.
+		 * among them.  Open a session and statistics cursor.
+		 * If writing data, create the table and open a data cursor.
 		 */
 		cfg = i % 3;
 		if (cfg == 0)
@@ -206,33 +201,43 @@ main(int argc, char *argv[])
 			wt_cfg = WT_CONFIG2;
 		testutil_check(wiredtiger_open(
 		    hometmp, NULL, wt_cfg, &conn[i]));
+		testutil_check(conn[i]->open_session(conn[i],
+		    NULL, NULL, &session[i]));
+		testutil_check(session[i]->open_cursor(session[i],
+		    "statistics:", NULL, NULL, &statc[i]));
+		if (!idle) {
+			testutil_check(session[i]->create(session[i],
+			    uri, "key_format=Q,value_format=u"));
+			testutil_check(session[i]->open_cursor(session[i],
+			    uri, NULL, NULL, &cursor[i]));
+		}
 	}
 
 	sleep(10);
+
 	for (i = 0; i < MAX_IDLE_TIME; i += IDLE_INCR) {
 		if (!idle)
 			testutil_check(run_ops(dbs));
 		printf("Sleep %d (%d of %d)\n", IDLE_INCR, i, MAX_IDLE_TIME);
 		sleep(IDLE_INCR);
 	}
-
-	/*
-	 * Check CPU after all idling or work is done.
-	 */
-	(void)snprintf(cmd, sizeof(cmd),
-	    "ps -p %lu -o pcpu=", (unsigned long)getpid());
-	if ((fp = popen(cmd, "r")) == NULL)
-		testutil_die(errno, "popen");
-	fscanf(fp, "%f", &cpu);
-	printf("Final CPU %f, max %f\n", cpu, max);
-	if (cpu > max) {
-		fprintf(stderr, "ERROR: CPU usage: %f, max %f\n", cpu, max);
-		testutil_die(ERANGE, "CPU");
-	}
-	if (pclose(fp) != 0)
-		testutil_die(errno, "pclose");
-	for (i = 0; i < dbs; ++i)
+	for (i = 0; i < dbs; ++i) {
+		testutil_check(get_stat(statc[i],
+		    WT_STAT_CONN_COND_AUTO_WAIT_RESET, &cond_reset));
+		testutil_check(get_stat(statc[i],
+		    WT_STAT_CONN_COND_AUTO_WAIT, &cond_wait));
+		/*
+		 * On an idle workload there should be no resets of condition
+		 * variables.  Even with a light workload, resets should not be
+		 * very common.  We look for 5%.
+		 */
+		if (idle && cond_reset != 0)
+			testutil_die(ERANGE,
+			    "condvar reset on idle connection");
+		if (!idle && cond_reset > cond_wait / 20)
+			testutil_die(ERANGE, "condvar reset exceeds 5%");
 		testutil_check(conn[i]->close(conn[i], NULL));
+	}
 
 	return (EXIT_SUCCESS);
 }
diff --git a/test/manydbs/smoke.sh b/test/manydbs/smoke.sh
index 291c02bd1e6..5d8d1473a3a 100755
--- a/test/manydbs/smoke.sh
+++ b/test/manydbs/smoke.sh
@@ -13,7 +13,7 @@ set -e
 # 3.  More dbs.
 # 
 echo "manydbs: default with operations turned on"
-$TEST_WRAPPER ./t -C 100
+$TEST_WRAPPER ./t
 #echo "manydbs: totally idle databases"
 #$TEST_WRAPPER ./t -I
 #echo "manydbs: 40 databases with operations"