)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"b07614db610807df9de5e32e35d1b4b78c46edd7","unresolved":true,"context_lines":[{"line_number":17,"context_line":"shared storage (e.g. the nova instances path is backed by NFS)."},{"line_number":18,"context_line":""},{"line_number":19,"context_line":"This patch will fix that behavior so live migration will function"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Closes-Bug: #2080436"},{"line_number":22,"context_line":"Change-Id: Ia2bbb5b4ac728563a8aabd857ed0503449991df1"},{"line_number":23,"context_line":"(cherry picked from commit 035b8404fce878b0a88c4741bea46135b6af51e8)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"3e53b660_fbb4a1cf","line":20,"updated":"2024-09-20 08:17:26.000000000","message":"As you resolved a merge conflict please state what caused the conflict. E.g. what feature / commit missing from this stable branch compared to the newer one causing the conflict.","commit_id":"1cbf0fa64d3563e714bbf7a248259df0549d3e5a"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"edb226f26c931dda87ce0eb5bd454630c475d45e","unresolved":true,"context_lines":[{"line_number":17,"context_line":"shared storage (e.g. the nova instances path is backed by NFS)."},{"line_number":18,"context_line":""},{"line_number":19,"context_line":"This patch will fix that behavior so live migration will function"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Closes-Bug: #2080436"},{"line_number":22,"context_line":"Change-Id: Ia2bbb5b4ac728563a8aabd857ed0503449991df1"},{"line_number":23,"context_line":"(cherry picked from commit 035b8404fce878b0a88c4741bea46135b6af51e8)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"e3fbe8c6_b258e3ee","line":20,"in_reply_to":"3e53b660_fbb4a1cf","updated":"2024-09-25 09:11:23.000000000","message":"nit: also we usually keep here the git generated conflicting file list, like:\n\n    Conflicts:\n      nova/compute/compute_mgr.py\n      \nPlease next time keep it in.","commit_id":"1cbf0fa64d3563e714bbf7a248259df0549d3e5a"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"b07614db610807df9de5e32e35d1b4b78c46edd7","unresolved":true,"context_lines":[{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Closes-Bug: #2080436"},{"line_number":22,"context_line":"Change-Id: Ia2bbb5b4ac728563a8aabd857ed0503449991df1"},{"line_number":23,"context_line":"(cherry picked from commit 035b8404fce878b0a88c4741bea46135b6af51e8)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"eb1d74eb_56ee802b","line":23,"updated":"2024-09-20 08:17:26.000000000","message":"please use cherry-pick -x from the 2024.1 patch to have both cherry-picked line in the commit message.","commit_id":"1cbf0fa64d3563e714bbf7a248259df0549d3e5a"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"edb226f26c931dda87ce0eb5bd454630c475d45e","unresolved":false,"context_lines":[{"line_number":7,"context_line":"Fix regression with live migration on shared storage"},{"line_number":8,"context_line":""},{"line_number":9,"context_line":"The commit c1ccc1a3165ec1556c605b3b036274e992b0a09d introduced"},{"line_number":10,"context_line":"a regression when NUMA live migration was done on shared storage"},{"line_number":11,"context_line":""},{"line_number":12,"context_line":"The live migration support for the power mgmt feature means we need to"},{"line_number":13,"context_line":"call driver.cleanup() for all NUMA instances to potentially offline"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":7,"id":"27925d98_c5a65590","line":10,"updated":"2024-09-25 09:11:23.000000000","message":"note to myself \u0026 reviewers: the mentioned patch [1] was added in 2024.1 Caracal and backported till stable/2023.1, so this can go back till that.\n\n[1] I787bd7807950370cd865f29b95989d489d4826d0","commit_id":"0e4406a33e6907d3b335455a3f3c3ff80045ea0f"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":8864,"name":"Artom Lifshitz","email":"notartom@gmail.com","username":"artom"},"change_message_id":"ea87aeeb488e2459c53de7cfa09df0411fbc6e67","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"dc878a3d_9d088dde","updated":"2024-09-19 20:16:46.000000000","message":"There\u0027s a conflict inline :(","commit_id":"9d5102194f76d52dfe35bbe6e90288a5749a4a05"},{"author":{"_account_id":29268,"name":"Matthew Heler","email":"matthew.heler@hotmail.com","username":"mheler"},"change_message_id":"391eda380e0ab04fcdbb2766ff3425bfc218b897","unresolved":true,"context_lines":[],"source_content_type":"","patch_set":1,"id":"1a9ee3f5_dfb7776d","updated":"2024-09-19 21:15:02.000000000","message":"Was commit https://review.opendev.org/#/q/c1ccc1a3165ec1556c605b3b036274e992b0a09d \neven back ported to 2023.2? I thought only 2024.1 got it","commit_id":"9d5102194f76d52dfe35bbe6e90288a5749a4a05"},{"author":{"_account_id":29268,"name":"Matthew Heler","email":"matthew.heler@hotmail.com","username":"mheler"},"change_message_id":"f8116e218db89312f8251cee12fe3a92e0fe83f9","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"05b4da51_93e5c38c","in_reply_to":"1a9ee3f5_dfb7776d","updated":"2024-09-20 18:02:06.000000000","message":"Done","commit_id":"9d5102194f76d52dfe35bbe6e90288a5749a4a05"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"b07614db610807df9de5e32e35d1b4b78c46edd7","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"387095e6_926e96fc","updated":"2024-09-20 08:17:26.000000000","message":"couple of nits inline to satisfy the stable maintainers.","commit_id":"1cbf0fa64d3563e714bbf7a248259df0549d3e5a"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"edb226f26c931dda87ce0eb5bd454630c475d45e","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"ca98b4f7_cf2aba09","updated":"2024-09-25 09:11:23.000000000","message":"Cherry pick looks good, conflicts noted and resolved correctly. Merged in stable/2024.1. So this is good to go. Thanks Matthew!","commit_id":"0e4406a33e6907d3b335455a3f3c3ff80045ea0f"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"9f68f66a70224483257d5f578e72e19fab45bc06","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"029456a1_332b4113","updated":"2024-09-20 15:51:53.000000000","message":"Thanks looks good now. The commit message states the reason of the diff between this and the 2024.1 version.","commit_id":"0e4406a33e6907d3b335455a3f3c3ff80045ea0f"},{"author":{"_account_id":29268,"name":"Matthew Heler","email":"matthew.heler@hotmail.com","username":"mheler"},"change_message_id":"f8116e218db89312f8251cee12fe3a92e0fe83f9","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"79a32238_1679667a","updated":"2024-09-20 18:02:06.000000000","message":"recheck","commit_id":"0e4406a33e6907d3b335455a3f3c3ff80045ea0f"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"593337dacfe981c50bed20ca56c7c32789488a4a","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"932b425f_8c790670","updated":"2024-09-24 11:32:17.000000000","message":"recheck - nova-grenade-multinode job failed at create phase:\n\n[ERROR] /opt/stack/new/grenade/projects/70_cinder/resources.sh:68 Timed out waiting for volume cinder_grenade_vol3 status to be in-use","commit_id":"0e4406a33e6907d3b335455a3f3c3ff80045ea0f"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"94b3a75129ce281ceb42f3ea10b854dd386cc686","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"162a1352_c8d025bc","updated":"2024-09-24 14:06:15.000000000","message":"recheck - nova-multi-cell job failed this time\n\nwith two issue:\n\n1) test_resize_volume_backed_server_confirm test case failed with:\ntempest.lib.exceptions.SSHTimeout: Connection to the 172.24.5.189 via SSH timed out.\n\nguest console log:\n\nchecking http://169.254.169.254/2009-04-04/instance-id\nfailed 1/20: up 96.77. request failed\nfailed 2/20: up 99.07. request failed\nfailed 3/20: up 101.35. request failed\n\n2) test_instances_with_cinder_volumes_on_all_compute_nodes test case failed with:\ntempest.lib.exceptions.SSHExecCommandFailed: Command \u0027set -eu -o pipefail; PATH\u003d$PATH:/sbin:/usr/sbin; sudo mount /dev/vdb /mnt/961387764/vdb\u0027, exit status: 255, stderr:\nmount: mounting /dev/vdb on /mnt/961387764/vdb failed: Device or resource busy","commit_id":"0e4406a33e6907d3b335455a3f3c3ff80045ea0f"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"97ea3fd8b3d2777f44178d9f517b9e70851f3fad","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"1d6ccfb5_d5d9a60b","updated":"2024-09-25 13:05:28.000000000","message":"recheck failed to ssh to the guest.","commit_id":"0e4406a33e6907d3b335455a3f3c3ff80045ea0f"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"8175497cc34d4984dacc378246f8388a960b6ea3","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"a41bbb77_a5db07eb","updated":"2024-09-23 12:06:30.000000000","message":"recheck kernel panic in guest\n```\n[    0.000000] ---[ end Kernel panic - not syncing: IO-APIC + timer doesn\u0027t work!  Boot with apic\u003ddebug and send a report.  Then try booting with the \u0027noapic\u0027 option. ]---\n\n```","commit_id":"0e4406a33e6907d3b335455a3f3c3ff80045ea0f"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"29adc1ddc08c6ceefea26fbabddfea01c5b42928","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"358e9d6c_00fdab55","updated":"2024-09-23 15:44:14.000000000","message":"recheck one volume related test failed in nova-multi-cell with\n```\nDetails: {\u0027code\u0027: 400, \u0027message\u0027: \u0027Invalid volume: Volume status must be available or error or error_restoring or error_extending or error_managing and must not be migrating, attached, belong to a group, have snapshots, awaiting a transfer, or be disassociated from snapshots after volume transfer.\u0027}\n```","commit_id":"0e4406a33e6907d3b335455a3f3c3ff80045ea0f"}],"nova/compute/manager.py":[{"author":{"_account_id":8864,"name":"Artom Lifshitz","email":"notartom@gmail.com","username":"artom"},"change_message_id":"8588da64a09331c7bb3f19a1d92f3f7ae138697f","unresolved":true,"context_lines":[{"line_number":9200,"context_line":"\u003c\u003c\u003c\u003c\u003c\u003c\u003c HEAD   (be987f Merge \"hardware: Correct log\" into stable/2023.2)"},{"line_number":9201,"context_line":"                          has_vpmem or power_management_possible)"},{"line_number":9202,"context_line":"            destroy_disks \u003d not migrate_data.is_shared_block_storage"},{"line_number":9203,"context_line":"\u003d\u003d\u003d\u003d\u003d\u003d\u003d"},{"line_number":9204,"context_line":"                          has_vpmem or has_mdevs or power_management_possible)"},{"line_number":9205,"context_line":"            destroy_disks \u003d not ("},{"line_number":9206,"context_line":"                    migrate_data.is_shared_block_storage or"}],"source_content_type":"text/x-python","patch_set":1,"id":"0a250ede_3332c114","line":9203,"updated":"2024-09-19 20:17:25.000000000","message":"Doh :(","commit_id":"9d5102194f76d52dfe35bbe6e90288a5749a4a05"},{"author":{"_account_id":29268,"name":"Matthew Heler","email":"matthew.heler@hotmail.com","username":"mheler"},"change_message_id":"5d842299cbe690ae43ba7617ff87d96ea27ea07a","unresolved":false,"context_lines":[{"line_number":9200,"context_line":"\u003c\u003c\u003c\u003c\u003c\u003c\u003c HEAD   (be987f Merge \"hardware: Correct log\" into stable/2023.2)"},{"line_number":9201,"context_line":"                          has_vpmem or power_management_possible)"},{"line_number":9202,"context_line":"            destroy_disks \u003d not migrate_data.is_shared_block_storage"},{"line_number":9203,"context_line":"\u003d\u003d\u003d\u003d\u003d\u003d\u003d"},{"line_number":9204,"context_line":"                          has_vpmem or has_mdevs or power_management_possible)"},{"line_number":9205,"context_line":"            destroy_disks \u003d not ("},{"line_number":9206,"context_line":"                    migrate_data.is_shared_block_storage or"}],"source_content_type":"text/x-python","patch_set":1,"id":"f241edd2_bf9321d5","line":9203,"in_reply_to":"0a250ede_3332c114","updated":"2024-09-19 22:46:31.000000000","message":"Done","commit_id":"9d5102194f76d52dfe35bbe6e90288a5749a4a05"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"b07614db610807df9de5e32e35d1b4b78c46edd7","unresolved":true,"context_lines":[{"line_number":9197,"context_line":"            # storage"},{"line_number":9198,"context_line":"            # vpmem must be cleaned"},{"line_number":9199,"context_line":"            do_cleanup \u003d (not migrate_data.is_shared_instance_path or"},{"line_number":9200,"context_line":"                          has_vpmem or power_management_possible)"},{"line_number":9201,"context_line":"            destroy_disks \u003d not ("},{"line_number":9202,"context_line":"                    migrate_data.is_shared_block_storage or"},{"line_number":9203,"context_line":"                    migrate_data.is_shared_instance_path)"}],"source_content_type":"text/x-python","patch_set":3,"id":"6e442e9d_c2c867c6","line":9200,"updated":"2024-09-20 08:17:26.000000000","message":"I guess the resolved conflict was here due to the has_mdev variable is not present in 2024.1 but was in 2024.2. If that is the case then please mention this in the commit message e.g. like:\n```\n2024.1 only: Conflict resolved in compute/manager.py due to\nbluperint libvirt-mdev-live-migrate is not in 2024.1 and the related\nunit test is removed.\n```","commit_id":"1cbf0fa64d3563e714bbf7a248259df0549d3e5a"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"ffee74454426bd1cbba1928aa5864035fd51720c","unresolved":true,"context_lines":[{"line_number":9197,"context_line":"            # storage"},{"line_number":9198,"context_line":"            # vpmem must be cleaned"},{"line_number":9199,"context_line":"            do_cleanup \u003d (not migrate_data.is_shared_instance_path or"},{"line_number":9200,"context_line":"                          has_vpmem or power_management_possible)"},{"line_number":9201,"context_line":"            destroy_disks \u003d not ("},{"line_number":9202,"context_line":"                    migrate_data.is_shared_block_storage or"},{"line_number":9203,"context_line":"                    migrate_data.is_shared_instance_path)"}],"source_content_type":"text/x-python","patch_set":3,"id":"8f140ff1_591ea6ef","line":9200,"in_reply_to":"6e442e9d_c2c867c6","updated":"2024-09-20 08:18:26.000000000","message":"sorry wrong branch names. \n\n```\n2023.2 only: Conflict resolved in compute/manager.py due to\nbluperint libvirt-mdev-live-migrate is not in 2023.2 and the related\nunit test is removed.\n```","commit_id":"1cbf0fa64d3563e714bbf7a248259df0549d3e5a"}]}