From 6c27db46dacb827f46dfbd5fa83c828fd81db991 Mon Sep 17 00:00:00 2001

Message-Id: <6c27db46dacb827f46dfbd5fa83c828fd81db991.1668799549.git.boris@bur.io>

In-Reply-To: <cover.1668799549.git.boris@bur.io>

References: <cover.1668799549.git.boris@bur.io>

From: Filipe Manana <fdmanana@suse.com>

Date: Tue, 15 Nov 2022 16:25:24 +0000

Subject: [PATCH 1/3] btrfs-progs: receive: add debug messages when processing

 encoded writes

Unlike for commands from the v1 stream, we have no debug messages logged

when processing encoded write commands, which makes it harder to debug

issues.

So add log messages, when the log verbosity level is >= 3, for encoded

write commands, mentioning the value of all fields and also log when we

fallback from an encoded write to the decompress and write approach.

The log messages look like this:

  encoded_write f3 - offset=33792, len=4096, unencoded_offset=33792, unencoded_file_len=31744, unencoded_len=65536, compression=1, encryption=0

  encoded_write f3 - falling back to decompress and write due to errno 22 ("Invalid argument")

Signed-off-by: Filipe Manana <fdmanana@suse.com>

Reviewed-by: Boris Burkov <boris@bur.io>

---

 cmds/receive.c | 11 +++++++++++

 1 file changed, 11 insertions(+)

diff --git a/cmds/receive.c b/cmds/receive.c

index af3138d5..ce615e7c 100644

--- a/cmds/receive.c

+++ b/cmds/receive.c

@@ -1246,6 +1246,13 @@ static int process_encoded_write(const char *path, const void *data, u64 offset,

 		.encryption = encryption,

 	};

+	if (bconf.verbose >= 3)

+		fprintf(stderr,

+"encoded_write %s - offset=%llu, len=%llu, unencoded_offset=%llu, unencoded_file_len=%llu, unencoded_len=%llu, compression=%u, encryption=%u\n",

+			path, offset, len, unencoded_offset, unencoded_file_len,

+			unencoded_len, compression, encryption);

+

+

 	if (encryption) {

 		error("encoded_write: encryption not supported");

 		return -EOPNOTSUPP;

@@ -1271,6 +1278,10 @@ static int process_encoded_write(const char *path, const void *data, u64 offset,

 			error("encoded_write: writing to %s failed: %m", path);

 			return ret;

 		}

+		if (bconf.verbose >= 3)

+			fprintf(stderr,

+"encoded_write %s - falling back to decompress and write due to errno %d (\"%m\")\n",

+				path, errno);

 	}

 	return decompress_and_write(rctx, data, offset, len, unencoded_file_len,

-- 

2.38.1