Patchwork [8/8] migration: print expected downtime in info migrate

login
register
mail settings
Submitter Juan Quintela
Date Aug. 18, 2012, 11:17 a.m.
Message ID <1345288635-1369-9-git-send-email-quintela@redhat.com>
Download mbox | patch
Permalink /patch/178451/
State New
Headers show

Comments

Juan Quintela - Aug. 18, 2012, 11:17 a.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 arch_init.c      | 2 ++
 hmp.c            | 4 ++++
 migration.c      | 2 ++
 migration.h      | 1 +
 qapi-schema.json | 5 +++++
 qmp-commands.hx  | 6 ++++++
 6 files changed, 20 insertions(+)
Eric Blake - Aug. 18, 2012, 1:05 p.m.
On 08/18/2012 05:17 AM, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  arch_init.c      | 2 ++
>  hmp.c            | 4 ++++
>  migration.c      | 2 ++
>  migration.h      | 1 +
>  qapi-schema.json | 5 +++++
>  qmp-commands.hx  | 6 ++++++
>  6 files changed, 20 insertions(+)
> 

> +++ b/qmp-commands.hx
> @@ -2244,6 +2244,9 @@ The main json-object contains the following:
>  		 time (json-int)
>  - "downtime": only present when migration has finished correctly
>                  total amount in ms for downtime that happened (json-int)
> +- "expected-downtime": only present while migration is active
> +                total amount in ms for downtime that was calculated on
> +		the last bitmap round (json-int)
>  - "ram": only present if "status" is "active", it is a json-object with the
>    following RAM information (in bytes):
>           - "transferred": amount transferred (json-int)
> @@ -2305,6 +2308,7 @@ Examples:
>              "remaining":123,
>              "total":246,
>              "total-time":12345,
> +	    "expected-downtime":12345,

TAB damage, on several examples.

Patch

diff --git a/arch_init.c b/arch_init.c
index 7eb6e86..3ddfff9 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -539,6 +539,7 @@  static int ram_save_iterate(QEMUFile *f, void *opaque)
     int ret;
     int i;
     uint64_t expected_downtime;
+    MigrationState *s = migrate_get_current();

     bytes_transferred_last = bytes_transferred;
     bwidth = qemu_get_clock_ns(rt_clock);
@@ -594,6 +595,7 @@  static int ram_save_iterate(QEMUFile *f, void *opaque)
     if (expected_downtime <= migrate_max_downtime()) {
         memory_global_sync_dirty_bitmap(get_system_memory());
         expected_downtime = ram_save_remaining() * TARGET_PAGE_SIZE / bwidth;
+        s->expected_downtime = expected_downtime / 1000000; /* ns -> ms */

         return expected_downtime <= migrate_max_downtime();
     }
diff --git a/hmp.c b/hmp.c
index 8f24d9d..dfa4fb0 100644
--- a/hmp.c
+++ b/hmp.c
@@ -151,6 +151,10 @@  void hmp_info_migrate(Monitor *mon)
         monitor_printf(mon, "Migration status: %s\n", info->status);
         monitor_printf(mon, "total time: %" PRIu64 " milliseconds\n",
                        info->total_time);
+        if (info->has_expected_downtime) {
+            monitor_printf(mon, "expected downtime: %" PRIu64 " milliseconds\n",
+                           info->expected_downtime);
+        }
         if (info->has_downtime) {
             monitor_printf(mon, "downtime: %" PRIu64 " milliseconds\n",
                            info->downtime);
diff --git a/migration.c b/migration.c
index 186bcf2..fd069f2 100644
--- a/migration.c
+++ b/migration.c
@@ -168,6 +168,8 @@  MigrationInfo *qmp_query_migrate(Error **errp)
         info->status = g_strdup("active");
         info->total_time = qemu_get_clock_ms(rt_clock)
             - s->total_time;
+        info->has_expected_downtime = true;
+        info->expected_downtime = s->expected_downtime;

         info->has_ram = true;
         info->ram = g_malloc0(sizeof(*info->ram));
diff --git a/migration.h b/migration.h
index dabc333..552200c 100644
--- a/migration.h
+++ b/migration.h
@@ -41,6 +41,7 @@  struct MigrationState
     MigrationParams params;
     int64_t total_time;
     int64_t downtime;
+    int64_t expected_downtime;
     bool enabled_capabilities[MIGRATION_CAPABILITY_MAX];
     int64_t xbzrle_cache_size;
 };
diff --git a/qapi-schema.json b/qapi-schema.json
index 29f601a..fcdabdc 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -353,6 +353,10 @@ 
 #        total downtime in milliseconds for the guest.
 #        (since 1.2)
 #
+# @expected-downtime: #optional only present while migration is active
+#        expected downtime in milliseconds for the guest in last walk
+#        of the dirty bitmap. (since 1.2)
+#
 # Since: 0.14.0
 ##
 { 'type': 'MigrationInfo',
@@ -360,6 +364,7 @@ 
            '*disk': 'MigrationStats',
            '*xbzrle-cache': 'XBZRLECacheStats',
            'total-time': 'int',
+           '*expected-downtime': 'int',
            '*downtime': 'int'} }

 ##
diff --git a/qmp-commands.hx b/qmp-commands.hx
index b5ca99f..2b85802 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2244,6 +2244,9 @@  The main json-object contains the following:
 		 time (json-int)
 - "downtime": only present when migration has finished correctly
                 total amount in ms for downtime that happened (json-int)
+- "expected-downtime": only present while migration is active
+                total amount in ms for downtime that was calculated on
+		the last bitmap round (json-int)
 - "ram": only present if "status" is "active", it is a json-object with the
   following RAM information (in bytes):
          - "transferred": amount transferred (json-int)
@@ -2305,6 +2308,7 @@  Examples:
             "remaining":123,
             "total":246,
             "total-time":12345,
+	    "expected-downtime":12345,
             "duplicate":123,
             "normal":123,
             "normal-bytes":123456
@@ -2323,6 +2327,7 @@  Examples:
             "remaining":1053304,
             "transferred":3720,
             "total-time":12345,
+	    "expected-downtime":12345,
             "duplicate":123,
             "normal":123,
             "normal-bytes":123456
@@ -2347,6 +2352,7 @@  Examples:
             "remaining":1053304,
             "transferred":3720,
             "total-time":12345,
+	    "expected-downtime":12345,
             "duplicate":10,
             "normal":3333,
             "normal-bytes":3412992