zhanghailiang <zhang.zhanghaili...@huawei.com> writes:
> Add checkpoint-delay parameter for migrate-set-parameters, so that
> we can control the checkpoint frequency when COLO is in periodic mode.
>
> Cc: Luiz Capitulino <lcapitul...@redhat.com>
> Cc: Eric Blake <ebl...@redhat.com>
> Cc: Markus Armbruster <arm...@redhat.com>
> Signed-off-by: zhanghailiang <zhang.zhanghaili...@huawei.com>
> Signed-off-by: Li Zhijian <lizhij...@cn.fujitsu.com>
> Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> ---
> v12:
> - Change checkpoint-delay to x-checkpoint-delay (Dave's suggestion)
> - Add Reviewed-by tag
> v11:
> - Move this patch ahead of the patch where uses 'checkpoint_delay'
> (Dave's suggestion)
> v10:
> - Fix related qmp command
>
> Signed-off-by: zhanghailiang <zhang.zhanghaili...@huawei.com>
> ---
> hmp.c | 7 +++++++
> migration/migration.c | 24 +++++++++++++++++++++++-
> qapi-schema.json | 19 ++++++++++++++++---
> qmp-commands.hx | 4 ++--
> 4 files changed, 48 insertions(+), 6 deletions(-)
>
> diff --git a/hmp.c b/hmp.c
> index 2140605..ee87d38 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -284,6 +284,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const
> QDict *qdict)
> monitor_printf(mon, " %s: %" PRId64,
>
> MigrationParameter_lookup[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT],
> params->x_cpu_throttle_increment);
> + monitor_printf(mon, " %s: %" PRId64,
> +
> MigrationParameter_lookup[MIGRATION_PARAMETER_X_CHECKPOINT_DELAY],
> + params->x_checkpoint_delay);
> monitor_printf(mon, "\n");
> }
>
> @@ -1237,6 +1240,7 @@ void hmp_migrate_set_parameter(Monitor *mon, const
> QDict *qdict)
> bool has_decompress_threads = false;
> bool has_x_cpu_throttle_initial = false;
> bool has_x_cpu_throttle_increment = false;
> + bool has_x_checkpoint_delay = false;
> int i;
>
> for (i = 0; i < MIGRATION_PARAMETER_MAX; i++) {
> @@ -1256,6 +1260,8 @@ void hmp_migrate_set_parameter(Monitor *mon, const
> QDict *qdict)
> break;
> case MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT:
> has_x_cpu_throttle_increment = true;
> + case MIGRATION_PARAMETER_X_CHECKPOINT_DELAY:
> + has_x_checkpoint_delay = true;
> break;
> }
> qmp_migrate_set_parameters(has_compress_level, value,
> @@ -1263,6 +1269,7 @@ void hmp_migrate_set_parameter(Monitor *mon, const
> QDict *qdict)
> has_decompress_threads, value,
> has_x_cpu_throttle_initial, value,
> has_x_cpu_throttle_increment, value,
> + has_x_checkpoint_delay, value,
> &err);
> break;
> }
> diff --git a/migration/migration.c b/migration/migration.c
> index a1074c3..8988358 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -56,6 +56,11 @@
> /* Migration XBZRLE default cache size */
> #define DEFAULT_MIGRATE_CACHE_SIZE (64 * 1024 * 1024)
>
> +/* The delay time (in ms) between two COLO checkpoints
> + * Note: Please change this default value to 10000 when we support hybrid
> mode.
> + */
> +#define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY 200
> +
> static NotifierList migration_state_notifiers =
> NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
>
> @@ -91,6 +96,8 @@ MigrationState *migrate_get_current(void)
> DEFAULT_MIGRATE_X_CPU_THROTTLE_INITIAL,
> .parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT] =
> DEFAULT_MIGRATE_X_CPU_THROTTLE_INCREMENT,
> + .parameters[MIGRATION_PARAMETER_X_CHECKPOINT_DELAY] =
> + DEFAULT_MIGRATE_X_CHECKPOINT_DELAY,
> };
>
> if (!once) {
> @@ -530,6 +537,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error
> **errp)
> s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INITIAL];
> params->x_cpu_throttle_increment =
> s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT];
> + params->x_checkpoint_delay =
> + s->parameters[MIGRATION_PARAMETER_X_CHECKPOINT_DELAY];
>
> return params;
> }
> @@ -736,7 +745,10 @@ void qmp_migrate_set_parameters(bool has_compress_level,
> bool has_x_cpu_throttle_initial,
> int64_t x_cpu_throttle_initial,
> bool has_x_cpu_throttle_increment,
> - int64_t x_cpu_throttle_increment, Error
> **errp)
> + int64_t x_cpu_throttle_increment,
> + bool has_x_checkpoint_delay,
> + int64_t x_checkpoint_delay,
> + Error **errp)
> {
> MigrationState *s = migrate_get_current();
>
> @@ -771,6 +783,11 @@ void qmp_migrate_set_parameters(bool has_compress_level,
> "x_cpu_throttle_increment",
> "an integer in the range of 1 to 99");
> }
> + if (has_x_checkpoint_delay && (x_checkpoint_delay < 0)) {
> + error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
> + "x_checkpoint_delay",
> + "is invalid, it should be positive");
> + }
>
> if (has_compress_level) {
> s->parameters[MIGRATION_PARAMETER_COMPRESS_LEVEL] = compress_level;
> @@ -791,6 +808,11 @@ void qmp_migrate_set_parameters(bool has_compress_level,
> s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT] =
> x_cpu_throttle_increment;
> }
> +
> + if (has_x_checkpoint_delay) {
> + s->parameters[MIGRATION_PARAMETER_X_CHECKPOINT_DELAY] =
> + x_checkpoint_delay;
> + }
> }
>
> void qmp_migrate_start_postcopy(Error **errp)
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 0423b47..a5699a7 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -623,11 +623,16 @@
> # @x-cpu-throttle-increment: throttle percentage increase each time
> # auto-converge detects that migration is not
> making
> # progress. The default value is 10. (Since 2.5)
> +#
> +# @x-checkpoint-delay: The delay time (in ms) between two COLO checkpoints in
> +# periodic mode. (Since 2.6)
> +#
> # Since: 2.4
> ##
> { 'enum': 'MigrationParameter',
> 'data': ['compress-level', 'compress-threads', 'decompress-threads',
> - 'x-cpu-throttle-initial', 'x-cpu-throttle-increment'] }
> + 'x-cpu-throttle-initial', 'x-cpu-throttle-increment',
> + 'x-checkpoint-delay' ] }
>
> #
> # @migrate-set-parameters
> @@ -647,6 +652,9 @@
> # @x-cpu-throttle-increment: throttle percentage increase each time
> # auto-converge detects that migration is not
> making
> # progress. The default value is 10. (Since 2.5)
> +#
> +# @x-checkpoint-delay: the delay time between two checkpoints. (Since 2.6)
> +#
Unit? I guess it's ms, as above.
> # Since: 2.4
> ##
> { 'command': 'migrate-set-parameters',
> @@ -654,7 +662,8 @@
> '*compress-threads': 'int',
> '*decompress-threads': 'int',
> '*x-cpu-throttle-initial': 'int',
> - '*x-cpu-throttle-increment': 'int'} }
> + '*x-cpu-throttle-increment': 'int',
> + '*x-checkpoint-delay': 'int' } }
>
> #
> # @MigrationParameters
> @@ -673,6 +682,8 @@
> # auto-converge detects that migration is not
> making
> # progress. The default value is 10. (Since 2.5)
> #
> +# @x-checkpoint-delay: the delay time between two COLO checkpoints. (Since
> 2.6)
> +#
Same question.
> # Since: 2.4
> ##
> { 'struct': 'MigrationParameters',
> @@ -680,7 +691,9 @@
> 'compress-threads': 'int',
> 'decompress-threads': 'int',
> 'x-cpu-throttle-initial': 'int',
> - 'x-cpu-throttle-increment': 'int'} }
> + 'x-cpu-throttle-increment': 'int',
> + 'x-checkpoint-delay': 'int'} }
> +
> ##
> # @query-migrate-parameters
> #
x-checkpoint-delay intentionally not added to MigrationInfo?
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index 91979b4..89756c9 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -3651,7 +3651,7 @@ Set migration parameters
> - "compress-level": set compression level during migration (json-int)
> - "compress-threads": set compression thread count for migration (json-int)
> - "decompress-threads": set decompression thread count for migration
> (json-int)
> -
> +- "x-checkpoint-delay": set the delay time for periodic checkpoint (json-int)
Unit?
> Arguments:
>
> Example:
> @@ -3664,7 +3664,7 @@ EQMP
> {
> .name = "migrate-set-parameters",
> .args_type =
> - "compress-level:i?,compress-threads:i?,decompress-threads:i?",
> +
> "compress-level:i?,compress-threads:i?,decompress-threads:i?,x-checkpoint-delay:i?",
> .mhandler.cmd_new = qmp_marshal_migrate_set_parameters,
> },
> SQMP
