github: Restore raft testing on other filesystems

.github/workflows/build-and-test.yml

@@ -26,7 +26,9 @@ jobs:
     - name: Set up dependencies
       run: |
           sudo apt update
-          sudo apt install -y lcov libsqlite3-dev liblz4-dev libuv1-dev
+          sudo apt install -y libsqlite3-dev liblz4-dev libuv1-dev \
+                              linux-libc-dev btrfs-progs xfsprogs zfsutils-linux \
+                              lcov
 
     - name: Build dqlite
       env:
@@ -47,7 +49,16 @@ jobs:
         CC: ${{ matrix.compiler }}
         LIBDQLITE_TRACE: 1
       run: |
-           make check || (cat ./test-suite.log && false)
+           ./test/raft/lib/fs.sh setup
+           export $(test/raft/lib/fs.sh detect)
+           ./unit-test --show-stderr
+           ./integration-test
+           ./raft-core-fuzzy-test
+           ./raft-core-integration-test
+           ./raft-core-unit-test
+           ./raft-uv-integration-test
+           ./raft-uv-unit-test
+           ./test/raft/lib/fs.sh teardown
 
     - name: Coverage
       env:

Makefile.am

@@ -282,6 +282,7 @@ raft_core_fuzzy_test_LDFLAGS = -no-install
 raft_core_fuzzy_test_LDADD = libtest.la libraft.la
 
 raft_uv_unit_test_SOURCES = \
+  src/tracing.c \
   src/raft/err.c \
   src/raft/heap.c \
   src/raft/syscall.c \

configure.ac

@@ -50,6 +50,14 @@ AC_CHECK_HEADERS([linux/io_uring.h linux/aio_abi.h])
 # Checks for library functions and definitions.
 AC_CHECK_DECLS(RWF_NOWAIT, [], [AC_MSG_ERROR(Linux kernel >= 4.14 required.)], [#include <linux/aio_abi.h>])
 
+# Check if zfs >= 0.8.0 is available (for direct I/O support).
+AC_CHECK_PROG(have_zfs, zfs, yes)
+AS_IF([test x"$have_zfs" = x"yes"],
+   [AX_COMPARE_VERSION($(cat /sys/module/zfs/version | cut -f 1 -d -), [ge], [0.8.0],
+       [AC_DEFINE(RAFT_HAVE_ZFS_WITH_DIRECT_IO)], [])
+   ],
+   [])
+
 # Enable large file support. This is mandatory in order to interoperate with
 # libuv, which enables large file support by default, making the size of 'off_t'
 # on 32-bit architecture be 8 bytes instead of the normal 4.
@@ -116,6 +124,7 @@ CC_CHECK_FLAGS_APPEND([AM_CFLAGS],[CFLAGS],[ \
   -Wdate-time \
   -Wnested-externs \
   -Wconversion \
+  -Wno-format-nonliteral \
   -Werror \
 ])
 # To enable:

src/logger.c

@@ -36,10 +36,7 @@ void loggerDefaultEmit(void *data, int level, const char *fmt, va_list args)
 
 	/* Then render the message, possibly truncating it. */
 	n = EMIT_BUF_LEN - strlen(buf) - 1;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 	vsnprintf(cursor, n, fmt, args);
-#pragma GCC diagnostic pop
 
 	fprintf(stderr, "%s\n", buf);
 }

src/raft/client.c

@@ -452,4 +452,3 @@ int raft_transfer(struct raft *r,
 	return rv;
 }
 
-#undef tracef

src/raft/configuration.c

@@ -398,4 +398,3 @@ void configurationTrace(const struct raft *r,
 	}
 	tracef("=== CONFIG END ===");
 }
-#undef tracef

src/raft/convert.c

@@ -268,4 +268,3 @@ void convertToUnavailable(struct raft *r)
 	convertSetState(r, RAFT_UNAVAILABLE);
 }
 
-#undef tracef

src/raft/election.c

@@ -324,4 +324,3 @@ bool electionTally(struct raft *r, size_t voter_index)
 	return votes >= half + 1;
 }
 
-#undef tracef

src/raft/progress.c

@@ -322,4 +322,3 @@ bool progressSnapshotDone(struct raft *r, const unsigned i)
 	return p->match_index >= p->snapshot_index;
 }
 
-#undef tracef

src/raft/recv.c

@@ -222,4 +222,3 @@ int recvUpdateLeader(struct raft *r, const raft_id id, const char *address)
 	return 0;
 }
 
-#undef tracef

src/raft/recv_append_entries.c

@@ -164,4 +164,3 @@ int recvAppendEntries(struct raft *r,
 	return 0;
 }
 
-#undef tracef

src/raft/recv_append_entries_result.c

@@ -72,4 +72,3 @@ int recvAppendEntriesResult(struct raft *r,
 	return 0;
 }
 
-#undef tracef

src/raft/recv_install_snapshot.c

@@ -106,4 +106,3 @@ int recvInstallSnapshot(struct raft *r,
 	return 0;
 }
 
-#undef tracef

src/raft/recv_request_vote.c

@@ -147,4 +147,3 @@ int recvRequestVote(struct raft *r,
 	return 0;
 }
 
-#undef tracef

src/raft/recv_request_vote_result.c

@@ -151,4 +151,3 @@ int recvRequestVoteResult(struct raft *r,
 	return 0;
 }
 
-#undef tracef

src/raft/recv_timeout_now.c

@@ -78,4 +78,3 @@ int recvTimeoutNow(struct raft *r,
 	return 0;
 }
 
-#undef tracef

src/raft/replication.c

@@ -1834,4 +1834,3 @@ inline bool replicationInstallSnapshotBusy(struct raft *r)
 	return r->last_stored == 0 && r->snapshot.put.data != NULL;
 }
 
-#undef tracef

src/raft/snapshot.c

@@ -111,4 +111,3 @@ int snapshotCopy(const struct raft_snapshot *src, struct raft_snapshot *dst)
 	return 0;
 }
 
-#undef tracef

src/raft/start.c

@@ -229,4 +229,3 @@ int raft_start(struct raft *r)
 	return 0;
 }
 
-#undef tracef

src/raft/tick.c

@@ -256,4 +256,3 @@ void tickCb(struct raft_io *io)
 	}
 }
 
-#undef tracef

src/raft/uv.c

@@ -812,4 +812,3 @@ void raft_uv_set_auto_recovery(struct raft_io *io, bool flag)
 	uv->auto_recovery = flag;
 }
 
-#undef tracef

src/raft/uv_finalize.c

@@ -173,4 +173,3 @@ int UvFinalize(struct uv *uv,
 	return 0;
 }
 
-#undef tracef

src/raft/uv_list.c

@@ -113,4 +113,3 @@ int UvList(struct uv *uv,
 	return rv;
 }
 
-#undef tracef

src/raft/uv_prepare.c

@@ -336,4 +336,3 @@ void UvPrepareClose(struct uv *uv)
 	}
 }
 
-#undef tracef

src/raft/uv_recv.c

@@ -420,4 +420,3 @@ void UvRecvClose(struct uv *uv)
 	}
 }
 
-#undef tracef

src/raft/uv_segment.c

@@ -1155,4 +1155,3 @@ int uvSegmentTruncate(struct uv *uv,
 	return rv;
 }
 
-#undef tracef

src/raft/uv_send.c

@@ -516,4 +516,3 @@ void UvSendClose(struct uv *uv)
 	}
 }
 
-#undef tracef

src/raft/uv_snapshot.c

@@ -805,4 +805,3 @@ int UvSnapshotGet(struct raft_io *io,
 	return rv;
 }
 
-#undef tracef

src/raft/uv_truncate.c

@@ -197,4 +197,3 @@ int UvTruncate(struct raft_io *io, raft_index index)
 	return rv;
 }
 
-#undef tracef

src/raft/uv_work.c

@@ -75,4 +75,3 @@ int UvAsyncWork(struct raft_io *io,
 	return rv;
 }
 
-#undef tracef

src/tracing.c

@@ -10,7 +10,7 @@
 #define LIBDQLITE_TRACE "LIBDQLITE_TRACE"
 
 bool _dqliteTracingEnabled = false;
-static unsigned tracer__level;
+static int tracer__level;
 static pid_t tracerPidCached;
 
 void dqliteTracingMaybeEnable(bool enable)
@@ -21,7 +21,7 @@ void dqliteTracingMaybeEnable(bool enable)
 		tracerPidCached = getpid();
 		_dqliteTracingEnabled = enable;
 
-		tracer__level = (unsigned)atoi(trace_level);
+		tracer__level = atoi(trace_level);
 		tracer__level =
 		    tracer__level < TRACE_NR ? tracer__level : TRACE_NONE;
 	}
@@ -36,13 +36,13 @@ static inline const char *tracerShortFileName(const char *fname)
 	return p != NULL ? p + strlen(top_src_dir) : fname;
 }
 
-static inline const char *tracerTraceLevelName(unsigned int level)
+static inline const char *tracerTraceLevelName(int level)
 {
 	static const char *levels[] = {
 	    "NONE", "DEBUG", "INFO", "WARN", "ERROR", "FATAL",
 	};
 
-	return level < ARRAY_SIZE(levels) ? levels[level] : levels[0];
+	return level < (int)ARRAY_SIZE(levels) ? levels[level] : levels[0];
 }
 
 static pid_t tracerPidCached;
@@ -56,9 +56,9 @@ static inline pid_t gettidImpl(void)
 }
 
 static inline void tracerEmit(const char *file,
-			      unsigned int line,
+			      int line,
 			      const char *func,
-			      unsigned int level,
+			      int level,
 			      const char *message)
 {
 	struct timespec ts = {0};
@@ -86,13 +86,25 @@ static inline void tracerEmit(const char *file,
 }
 
 void stderrTracerEmit(const char *file,
-		      unsigned int line,
+		      int line,
 		      const char *func,
-		      unsigned int level,
+		      int level,
 		      const char *message)
 {
 	assert(tracer__level < TRACE_NR);
 
 	if (level >= tracer__level)
 		tracerEmit(file, line, func, level, message);
 }
+
+void tracef0(int level, const char *file, int line, const char *func, const char *fmt, ...)
+{
+	if (UNLIKELY(_dqliteTracingEnabled)) {
+		va_list a;
+		va_start(a, fmt);
+		char msg[1024];
+		vsnprintf(msg, sizeof(msg), fmt, a);
+		stderrTracerEmit(file, line, func, level, msg);
+		va_end(a);
+	}
+}

src/tracing.h

@@ -16,20 +16,12 @@
  * from there on. Users should not manipulate the value of this variable. */
 DQLITE_VISIBLE_TO_TESTS extern bool _dqliteTracingEnabled;
 DQLITE_VISIBLE_TO_TESTS void stderrTracerEmit(const char *file,
-					      unsigned int line,
+					      int line,
 					      const char *func,
-					      unsigned int level,
+					      int level,
 					      const char *message);
 
-#define tracef0(LEVEL, ...)                                            \
-	do {                                                           \
-		if (UNLIKELY(_dqliteTracingEnabled)) {                 \
-			char _msg[1024];                               \
-			snprintf(_msg, sizeof _msg, __VA_ARGS__);      \
-			stderrTracerEmit(__FILE__, __LINE__, __func__, \
-					 (LEVEL), _msg);               \
-		}                                                      \
-	} while (0)
+DQLITE_VISIBLE_TO_TESTS void tracef0(int level, const char *file, int line, const char *func, const char *fmt, ...);
 
 enum dqlite_trace_level {
 	/** Represents an invalid trace level */
@@ -50,7 +42,7 @@ enum dqlite_trace_level {
 	TRACE_NR,
 };
 
-#define tracef(...) tracef0(TRACE_DEBUG, __VA_ARGS__)
+#define tracef(fmt, ...) tracef0(TRACE_DEBUG, __FILE__, __LINE__, __func__, (fmt), ##__VA_ARGS__)
 
 /* Enable tracing if the appropriate env variable is set, or disable tracing. */
 DQLITE_VISIBLE_TO_TESTS void dqliteTracingMaybeEnable(bool enabled);

test/lib/logger.c

@@ -34,10 +34,7 @@ void test_logger_emit(void *data, int level, const char *format, va_list args)
 
 	sprintf(buf + strlen(buf), "%2d -> [%s] ", t->id, level_name);
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 	vsnprintf(buf + strlen(buf), 1024 - strlen(buf), format, args);
-#pragma GCC diagnostic pop
 	munit_log(MUNIT_LOG_INFO, buf);
 	return;
 

test/raft/lib/fs.sh

@@ -43,7 +43,7 @@ fi
 if [ "${cmd}" = "detect" ]; then
     vars=""
     for type in $types; do
-        vars="${vars}RAFT_TMP_$(echo ${type} | tr [a-z] [A-Z])=./tmp/${type} "
+        vars="${vars}RAFT_TMP_$(echo ${type} | tr a-z A-Z)=./tmp/${type} "
     done
     echo $vars
     exit 0

test/raft/lib/runner.h

@@ -4,6 +4,7 @@
 #define TEST_RUNNER_H_
 
 #include "munit.h"
+#include "../../../src/tracing.h"
 
 /* Top-level suites array declaration.
  *
@@ -24,6 +25,7 @@ extern int _main_suites_n;
     int main(int argc, char *argv[MUNIT_ARRAY_PARAM(argc)])        \
     {                                                              \
         MunitSuite suite = {(char *)"", NULL, _main_suites, 1, 0}; \
+        dqliteTracingMaybeEnable(true);                            \
         return munit_suite_main(&suite, (void *)NAME, argc, argv); \
     }
 

test/unit/test_conn.c

@@ -15,6 +15,7 @@
 #include "../../src/lib/transport.h"
 #include "../../src/raft.h"
 #include "../../src/transport.h"
+#include "../../src/tracing.h"
 
 TEST_MODULE(conn);
 
@@ -75,6 +76,7 @@ static void connCloseCb(struct conn *conn)
 	pool_fini(pool_ut_fallback());    \
 	conn__stop(&f->conn_test.conn);   \
 	while (!f->conn_test.closed) {    \
+		tracef("conn_test not yet closed..."); \
 		test_uv_run(&f->loop, 1); \
 	};                                \
 	TEAR_DOWN_RAFT;                   \