From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Thu, 10 Jun 2021 13:06:19 +0000 (+0200)
Subject: sar: Tell the user to convert its file when needed
X-Git-Tag: v12.5.5~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=350d8fc8c2433cdd000fa31333a9b5e3ece6e408;p=sysstat

sar: Tell the user to convert its file when needed

When sar or sadf tries to read a datafile with an old format, tell the
user that he can convert it to current format to be able to read it.
This message is displayed only for datafiles created by sysstat versions
9.1.6 and later. Datafiles older than 9.1.6 cannot be converted.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
---

diff --git a/sa_common.c b/sa_common.c
index eb168dc..87e6363 100644
--- a/sa_common.c
+++ b/sa_common.c
@@ -330,6 +330,8 @@ void display_sa_file_version(FILE *st, struct file_magic *file_magic)
 void handle_invalid_sa_file(int fd, struct file_magic *file_magic, char *file,
 			    int n)
 {
+	unsigned short fmt_magic;
+
 	fprintf(stderr, _("Invalid system activity file: %s\n"), file);
 
 	if (n == FILE_MAGIC_SIZE) {
@@ -337,10 +339,19 @@ void handle_invalid_sa_file(int fd, struct file_magic *file_magic, char *file,
 			/* This is a sysstat file, but this file has an old format */
 			display_sa_file_version(stderr, file_magic);
 
+			fmt_magic = file_magic->sysstat_magic == SYSSTAT_MAGIC ?
+				    file_magic->format_magic : __builtin_bswap16(file_magic->format_magic);
 			fprintf(stderr,
 				_("Current sysstat version cannot read the format of this file (%#x)\n"),
-				file_magic->sysstat_magic == SYSSTAT_MAGIC ?
-				file_magic->format_magic : __builtin_bswap16(file_magic->format_magic));
+				fmt_magic);
+			if (fmt_magic >= FORMAT_MAGIC_2171) {
+				fprintf(stderr,
+					_("Try to convert it to current format. Enter:\n\n"));
+				fprintf(stderr, "sadf -c %s > %s.new\n\n", file, file);
+				fprintf(stderr,
+					_("You should then be able to read the new file created (%s.new)\n"),
+					file);
+			}
 		}
 	}