tdb2: delete old tdb1 tests.

These two tdb1-specific tests have been superceded by the TDB_VERSION1
flags used in the main tests.

ccan/tdb2/test/run-tdb1-die-during-transaction.c

@@ -1,220 +0,0 @@
-#include <ccan/tdb2/private.h>
-#include <unistd.h>
-#include "tdb1-lock-tracking.h"
-static ssize_t pwrite_check(int fd, const void *buf, size_t count, off_t offset);
-static ssize_t write_check(int fd, const void *buf, size_t count);
-static int ftruncate_check(int fd, off_t length);
-
-#define pwrite pwrite_check
-#define write write_check
-#define fcntl fcntl_with_lockcheck1
-#define ftruncate ftruncate_check
-
-#include "tdb2-source.h"
-#include <ccan/tap/tap.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <stdarg.h>
-#include <err.h>
-#include <setjmp.h>
-#include "tdb1-external-agent.h"
-#include "logging.h"
-
-#undef write
-#undef pwrite
-#undef fcntl
-#undef ftruncate
-
-static bool in_transaction;
-static int target, current;
-static jmp_buf jmpbuf;
-#define TEST_DBNAME "run-die-during-transaction.tdb1"
-#define KEY_STRING "helloworld"
-
-static void maybe_die(int fd)
-{
-	if (in_transaction && current++ == target) {
-		longjmp(jmpbuf, 1);
-	}
-}
-
-static ssize_t pwrite_check(int fd,
-			    const void *buf, size_t count, off_t offset)
-{
-	ssize_t ret;
-
-	maybe_die(fd);
-
-	ret = pwrite(fd, buf, count, offset);
-	if (ret != count)
-		return ret;
-
-	maybe_die(fd);
-	return ret;
-}
-
-static ssize_t write_check(int fd, const void *buf, size_t count)
-{
-	ssize_t ret;
-
-	maybe_die(fd);
-
-	ret = write(fd, buf, count);
-	if (ret != count)
-		return ret;
-
-	maybe_die(fd);
-	return ret;
-}
-
-static int ftruncate_check(int fd, off_t length)
-{
-	int ret;
-
-	maybe_die(fd);
-
-	ret = ftruncate(fd, length);
-
-	maybe_die(fd);
-	return ret;
-}
-
-static bool test_death(enum operation op, struct agent *agent)
-{
-	struct tdb_context *tdb = NULL;
-	TDB_DATA key;
-	enum agent_return ret;
-	int needed_recovery = 0;
-	union tdb_attribute hsize;
-
-	hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
-	hsize.base.next = &tap_log_attr;
-	hsize.tdb1_hashsize.hsize = 1024;
-
-	current = target = 0;
-reset:
-	unlink(TEST_DBNAME);
-	tdb = tdb_open(TEST_DBNAME, TDB_VERSION1|TDB_NOMMAP,
-		       O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
-
-	if (setjmp(jmpbuf) != 0) {
-		/* We're partway through.  Simulate our death. */
-		close(tdb->file->fd);
-		forget_locking1();
-		in_transaction = false;
-
-		ret = external_agent_operation1(agent, NEEDS_RECOVERY, "");
-		if (ret == SUCCESS)
-			needed_recovery++;
-		else if (ret != FAILED) {
-			diag("Step %u agent NEEDS_RECOVERY = %s", current,
-			     agent_return_name1(ret));
-			return false;
-		}
-
-		ret = external_agent_operation1(agent, op, KEY_STRING);
-		if (ret != SUCCESS) {
-			diag("Step %u op %s failed = %s", current,
-			     operation_name1(op),
-			     agent_return_name1(ret));
-			return false;
-		}
-
-		ret = external_agent_operation1(agent, NEEDS_RECOVERY, "");
-		if (ret != FAILED) {
-			diag("Still needs recovery after step %u = %s",
-			     current, agent_return_name1(ret));
-			return false;
-		}
-
-		ret = external_agent_operation1(agent, CHECK, "");
-		if (ret != SUCCESS) {
-			diag("Step %u check failed = %s", current,
-			     agent_return_name1(ret));
-			return false;
-		}
-
-		ret = external_agent_operation1(agent, CLOSE, "");
-		if (ret != SUCCESS) {
-			diag("Step %u close failed = %s", current,
-			     agent_return_name1(ret));
-			return false;
-		}
-
-		/* Suppress logging as this tries to use closed fd. */
-		suppress_logging = true;
-		suppress_lockcheck1 = true;
-		tdb_close(tdb);
-		suppress_logging = false;
-		suppress_lockcheck1 = false;
-		target++;
-		current = 0;
-		goto reset;
-	}
-
-	/* Put key for agent to fetch. */
-	key.dsize = strlen(KEY_STRING);
-	key.dptr = (void *)KEY_STRING;
-	if (tdb_store(tdb, key, key, TDB_INSERT) != TDB_SUCCESS)
-		return false;
-
-	/* This is the key we insert in transaction. */
-	key.dsize--;
-
-	ret = external_agent_operation1(agent, OPEN, TEST_DBNAME);
-	if (ret != SUCCESS)
-		errx(1, "Agent failed to open: %s", agent_return_name1(ret));
-
-	ret = external_agent_operation1(agent, FETCH, KEY_STRING);
-	if (ret != SUCCESS)
-		errx(1, "Agent failed find key: %s", agent_return_name1(ret));
-
-	in_transaction = true;
-	if (tdb_transaction_start(tdb) != TDB_SUCCESS)
-		return false;
-
-	if (tdb_store(tdb, key, key, TDB_INSERT) != TDB_SUCCESS)
-		return false;
-
-	if (tdb_transaction_commit(tdb) != TDB_SUCCESS)
-		return false;
-
-	in_transaction = false;
-
-	/* We made it! */
-	diag("Completed %u runs", current);
-	tdb_close(tdb);
-	ret = external_agent_operation1(agent, CLOSE, "");
-	if (ret != SUCCESS) {
-		diag("Step %u close failed = %s", current,
-		     agent_return_name1(ret));
-		return false;
-	}
-
-	ok1(needed_recovery);
-	ok1(locking_errors1 == 0);
-	ok1(forget_locking1() == 0);
-	locking_errors1 = 0;
-	return true;
-}
-
-int main(int argc, char *argv[])
-{
-	enum operation ops[] = { FETCH, STORE, TRANSACTION_START };
-	struct agent *agent;
-	int i;
-
-	plan_tests(12);
-	unlock_callback1 = maybe_die;
-
-	agent = prepare_external_agent1();
-	if (!agent)
-		err(1, "preparing agent");
-
-	for (i = 0; i < sizeof(ops)/sizeof(ops[0]); i++) {
-		diag("Testing %s after death", operation_name1(ops[i]));
-		ok1(test_death(ops[i], agent));
-	}
-
-	return exit_status();
-}

ccan/tdb2/test/run-tdb1-open-during-transaction.c

@@ -1,174 +0,0 @@
-#include "config.h"
-#include "tdb1-lock-tracking.h"
-#include <unistd.h>
-
-static ssize_t pwrite_check(int fd, const void *buf, size_t count, off_t offset);
-static ssize_t write_check(int fd, const void *buf, size_t count);
-static int ftruncate_check(int fd, off_t length);
-
-#define pwrite pwrite_check
-#define write write_check
-#define fcntl fcntl_with_lockcheck1
-#define ftruncate ftruncate_check
-
-#include "tdb2-source.h"
-#include <ccan/tap/tap.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <stdarg.h>
-#include <err.h>
-#include "tdb1-external-agent.h"
-#include "logging.h"
-
-static struct agent *agent;
-static bool opened;
-static int errors = 0;
-#define TEST_DBNAME "run-open-during-transaction.tdb1"
-
-#undef write
-#undef pwrite
-#undef fcntl
-#undef ftruncate
-
-static bool is_same(const char *snapshot, const char *latest, off_t len)
-{
-	unsigned i;
-
-	for (i = 0; i < len; i++) {
-		if (snapshot[i] != latest[i])
-			return false;
-	}
-	return true;
-}
-
-static bool compare_file(int fd, const char *snapshot, off_t snapshot_len)
-{
-	char *contents;
-	bool same;
-
-	/* over-length read serves as length check. */
-	contents = malloc(snapshot_len+1);
-	same = pread(fd, contents, snapshot_len+1, 0) == snapshot_len
-		&& is_same(snapshot, contents, snapshot_len);
-	free(contents);
-	return same;
-}
-
-static void check_file_intact(int fd)
-{
-	enum agent_return ret;
-	struct stat st;
-	char *contents;
-
-	fstat(fd, &st);
-	contents = malloc(st.st_size);
-	if (pread(fd, contents, st.st_size, 0) != st.st_size) {
-		diag("Read fail");
-		errors++;
-		return;
-	}
-
-	/* Ask agent to open file. */
-	ret = external_agent_operation1(agent, OPEN, TEST_DBNAME);
-
-	/* It's OK to open it, but it must not have changed! */
-	if (!compare_file(fd, contents, st.st_size)) {
-		diag("Agent changed file after opening %s",
-		     agent_return_name1(ret));
-		errors++;
-	}
-
-	if (ret == SUCCESS) {
-		ret = external_agent_operation1(agent, CLOSE, NULL);
-		if (ret != SUCCESS) {
-			diag("Agent failed to close tdb: %s",
-			     agent_return_name1(ret));
-			errors++;
-		}
-	} else if (ret != WOULD_HAVE_BLOCKED) {
-		diag("Agent opening file gave %s",
-		     agent_return_name1(ret));
-		errors++;
-	}
-
-	free(contents);
-}
-
-static void after_unlock(int fd)
-{
-	if (opened)
-		check_file_intact(fd);
-}
-
-static ssize_t pwrite_check(int fd,
-			    const void *buf, size_t count, off_t offset)
-{
-	if (opened)
-		check_file_intact(fd);
-
-	return pwrite(fd, buf, count, offset);
-}
-
-static ssize_t write_check(int fd, const void *buf, size_t count)
-{
-	if (opened)
-		check_file_intact(fd);
-
-	return write(fd, buf, count);
-}
-
-static int ftruncate_check(int fd, off_t length)
-{
-	if (opened)
-		check_file_intact(fd);
-
-	return ftruncate(fd, length);
-
-}
-
-int main(int argc, char *argv[])
-{
-	const int flags[] = { TDB_DEFAULT,
-			      TDB_NOMMAP };
-	int i;
-	struct tdb_context *tdb;
-	TDB_DATA key, data;
-	union tdb_attribute hsize;
-
-	hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
-	hsize.base.next = &tap_log_attr;
-	hsize.tdb1_hashsize.hsize = 1024;
-
-	plan_tests(10);
-	agent = prepare_external_agent1();
-	if (!agent)
-		err(1, "preparing agent");
-
-	unlock_callback1 = after_unlock;
-	for (i = 0; i < sizeof(flags)/sizeof(flags[0]); i++) {
-		diag("Test with %s and %s\n",
-		     "DEFAULT",
-		     (flags[i] & TDB_NOMMAP) ? "no mmap" : "mmap");
-		unlink(TEST_DBNAME);
-		tdb = tdb_open(TEST_DBNAME, flags[i]|TDB_VERSION1,
-			       O_CREAT|O_TRUNC|O_RDWR, 0600,
-			       &hsize);
-		ok1(tdb);
-
-		opened = true;
-		ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
-		key.dsize = strlen("hi");
-		key.dptr = (void *)"hi";
-		data.dptr = (void *)"world";
-		data.dsize = strlen("world");
-
-		ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS);
-		ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
-		ok(!errors, "We had %u open errors", errors);
-
-		opened = false;
-		tdb_close(tdb);
-	}
-
-	return exit_status();
-}