From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com&gt; Added a new boolean parameter called 'enable_rdma' in the migrate API. This parameter, when set to 'True', adds an extra 'uri' parameter in the libvirt migrate call. This uri parameter is of format 'rdma://<remote_host>' and indicates to libvirt that this is a RDMA migration. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com&gt; --- control/vms.py | 5 +++-- model/vms.py | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/control/vms.py b/control/vms.py index 645cb40..428de94 100644 --- a/control/vms.py +++ b/control/vms.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -81,7 +81,8 @@ class VM(Resource): self.migrate = self.generate_action_handler_task('migrate', ['remote_host', 'user', - 'password']) + 'password', + 'enable_rdma']) self.suspend = self.generate_action_handler('suspend') self.resume = self.generate_action_handler('resume') self.serial = self.generate_action_handler('serial') diff --git a/model/vms.py b/model/vms.py index f752271..7729af0 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -1998,13 +1998,17 @@ class VMModel(object): user ) - def migrate(self, name, remote_host, user=None, password=None): + def migrate(self, name, remote_host, user=None, password=None, + enable_rdma=None): name = name.decode('utf-8') remote_host = remote_host.decode('utf-8') if user is None: user = 'root' + if enable_rdma is None: + enable_rdma = False + self.migration_pre_check(remote_host, user, password) dest_conn = self._get_remote_libvirt_conn(remote_host, user) @@ -2018,7 +2022,8 @@ class VMModel(object): 'dest_conn': dest_conn, 'non_shared': non_shared, 'remote_host': remote_host, - 'user': user} + 'user': user, + 'enable_rdma': enable_rdma} task_id = AsyncTask('/plugins/kimchi/vms/%s/migrate' % name, self._migrate_task, params).id @@ -2030,6 +2035,7 @@ class VMModel(object): non_shared = params['non_shared'] remote_host = params['remote_host'] user = params['user'] + enable_rdma = params['enable_rdma'] cb('starting a migration') @@ -2057,7 +2063,11 @@ class VMModel(object): ) try: - dom.migrate(dest_conn, flags) + if enable_rdma: + param_uri = 'rdma://' + remote_host + dom.migrate(dest_conn, flags, uri=param_uri) + else: + dom.migrate(dest_conn, flags) except libvirt.libvirtError as e: cb('Migrate failed', False) raise OperationFailed('KCHVM0058E', {'err': e.message, -- 2.7.4

Hi Daniel, I said in another occasion that if the VM does not have any network card over RDMA the migration will fail if the user selects to use RDMA, is that correct or I am misunderstanding something? If so, could you, please, add an information message with the RDMA checkbox, informing user about that? Remember, Kimchi user does not have deep knowleadge in virtualization so we need to guide him/her to avoid mistakes. On 01/05/2017 03:41 PM, dhbarboza82(a)gmail.com wrote:

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com&gt; Added a new test for RDMA support in test_livemigration.py. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com&gt; --- tests/test_livemigration.py | 53 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/tests/test_livemigration.py b/tests/test_livemigration.py index 7d7d458..7d49dc1 100644 --- a/tests/test_livemigration.py +++ b/tests/test_livemigration.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -476,3 +476,54 @@ class LiveMigrationTests(unittest.TestCase): 'test_vm_migrate_fake_user', 'fake_password' ) + + @mock.patch('wok.plugins.kimchi.model.vms.VMModel.' + 'migration_pre_check') + @mock.patch('wok.plugins.kimchi.model.vms.VMModel.' + '_get_remote_libvirt_conn') + @mock.patch('libvirt.virDomain.migrate') + def test_vm_livemigrate_RDMA(self, mock_migrate, mock_remote_conn, + mock_precheck): + + mock_remote_conn.return_value = 'remote_conn' + self.create_vm_test() + + try: + # removing cdrom because it is not shared storage and will make + # the migration fail + dev_list = self.inst.vmstorages_get_list('test_vm_migrate') + self.inst.vmstorage_delete('test_vm_migrate', dev_list[0]) + + self.inst.vm_start('test_vm_migrate') + + # to make the VM transient, undefine it while it's running + vm = VMModel.get_vm( + 'test_vm_migrate', + LibvirtConnection('qemu:///system') + ) + vm.undefine() + + self.inst.vm_migrate('test_vm_migrate', + KIMCHI_LIVE_MIGRATION_TEST, + enable_rdma=True) + + flags = (libvirt.VIR_MIGRATE_PEER2PEER | + libvirt.VIR_MIGRATE_LIVE | + libvirt.VIR_MIGRATE_TUNNELLED) + + param_uri = 'rdma://' + KIMCHI_LIVE_MIGRATION_TEST + mock_migrate.assert_called_once_with(vm, flags, param_uri) + + except Exception, e: + # Clean up here instead of rollback because if the + # VM was turned transient and shut down it might + # not exist already - rollback in this case will cause + # a QEMU error + vm = VMModel.get_vm( + 'test_vm_migrate', + LibvirtConnection('qemu:///system') + ) + if vm.isPersistent(): + vm.undefine() + vm.shutdown() + self.fail('Migration test failed: %s' % e.message) -- 2.7.4

On 01/10/2017 10:17 AM, Aline Manera wrote: Yes, there isn't. Back when I first developed this backend the libvirt test driver didn't support the migrate API (and AFAIK still doesn't). I am not sure if creating a mockmodel /migrate API that simply returns '200 OK' when called is worth the trouble, but let me know if you think otherwise and I can see what can be done. Daniel

On 01/10/2017 10:43 AM, Aline Manera wrote: Ok, I'll get it done and send it in the v3. Daniel