search for: btrfs_scrub_status

Properly free the output buffer. --- daemon/btrfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 2f875ae..050bf18 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -1814,7 +1814,7 @@ do_btrfs_scrub_status (const char *path) CLEANUP_FREE char *path_buf = NULL; CLEANUP_FREE char *err = NULL; CLEANUP_FREE_STRING_LIST char **lines = NULL; - char *out; + CLEANUP_FREE char *out = NULL; int r; guestfs_int_btrfsscrub *ret; -- 2.1.0

ACK. I will push these later, for real these time. I have a small build problem on my local machine which prevents me from pushing it today. Thanks, Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-df lists disk usage of guests without needing to install any software inside the

v5: - fix tests failure v4: - add reply_with_error when nlines < 1 - remove `i == X' tests. v3: - rebase on upstream - fix some comments v2: - add check for the length of lines[] - the code parsing 'btrfs scrub -R status' output is changed into a loop Hu Tao (2): New API: btrfs_balance_status New API: btfs_scrub_status daemon/btrfs.c

changes in v2: - add check for the length of lines[] - the code parsing 'btrfs scrub -R status' output is changed into a loop Hu Tao (2): New API: btrfs_balance_status New API: btfs_scrub_status. daemon/btrfs.c | 263 +++++++++++++++++++++++++++++++ generator/actions.ml | 26 +++ generator/structs.ml | 34 ++++

v3: - rebase on upstream - fix some comments v2: - add check for the length of lines[] - the code parsing 'btrfs scrub -R status' output is changed into a loop Hu Tao (2): New API: btrfs_balance_status New API: btfs_scrub_status daemon/btrfs.c | 263 +++++++++++++++++++++++++++++++ generator/actions.ml | 26 +++

v4: - add reply_with_error when nlines < 1 - remove `i == X' tests. v3: - rebase on upstream - fix some comments v2: - add check for the length of lines[] - the code parsing 'btrfs scrub -R status' output is changed into a loop Hu Tao (2): New API: btrfs_balance_status New API: btfs_scrub_status daemon/btrfs.c | 268

On Wed, Jan 21, 2015 at 01:58:02PM +0000, Richard W.M. Jones wrote: > On Fri, Jan 16, 2015 at 10:23:35AM +0800, Hu Tao wrote: > [...] > > Thanks for these patches. I will push all of them shortly *except*: Thanks! > > > New API: btrfs_balance_status > > New API: btrfs_scrub_status > > - These ones currently dump the status into a string. Generally it's > better (although a huge pain) to translate the output of the commands > into structures. The reason is that if we don't do this then we end > up pushing parsing to every consumer of libguestfs. I...

.../MAX_PROC_NR | 2 +- 8 files changed, 186 insertions(+), 1 deletion(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index bb82f32..0f49fb5 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -1768,3 +1768,145 @@ error: return NULL; } + +guestfs_int_btrfsscrub * +do_btrfs_scrub_status (const char *path) +{ + const size_t MAX_ARGS = 64; + const char *argv[MAX_ARGS]; + size_t i = 0; + CLEANUP_FREE char *path_buf = NULL; + CLEANUP_FREE char *err = NULL; + char *out; + int r; + guestfs_int_btrfsscrub *ret; + char **lines; + char *line; + + path_buf = sysroot_path (path);...

.../MAX_PROC_NR | 2 +- 8 files changed, 184 insertions(+), 1 deletion(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 5cebd91..e16aa13 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -1782,3 +1782,143 @@ error: return NULL; } + +guestfs_int_btrfsscrub * +do_btrfs_scrub_status (const char *path) +{ + const size_t MAX_ARGS = 64; + const char *argv[MAX_ARGS]; + size_t i = 0; + CLEANUP_FREE char *path_buf = NULL; + CLEANUP_FREE char *err = NULL; + char *out; + int r; + guestfs_int_btrfsscrub *ret; + char **lines; + + path_buf = sysroot_path (path); + if (path_buf...

Hi, This series adds new APIs to support btrfs scrub, balance, rescue and inspect. Some of them don't have tests because: - btrfs_scrub and btrfs_balance completes too early before we can test btrfs_scrub_cancel, btrfs_scrub_resume, btrfs_scrub_status, btrfs_balance_pause, btrfs_balance_cancel, btrfs_balance_resume and btrfs_balance_status. - can't determine a valid logical address for test btrfs_inspect_logical_resolve. Thank you very much for review! Regards, Hu Hu Tao (16): New API: btrfs_scrub New API: btrf...

Signed-off-by: Hu Tao <hutao at cn.fujitsu.com> --- These two patches are refactored to parse the output info structures. daemon/btrfs.c | 109 +++++++++++++++++++++++++++++++ generator/actions.ml | 10 +++ generator/structs.ml | 12 ++++ gobject/Makefile.inc | 2 + java/Makefile.inc

On Fri, Jan 16, 2015 at 10:23:35AM +0800, Hu Tao wrote: [...] Thanks for these patches. I will push all of them shortly *except*: > New API: btrfs_balance_status > New API: btrfs_scrub_status - These ones currently dump the status into a string. Generally it's better (although a huge pain) to translate the output of the commands into structures. The reason is that if we don't do this then we end up pushing parsing to every consumer of libguestfs. > New API: btrfs_inspec...

...W.M. Jones wrote: > > On Fri, Jan 16, 2015 at 10:23:35AM +0800, Hu Tao wrote: > > [...] > > > > Thanks for these patches. I will push all of them shortly *except*: > > Thanks! > > > > > > New API: btrfs_balance_status > > > New API: btrfs_scrub_status > > > > - These ones currently dump the status into a string. Generally it's > > better (although a huge pain) to translate the output of the commands > > into structures. The reason is that if we don't do this then we end > > up pushing parsing to every con...

This is a follow-up to the other generator changes in: https://www.redhat.com/archives/libguestfs/2017-February/msg00217.html Rich.

...39;t large enough that btrfs_balance completes before we can get its status"; shortdesc = "show the status of a running or paused balance"; @@ -9286,7 +9286,7 @@ Show the status of a running or paused balance on a btrfs filesystem." }; { defaults with name = "btrfs_scrub_status"; added = (1, 29, 26); - style = RStruct ("status", "btrfsscrub"), [Pathname "path"], []; + style = RStruct ("status", "btrfsscrub"), [String (Pathname, "path")], []; optional = Some "btrfs"; camel_name = "BT...

Very large but mechanical change to the generator. Rich.

Split up the huge generator/actions.ml into several smaller files. Rich.

The existing mechanism was clunky, slow and used ~ 10 MB of local disk. Rich.