)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"9e72f179038e5f89a30da34da3b5917f618e645f","unresolved":true,"context_lines":[{"line_number":59,"context_line":"like the claim operations."},{"line_number":60,"context_line":""},{"line_number":61,"context_line":"Conflicts:"},{"line_number":62,"context_line":"  nova/compute/manager.py"},{"line_number":63,"context_line":"  nova/compute/resource_tracker.py"},{"line_number":64,"context_line":"  nova/conductor/tasks/cross_cell_migrate.py"},{"line_number":65,"context_line":"  nova/tests/unit/compute/test_compute_mgr.py"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"9a18d899_23e04760","line":62,"range":{"start_line":62,"start_character":15,"end_line":62,"end_character":25},"updated":"2021-02-09 19:10:44.000000000","message":"as noted below, the conflict in this file is caused by cross-cell resize patch (If6cdd627f66a66c412f3c1d4997baab3552a9a9c) which was added in Ussuri.","commit_id":"c957bd81bae1f23b566b6a51ae96bdca89897719"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"9e72f179038e5f89a30da34da3b5917f618e645f","unresolved":true,"context_lines":[{"line_number":60,"context_line":""},{"line_number":61,"context_line":"Conflicts:"},{"line_number":62,"context_line":"  nova/compute/manager.py"},{"line_number":63,"context_line":"  nova/compute/resource_tracker.py"},{"line_number":64,"context_line":"  nova/conductor/tasks/cross_cell_migrate.py"},{"line_number":65,"context_line":"  nova/tests/unit/compute/test_compute_mgr.py"},{"line_number":66,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"4e1f7df5_875dee58","line":63,"range":{"start_line":63,"start_character":15,"end_line":63,"end_character":34},"updated":"2021-02-09 19:10:44.000000000","message":"the conflict here is due to the below noted missing \u0027fair lock\u0027 patch","commit_id":"c957bd81bae1f23b566b6a51ae96bdca89897719"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"9e72f179038e5f89a30da34da3b5917f618e645f","unresolved":true,"context_lines":[{"line_number":61,"context_line":"Conflicts:"},{"line_number":62,"context_line":"  nova/compute/manager.py"},{"line_number":63,"context_line":"  nova/compute/resource_tracker.py"},{"line_number":64,"context_line":"  nova/conductor/tasks/cross_cell_migrate.py"},{"line_number":65,"context_line":"  nova/tests/unit/compute/test_compute_mgr.py"},{"line_number":66,"context_line":""},{"line_number":67,"context_line":"NOTE(stephenfin): The bulk of the conflicts are due to the absence of"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"e7476153_05961ce0","line":64,"range":{"start_line":64,"start_character":23,"end_line":64,"end_character":44},"updated":"2021-02-09 19:10:44.000000000","message":"here we are missing a simple comment modification","commit_id":"c957bd81bae1f23b566b6a51ae96bdca89897719"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"9e72f179038e5f89a30da34da3b5917f618e645f","unresolved":true,"context_lines":[{"line_number":62,"context_line":"  nova/compute/manager.py"},{"line_number":63,"context_line":"  nova/compute/resource_tracker.py"},{"line_number":64,"context_line":"  nova/conductor/tasks/cross_cell_migrate.py"},{"line_number":65,"context_line":"  nova/tests/unit/compute/test_compute_mgr.py"},{"line_number":66,"context_line":""},{"line_number":67,"context_line":"NOTE(stephenfin): The bulk of the conflicts are due to the absence of"},{"line_number":68,"context_line":"various cross-cell resize related patches. The only exception is the"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"8f456150_de8a07fd","line":65,"range":{"start_line":65,"start_character":26,"end_line":65,"end_character":45},"updated":"2021-02-09 19:10:44.000000000","message":"same as in manager.py (If6cdd627f66a66c412f3c1d4997baab3552a9a9c).","commit_id":"c957bd81bae1f23b566b6a51ae96bdca89897719"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"1787a890483a0328fd9e3dbc85b40c3067f94883","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"47b7aeeb_3f5da196","updated":"2022-06-15 12:12:10.000000000","message":"\u003e Patch Set 3: Code-Review+1\n\u003e \n\u003e (4 comments)\n\u003e \n\u003e I was hesitant: due to the missing \u0027fair lock\u0027 patch, whether we introduce some regression with this patch (causing an issue similar to the described in patch Ia5e521e0f0c7a78b5ace5de9f343e84d872553f9), but if I understand correctly the lock is already there, the lock is \u0027just\u0027 extended to         contain the migration status update + save + instance.drop_migration_context() calls.\n\u003e \n\u003e Anyway, giving just +1 but ready to give +2 if another stable core confirms that my above thinking is correct and we don\u0027t introduce regression.\n\u003e \n\u003e Otherwise, the backport looks OK to me, merged in Ussuri, conflicts noted (for the next reviewers: see my extra comments for the conflicts inline).\n\nI don\u0027t think this can cause more trouble that what is already described in Ia5e521e0f0c7a78b5ace5de9f343e84d872553f9. We don\u0027t have fair locks in train so that issue remains. But the situation does not get worse.","commit_id":"c957bd81bae1f23b566b6a51ae96bdca89897719"}]}