| Message ID | 1601350938-128320-3-git-send-email-zhengchuan@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | migration/dirtyrate: optimizations for showing of querying dirtyrate | expand |
On 9/28/20 10:42 PM, Chuan Zheng wrote: > Make dirty_rate field optional, present dirty rate only when querying > the rate has completed. > The qmp results is shown as follow: > @unstarted: > {"return":{"status":"unstarted","start-time":0,"calc-time":0},"id":"libvirt-12"} > @measuring: > {"return":{"status":"measuring","start-time":102931,"calc-time":1},"id":"libvirt-85"} > @measured: > {"return":{"status":"measured","dirty-rate":4,"start-time":150146,"calc-time":1},"id":"libvirt-15"} The "id":"libvirt-..." obviously come from different libvirt sessions, since they are in non-monotonic order. Not a show-stopper, since it is only a commit comment. > > Signed-off-by: Chuan Zheng <zhengchuan@huawei.com> > Reviewed-by: David Edmondson <david.edmondson@oracle.com> > --- > migration/dirtyrate.c | 3 +-- > qapi/migration.json | 8 +++----- > 2 files changed, 4 insertions(+), 7 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com> -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 40e41e7..ab9e130 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -69,9 +69,8 @@ static struct DirtyRateInfo *query_dirty_rate_info(void) struct DirtyRateInfo *info = g_malloc0(sizeof(DirtyRateInfo)); if (qatomic_read(&CalculatingState) == DIRTY_RATE_STATUS_MEASURED) { + info->has_dirty_rate = true; info->dirty_rate = dirty_rate; - } else { - info->dirty_rate = -1; } info->status = CalculatingState; diff --git a/qapi/migration.json b/qapi/migration.json index ce2216c..715c210 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1743,10 +1743,8 @@ # # Information about current dirty page rate of vm. # -# @dirty-rate: @dirtyrate describing the dirty page rate of vm -# in units of MB/s. -# If this field returns '-1', it means querying has not -# yet started or completed. +# @dirty-rate: an estimate of the dirty page rate of the VM in units of +# MB/s, present only when estimating the rate has completed. # # @status: status containing dirtyrate query status includes # 'unstarted' or 'measuring' or 'measured' @@ -1759,7 +1757,7 @@ # ## { 'struct': 'DirtyRateInfo', - 'data': {'dirty-rate': 'int64', + 'data': {'*dirty-rate': 'int64', 'status': 'DirtyRateStatus', 'start-time': 'int64', 'calc-time': 'int64'} }
Make dirty_rate field optional, present dirty rate only when querying the rate has completed. The qmp results is shown as follow: @unstarted: {"return":{"status":"unstarted","start-time":0,"calc-time":0},"id":"libvirt-12"} @measuring: {"return":{"status":"measuring","start-time":102931,"calc-time":1},"id":"libvirt-85"} @measured: {"return":{"status":"measured","dirty-rate":4,"start-time":150146,"calc-time":1},"id":"libvirt-15"} Signed-off-by: Chuan Zheng <zhengchuan@huawei.com> Reviewed-by: David Edmondson <david.edmondson@oracle.com> --- migration/dirtyrate.c | 3 +-- qapi/migration.json | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-)