From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 2/2] xfs_mdrestore: correctly account bytes read
Date: Mon, 14 Dec 2015 12:01:06 +1100 [thread overview]
Message-ID: <1450054866-32720-3-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1450054866-32720-1-git-send-email-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
Progess indication comes in the form of a "X MB read" output. This
doesn't match up with the actual number of bytes read from the
metadump file because it only accounts header blocks in the file,
not actual metadata blocks that are restored, Hence the number
reported is usually much lower than the size of the metadump file,
hence it's impossible to use to guage progress of the restore.
While there, fix the progress output so that it overwrites the
previous progress output line correctly.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
mdrestore/xfs_mdrestore.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c
index 5764616..0c0e08a 100644
--- a/mdrestore/xfs_mdrestore.c
+++ b/mdrestore/xfs_mdrestore.c
@@ -133,7 +133,7 @@ perform_restore(
for (;;) {
if (show_progress && (bytes_read & ((1 << 20) - 1)) == 0)
- print_progress("%lld MB read\n", bytes_read >> 20);
+ print_progress("%lld MB read", bytes_read >> 20);
for (cur_index = 0; cur_index < mb_count; cur_index++) {
if (pwrite64(dst_fd, &block_buffer[cur_index <<
@@ -160,7 +160,7 @@ perform_restore(
1, src_f) != 1)
fatal("error reading from file: %s\n", strerror(errno));
- bytes_read += block_size;
+ bytes_read += block_size + (mb_count << tmb.mb_blocklog);
}
if (progress_since_warning)
--
2.5.0
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
prev parent reply other threads:[~2015-12-14 1:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-14 1:01 [PATCH 0/2] xfsprogs: metadump/restore fixes Dave Chinner
2015-12-14 1:01 ` [PATCH 1/2] metadump: bounds check btree block regions being zeroed Dave Chinner
2015-12-14 20:26 ` Eric Sandeen
2015-12-15 11:15 ` Arkadiusz Miśkiewicz
2015-12-14 1:01 ` Dave Chinner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450054866-32720-3-git-send-email-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox