Commit 4075fb1c authored by Juan Quintela's avatar Juan Quintela
Browse files

migration: Create x-multifd-channels parameter 



Indicates the number of channels that we will create.  By default we
create 2 channels.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>

--

Catch inconsistent defaults (eric).
Improve comment stating that number of threads is the same than number
of sockets
Use new DEFIN_PROP_*
Rename x-multifd-threads to x-multifd-threads
parent 30126bbf

hmp.c

+7 −0
Original line number Diff line number Diff line
@@ -336,6 +336,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict) 
        monitor_printf(mon, "%s: %s\n",

            MigrationParameter_str(MIGRATION_PARAMETER_BLOCK_INCREMENTAL),

            params->block_incremental ? "on" : "off");

        monitor_printf(mon, "%s: %" PRId64 "\n",

            MigrationParameter_str(MIGRATION_PARAMETER_X_MULTIFD_CHANNELS),

            params->x_multifd_channels);

    }



    qapi_free_MigrationParameters(params);
@@ -1621,6 +1624,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) 
        p->has_block_incremental = true;

        visit_type_bool(v, param, &p->block_incremental, &err);

        break;

    case MIGRATION_PARAMETER_X_MULTIFD_CHANNELS:

        p->has_x_multifd_channels = true;

        visit_type_int(v, param, &p->x_multifd_channels, &err);

        break;

    default:

        assert(0);

    }

migration/migration.c

+26 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
 * Note: Please change this default value to 10000 when we support hybrid mode.

 */

#define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY 200

#define DEFAULT_MIGRATE_MULTIFD_CHANNELS 2



static NotifierList migration_state_notifiers =

    NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
@@ -481,6 +482,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp) 
    params->x_checkpoint_delay = s->parameters.x_checkpoint_delay;

    params->has_block_incremental = true;

    params->block_incremental = s->parameters.block_incremental;

    params->has_x_multifd_channels = true;

    params->x_multifd_channels = s->parameters.x_multifd_channels;



    return params;

}
@@ -762,6 +765,13 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp) 
                    "is invalid, it should be positive");

        return false;

    }

    if (params->has_x_multifd_channels &&

        (params->x_multifd_channels < 1 || params->x_multifd_channels > 255)) {

        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,

                   "multifd_channels",

                   "is invalid, it should be in the range of 1 to 255");

        return false;

    }



    return true;

}
@@ -880,6 +890,9 @@ static void migrate_params_apply(MigrateSetParameters *params) 
    if (params->has_block_incremental) {

        s->parameters.block_incremental = params->block_incremental;

    }

    if (params->has_x_multifd_channels) {

        s->parameters.x_multifd_channels = params->x_multifd_channels;

    }

}



void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp)
@@ -1458,6 +1471,15 @@ bool migrate_use_multifd(void) 
    return s->enabled_capabilities[MIGRATION_CAPABILITY_X_MULTIFD];

}



int migrate_multifd_channels(void)

{

    MigrationState *s;



    s = migrate_get_current();



    return s->parameters.x_multifd_channels;

}



int migrate_use_xbzrle(void)

{

    MigrationState *s;
@@ -2223,6 +2245,9 @@ static Property migration_properties[] = { 
    DEFINE_PROP_INT64("x-checkpoint-delay", MigrationState,

                      parameters.x_checkpoint_delay,

                      DEFAULT_MIGRATE_X_CHECKPOINT_DELAY),

    DEFINE_PROP_INT64("x-multifd-channels", MigrationState,

                      parameters.x_multifd_channels,

                      DEFAULT_MIGRATE_MULTIFD_CHANNELS),



    /* Migration capabilities */

    DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE),
@@ -2280,6 +2305,7 @@ static void migration_instance_init(Object *obj) 
    params->has_downtime_limit = true;

    params->has_x_checkpoint_delay = true;

    params->has_block_incremental = true;

    params->has_x_multifd_channels = true;

}



/*

migration/migration.h

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ bool migrate_zero_blocks(void); 


bool migrate_auto_converge(void);

bool migrate_use_multifd(void);

int migrate_multifd_channels(void);



int migrate_use_xbzrle(void);

int64_t migrate_xbzrle_cache_size(void);

qapi/migration.json

+21 −3
Original line number Diff line number Diff line
@@ -466,13 +466,19 @@ 
# 	migrated and the destination must already have access to the

# 	same backing chain as was used on the source.  (since 2.10)

#

# @x-multifd-channels: Number of channels used to migrate data in

#                     parallel. This is the same number that the

#                     number of sockets used for migration.  The

#                     default value is 2 (since 2.11)

#

# Since: 2.4

##

{ 'enum': 'MigrationParameter',

  'data': ['compress-level', 'compress-threads', 'decompress-threads',

           'cpu-throttle-initial', 'cpu-throttle-increment',

           'tls-creds', 'tls-hostname', 'max-bandwidth',

           'downtime-limit', 'x-checkpoint-delay', 'block-incremental' ] }

           'downtime-limit', 'x-checkpoint-delay', 'block-incremental',

           'x-multifd-channels'] }



##

# @MigrateSetParameters:
@@ -528,6 +534,11 @@ 
# 	migrated and the destination must already have access to the

# 	same backing chain as was used on the source.  (since 2.10)

#

# @x-multifd-channels: Number of channels used to migrate data in

#                     parallel. This is the same number that the

#                     number of sockets used for migration.  The

#                     default value is 2 (since 2.11)

#

# Since: 2.4

##

# TODO either fuse back into MigrationParameters, or make
@@ -543,7 +554,8 @@ 
            '*max-bandwidth': 'int',

            '*downtime-limit': 'int',

            '*x-checkpoint-delay': 'int',

            '*block-incremental': 'bool' } }

            '*block-incremental': 'bool',

            '*x-multifd-channels': 'int' } }



##

# @migrate-set-parameters:
@@ -614,6 +626,11 @@ 
# 	migrated and the destination must already have access to the

# 	same backing chain as was used on the source.  (since 2.10)

#

# @x-multifd-channels: Number of channels used to migrate data in

#                     parallel. This is the same number that the

#                     number of sockets used for migration.

#                     The default value is 2 (since 2.11)

#

# Since: 2.4

##

{ 'struct': 'MigrationParameters',
@@ -627,7 +644,8 @@ 
            '*max-bandwidth': 'int',

            '*downtime-limit': 'int',

            '*x-checkpoint-delay': 'int',

            '*block-incremental': 'bool' } }

            '*block-incremental': 'bool' ,

            '*x-multifd-channels': 'int' } }



##

# @query-migrate-parameters: