| Posted | Nick | Remark | |
|---|---|---|---|
| #openstack-nova - 2020-04-09 | |||
| 07:32:46 | brinzhang_ | gibi: got it, thanks ^^ | |
| 07:32:55 | brinzhang_ | good morning gibi | |
| 07:33:09 | lyarwood | \o morning all | |
| 07:33:31 | gibi | bauzas: I want to unblock the client patches as we need to release the client today and that need the API patches to land. | |
| 07:33:49 | gibi | lyarwood: o/ | |
| 07:34:13 | gibi | lyarwood: surprise! your 2.87 patches got merge conflicted :/ | |
| 07:37:45 | lyarwood | gibi: /o\ | |
| 07:37:49 | lyarwood | gibi: ./me looks | |
| 07:38:10 | openstackgerrit | Ghanshyam Mann proposed openstack/nova master: Add test coverage of existing server policies https://review.opendev.org/718348 | |
| 07:38:43 | lyarwood | ah stephenfin rebased his series | |
| 07:39:20 | bauzas | gibi: that's totally understandable | |
| 07:39:41 | bauzas | gibi: fwiw, I can also review a few things | |
| 07:40:28 | openstackgerrit | Lee Yarwood proposed openstack/nova master: virt: Provide block_device_info during rescue https://review.opendev.org/700811 | |
| 07:40:29 | openstackgerrit | Lee Yarwood proposed openstack/nova master: libvirt: Add support for stable device rescue https://review.opendev.org/700812 | |
| 07:40:29 | openstackgerrit | Lee Yarwood proposed openstack/nova master: compute: Report COMPUTE_RESCUE_BFV and check during rescue https://review.opendev.org/701429 | |
| 07:40:30 | openstackgerrit | Lee Yarwood proposed openstack/nova master: api: Introduce microverion 2.87 allowing boot from volume rescue https://review.opendev.org/701430 | |
| 07:40:30 | openstackgerrit | Lee Yarwood proposed openstack/nova master: compute: Extract _get_bdm_image_metadata into nova.utils https://review.opendev.org/705212 | |
| 07:40:31 | openstackgerrit | Lee Yarwood proposed openstack/nova master: libvirt: Support boot from volume stable device instance rescue https://review.opendev.org/701431 | |
| 07:41:55 | brinzhang_ | lyarwood: your rebase are not lost +A, surprise | |
| 07:42:21 | brinzhang_ | today I rebased watcher, cyborg project's patch, all lost the +A :( | |
| 07:46:14 | bauzas | brinzhang_: you loose the +W if your rebase impacted your series somewhere | |
| 07:47:04 | bauzas | brinzhang_: if you just rebase on some change or master that just changes SHA1s without really needing to update your series, then meh | |
| 07:47:13 | brinzhang_ | bauzas: you mean, if anything changed, and not conflict in the same place, it will be not lost the +W? | |
| 07:47:41 | lyarwood | brinzhang_: if nothing has changed in your changes you keep the +W | |
| 07:48:26 | brinzhang_ | lyarwood: Got it, I will be concern this in the future ^^, thanks lyarwood, bauzas | |
| 07:56:00 | openstackgerrit | Ghanshyam Mann proposed openstack/nova master: Introduce scope_types in keypairs https://review.opendev.org/718609 | |
| 08:00:25 | bauzas | brinzhang_: fwiw, you can upload your series without having them rebased on the gerrit remote before by using git review -R | |
| 08:00:33 | bauzas | i never use this one tho | |
| 08:01:10 | bauzas | tbc, git review does rebase on the gerrit git remote you have locally (and which is updated) before it does send it to Gerrit | |
| 08:01:28 | bauzas | brinzhang: this is the step you can skip with the -R flag | |
| 08:06:00 | openstackgerrit | Lee Yarwood proposed openstack/nova master: libvirt: Break up get_disk_mapping within blockinfo https://review.opendev.org/714962 | |
| 08:06:01 | openstackgerrit | Lee Yarwood proposed openstack/nova master: fup: Combine SUPPORTED_DEVICE_BUS and SUPPORTED_STORAGE_BUSES https://review.opendev.org/718448 | |
| 08:06:01 | openstackgerrit | Lee Yarwood proposed openstack/nova master: fup: Remove the use of the term `unstable rescue` INFO logs https://review.opendev.org/718451 | |
| 08:06:01 | openstackgerrit | Lee Yarwood proposed openstack/nova master: fup: Add missing docstrings from get_rescue_device|bus diskinfo funcs https://review.opendev.org/718464 | |
| 08:06:20 | lyarwood | I'm using it at the moment to avoid rebasing mine and stephenfin's unmerged stuff | |
| 08:09:09 | bauzas | lyarwood: good call | |
| 08:11:00 | brinzhang | bauzas: I have nerver used this, do you have some docs that I can reference, I would like to study ^^ | |
| 08:20:27 | bauzas | brinzhang: not more than https://docs.openstack.org/infra/git-review/usage.html | |
| 08:22:41 | brinzhang | bauzas: "git review -R" not any suffix? that I can directly run it, and that can skip "git rebase i xxx" | |
| 08:24:12 | bauzas | it's just a flag | |
| 08:24:22 | bauzas | you can use any other one for uploading | |
| 08:24:34 | bauzas | of course git review -d -R doesn't make any sense | |
| 08:24:43 | bauzas | since you download instead | |
| 08:25:02 | brinzhang | I always use git review -d id | |
| 08:25:16 | gibi | stephenfin: could you hit https://review.opendev.org/#/c/712651 when you are up? | |
| 08:27:20 | gibi | bauzas: if you have time, could you re-review https://review.opendev.org/#/c/718357 ? | |
| 08:28:08 | gibi | stephenfin: the tests in custom trait handling needs tweeking https://review.opendev.org/#/c/718461 | |
| 08:30:23 | gibi | we need somebody other than stephen who feels good about +2ing https://review.opendev.org/#/c/700812 in lyarwood's series. that part of nova is not my strong suite so I'm only +1 | |
| 08:31:21 | bauzas | gibi: sure thing, I'm available for upstream this week | |
| 08:32:41 | brinzhang | gibi: I have a question in https://review.opendev.org/#/c/712651/19/novaclient/v2/shell.py@2741 | |
| 08:33:09 | brinzhang | gibi: do we need add default=None to --no-delete-on-termination? and why? | |
| 08:33:18 | gibi | brinzhang: let me check that | |
| 08:33:22 | gibi | bauzas: thanks | |
| 08:33:41 | gibi | brinzhang: I copied stephenfin's solution from the reworked 2.83 patch | |
| 08:34:21 | brinzhang | I reviewed the config_drive form stephenfin, I also find he also set for the --no-config-drive | |
| 08:34:28 | gibi | ohh | |
| 08:34:32 | brinzhang | I think it's ok, but I dont know why | |
| 08:34:39 | gibi | I will look | |
| 08:35:02 | brinzhang | s/ also set / also not set | |
| 08:35:29 | gibi | ahh, then I copied well at least :D | |
| 08:36:07 | brinzhang | gibi: yeah, I think stephenfin can answer why ^^ | |
| 08:36:58 | openstackgerrit | Kevin Zhao proposed openstack/nova master: libvirt: change UEFI check to handle AArch64 better https://review.opendev.org/714311 | |
| 08:37:23 | bauzas | gibi: stephenfin: mmm, something is still wrong with https://review.opendev.org/#/c/718461/3 https://5f439afd55f568b98179-509bae49365f8635e29d5b96780095d8.ssl.cf5.rackcdn.com/718461/3/check/openstack-tox-py37/bd3dc11/testr_results.html | |
| 08:38:17 | gibi | bauzas: yepp, I think the regex changed and therefore the name of the namespace changed, so the test needs to be updated | |
| 08:38:25 | gibi | I let stephenfin do that so we can +2 it | |
| 08:39:58 | brinzhang | bauzas: https://review.opendev.org/#/c/718357/ this patch and https://review.opendev.org/#/c/701430 from lyarwood all modified rest_api_version_history.rst, do you think is there a conflict? | |
| 08:43:48 | gibi | brinzhang: looking at the change they are separate by unchanged lines so I think git will manage to merge it | |
| 08:45:47 | bauzas | brinzhang: gibi: sorry a bit distracted due to the kids :) | |
| 08:46:28 | brinzhang | gibi: yes, it's ok, I tested in local used: | |
| 08:46:34 | brinzhang | git review -d 701430 | |
| 08:46:39 | brinzhang | git review -x 718357 | |
| 08:47:19 | brinzhang | I think I should simulate a scenario to check "git review -R", thanks gibi, bauzas | |
| 08:47:32 | openstackgerrit | Ghanshyam Mann proposed openstack/nova master: Introduce scope_types in servers Policies https://review.opendev.org/662968 | |
| 08:47:57 | bauzas | brinzhang: since recent revisions, Gerrit now tells you whether it would create a merge conflict | |
| 08:48:02 | openstackgerrit | Ghanshyam Mann proposed openstack/nova master: Introduce scope_types in servers Policies https://review.opendev.org/662968 | |
| 08:48:07 | bauzas | I mean, the Gerrit UI | |
| 08:48:59 | gibi | I never used git review. I like the full controll of git push <remote> <what>:refs/for/<branch>/topic | |
| 08:49:18 | gibi | I mean <topic> | |
| 08:49:24 | brinzhang_ | bauzas: yeah, I know, but that until the patch merged then we can know whether conflict from gerrit | |
| 08:49:45 | huaqiang | :qa | |
| 08:49:47 | huaqiang | exit | |
| 08:49:51 | huaqiang | :( | |
| 08:50:19 | bauzas | brinzhang: no, you can test on your local git repo | |
| 08:50:22 | brinzhang_ | ah, I was dropped, I think I missed what did you said above, gibi | |
| 08:50:42 | gibi | I never used git review. I like the full controll of git push <remote> | |
| 08:50:45 | gibi | <what>:refs/for/<branch>/topic | |
| 08:50:48 | bauzas | brinzhang: you have a local git remote on your git repo that's named 'gerrit' | |
| 08:50:54 | bauzas | git remote -v | grep gerrit | |
| 08:51:14 | brinzhang_ | bauzas: yeah, I know, it's in the project's git/config | |
| 08:51:24 | bauzas | correct | |
| 08:51:31 | bauzas | so you can basically test what you want | |
| 08:51:48 | brinzhang_ | I mean, Gerrit cannot know the merged conflict, if the patch doesnot merge | |
| 08:52:21 | brinzhang_ | in local I am easy to know which is conflict | |
| 08:52:30 | brinzhang_ | s/am/can | |
| 08:52:53 | openstackgerrit | Ghanshyam Mann proposed openstack/nova master: Add new default roles in keypairs policies https://review.opendev.org/718619 | |
| 08:53:04 | bauzas | maybe I misunderstand you | |
| 08:53:34 | bauzas | you mean that you can't predict that Zuul will tell you a merge conflict if there are concurrent patches coming by, if so yes I agree | |
| 08:53:40 | brinzhang_ | gibi: yes, git push gave by gerrit form patch's "Download" tag | |
| 08:54:13 | brinzhang_ | bauzas: yes, that's what I want to say | |
| 08:54:37 | bauzas | ... and nobody can :-) | |