[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/10] migration/dirtyrate: present dirty rate only when querying
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 10/10] migration/dirtyrate: present dirty rate only when querying the rate has completed |
Date: |
Thu, 8 Oct 2020 20:10:46 +0100 |
From: Chuan Zheng <zhengchuan@huawei.com>
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>
Message-Id: <1601350938-128320-3-git-send-email-zhengchuan@huawei.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/dirtyrate.c | 3 +--
qapi/migration.json | 8 +++-----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
index 40e41e793e..ab9e1301f6 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 7f5e6fd681..974021a5c8 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'} }
--
2.28.0
- [PULL 00/10] migration queue, (continued)
- [PULL 00/10] migration queue, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 01/10] virtiofsd: Silence gcc warning, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 02/10] tools/virtiofsd: add support for --socket-group, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 03/10] virtiofsd: Call qemu_init_exec_dir, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 04/10] virtiofsd: avoid /proc/self/fd tempdir, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 05/10] migration: Pass incoming state into qemu_ufd_copy_ioctl(), Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 06/10] migration: Introduce migrate_send_rp_message_req_pages(), Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 07/10] migration: Maintain postcopy faulted addresses, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 08/10] migration: Sync requested pages after postcopy recovery, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 09/10] migration/dirtyrate: record start_time and calc_time while at the measuring state, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 10/10] migration/dirtyrate: present dirty rate only when querying the rate has completed,
Dr. David Alan Gilbert (git) <=
- Re: [PULL 00/10] migration queue, Peter Maydell, 2020/10/11