| *** wuchunyang has joined #openstack-lbaas | 01:20 | |
| *** wuchunyang has quit IRC | 01:25 | |
| *** sapd1_x has quit IRC | 01:41 | |
| *** sapd1_x has joined #openstack-lbaas | 02:19 | |
| *** sapd1_x has quit IRC | 02:29 | |
| *** sapd1_x has joined #openstack-lbaas | 02:43 | |
| *** vishalmanchanda has joined #openstack-lbaas | 03:03 | |
| *** sapd1 has quit IRC | 03:16 | |
| *** psachin has joined #openstack-lbaas | 03:37 | |
| *** ramishra has joined #openstack-lbaas | 03:37 | |
| *** openstack has joined #openstack-lbaas | 04:24 | |
| *** ChanServ sets mode: +o openstack | 04:24 | |
| *** gcheresh has joined #openstack-lbaas | 04:29 | |
| *** wuchunyang has joined #openstack-lbaas | 04:44 | |
| *** wuchunyang has quit IRC | 05:19 | |
| openstackgerrit | jacky06 proposed openstack/octavia-tempest-plugin master: Remove all usage of six library https://review.opendev.org/725758 | 05:21 |
|---|---|---|
| *** wuchunyang has joined #openstack-lbaas | 05:28 | |
| *** cgoncalves has joined #openstack-lbaas | 05:37 | |
| *** wuchunyang has quit IRC | 06:08 | |
| *** yamamoto has joined #openstack-lbaas | 06:18 | |
| *** yamamoto has quit IRC | 06:24 | |
| *** ccamposr__ has joined #openstack-lbaas | 06:30 | |
| *** ccamposr has quit IRC | 06:32 | |
| *** JayLiu7319 has quit IRC | 06:48 | |
| *** maciejjozefczyk has joined #openstack-lbaas | 06:52 | |
| *** ccamposr__ has quit IRC | 07:11 | |
| *** rpittau|afk is now known as rpittau | 07:31 | |
| *** cgoncalves has quit IRC | 07:34 | |
| *** cgoncalves has joined #openstack-lbaas | 07:40 | |
| *** openstackstatus has quit IRC | 07:46 | |
| *** openstack has joined #openstack-lbaas | 07:50 | |
| *** ChanServ sets mode: +o openstack | 07:50 | |
| *** wuchunyang has joined #openstack-lbaas | 07:54 | |
| *** ccamposr__ has joined #openstack-lbaas | 07:55 | |
| *** ccamposr has quit IRC | 07:57 | |
| *** dmellado has quit IRC | 07:58 | |
| *** dmellado has joined #openstack-lbaas | 08:04 | |
| openstackgerrit | OpenStack Proposal Bot proposed openstack/octavia-dashboard stable/ussuri: Imported Translations from Zanata https://review.opendev.org/725784 | 08:27 |
| *** salmankhan has joined #openstack-lbaas | 08:33 | |
| *** salmankhan has quit IRC | 08:44 | |
| *** salmankhan has joined #openstack-lbaas | 08:45 | |
| *** ataraday_ has joined #openstack-lbaas | 08:54 | |
| *** strigazi has joined #openstack-lbaas | 09:00 | |
| *** rpittau is now known as rpittau|bbl | 09:44 | |
| *** wuchunyang has quit IRC | 10:04 | |
| *** maciejjozefczyk_ has joined #openstack-lbaas | 10:43 | |
| *** maciejjozefczyk has quit IRC | 10:44 | |
| *** maciejjozefczyk has joined #openstack-lbaas | 10:44 | |
| *** maciejjozefczyk_ has quit IRC | 10:48 | |
| *** maciejjozefczyk_ has joined #openstack-lbaas | 10:49 | |
| *** maciejjozefczyk has quit IRC | 10:50 | |
| *** maciejjozefczyk has joined #openstack-lbaas | 10:50 | |
| *** maciejjozefczyk_ has quit IRC | 10:53 | |
| *** wuchunyang has joined #openstack-lbaas | 10:54 | |
| *** maciejjozefczyk_ has joined #openstack-lbaas | 10:55 | |
| *** maciejjozefczyk has quit IRC | 10:55 | |
| *** livelace has joined #openstack-lbaas | 11:01 | |
| *** maciejjozefczyk_ has quit IRC | 11:04 | |
| *** maciejjozefczyk_ has joined #openstack-lbaas | 11:05 | |
| *** servagem has joined #openstack-lbaas | 11:34 | |
| *** yamamoto has joined #openstack-lbaas | 11:40 | |
| *** yamamoto has quit IRC | 11:42 | |
| *** sapd1 has joined #openstack-lbaas | 11:46 | |
| rm_work | someone recheck https://review.opendev.org/#/c/725098/ next time it finishes? I want to see minimum 4 passes in a row before merging that | 11:47 |
| rm_work | i *do not* trust grenade | 11:47 |
| cgoncalves | rm_work, ack. grenade can explode in our hands, I get it | 11:51 |
| cgoncalves | rm_work, stein gate fix: https://review.opendev.org/#/c/725337/ | 11:51 |
| rm_work | ah damn, stein gate broken? just +W'd some backports :/ | 11:52 |
| cgoncalves | think they were all non-stein patches | 11:52 |
| rm_work | hmm | 11:53 |
| openstackgerrit | Merged openstack/python-octaviaclient master: Remove mocking of functools.partial https://review.opendev.org/725685 | 11:57 |
| openstackgerrit | Merged openstack/python-octaviaclient master: Remove Babel requirement https://review.opendev.org/720778 | 11:57 |
| *** sapd1_x has quit IRC | 11:59 | |
| *** livelace has quit IRC | 12:13 | |
| rm_work | yep :D nice | 12:16 |
| *** rpittau|bbl is now known as rpittau | 12:18 | |
| *** tkajinam has joined #openstack-lbaas | 12:34 | |
| *** cgoncalves has quit IRC | 13:19 | |
| *** wuchunyang has quit IRC | 13:25 | |
| *** cgoncalves has joined #openstack-lbaas | 13:25 | |
| *** TrevorV has joined #openstack-lbaas | 13:31 | |
| *** livelace has joined #openstack-lbaas | 13:34 | |
| *** maciejjozefczyk_ is now known as maciejjozefczyk | 13:37 | |
| haleyb | johnsom: it took me a while to track that down in the neutron tree, but i could never find a way around it short of removing it | 13:39 |
| openstackgerrit | Merged openstack/octavia stable/train: Add a periodic image build job https://review.opendev.org/706394 | 13:42 |
| openstackgerrit | Merged openstack/octavia stable/train: Fix padding logic for UDP health daemon https://review.opendev.org/723393 | 13:56 |
| openstackgerrit | Merged openstack/octavia stable/queens: Fix the amphora noop driver https://review.opendev.org/723370 | 13:56 |
| *** livelace has quit IRC | 13:59 | |
| *** livelace has joined #openstack-lbaas | 14:01 | |
| cgoncalves | bah, rocky gate is broken again. jobs are installing py3-only octavia-tempest-plugin | 15:24 |
| johnsom | I was wondering when that was going to happen | 15:24 |
| johnsom | The other projects are pinning to the last tagged version of the plugin. | 15:25 |
| cgoncalves | I thought we/gmann had fixed those but guess not | 15:25 |
| johnsom | This is how I did it for designate: https://review.opendev.org/#/c/725345/2/.zuul.yaml | 15:25 |
| johnsom | Should I put up some patches or do you want to? | 15:26 |
| nmickus | johnsom I made some updates to the listeners CLI patch, could you check them before I do the pools? | 15:26 |
| cgoncalves | oh, I think I remember. gmann set override-checkout on the -xenial job | 15:26 |
| cgoncalves | we probably need to do the same on the xenial base jobs too | 15:27 |
| johnsom | nmickus Sure, give me a few minutes | 15:27 |
| cgoncalves | johnsom, thanks for the tip! | 15:27 |
| johnsom | NP | 15:27 |
| KeithMnemonic | johnsom: just to cycleback about my traffic ops tempest question. for some reason it uses a go based httpd.bin which does not work in cirros | 15:29 |
| KeithMnemonic | probably need to add a note about min requirements for that test | 15:29 |
| johnsom | KeithMnemonic We wrote it specifically for cirros. That go app is run in all of our tempest tests | 15:29 |
| KeithMnemonic | if i run it, it says file not found | 15:31 |
| KeithMnemonic | i can show you | 15:31 |
| KeithMnemonic | i boot a cirros, manually copy httpd.bin and do ./httpd.bin and it says file not found | 15:31 |
| johnsom | https://github.com/openstack/octavia-tempest-plugin/tree/master/octavia_tempest_plugin/contrib/test_server | 15:31 |
| KeithMnemonic | for ubuntu, opensuse it prints a help message | 15:32 |
| johnsom | Well, we renamed it when we added UDP | 15:32 |
| KeithMnemonic | on rocky it is still httpd.bin | 15:32 |
| johnsom | Yeah. It's a static linked, so has no other dependencies. I assume you are getting it from that directory in that repo? | 15:33 |
| KeithMnemonic | hmm let me see where it gets that from, maybe rpm-packaging | 15:33 |
| johnsom | nmickus That looks good to me | 15:34 |
| KeithMnemonic | rpm packaging gets this one https://tarballs.openstack.org/octavia-tempest-plugin/octavia-tempest-plugin-0.2.0.tar.gz | 15:35 |
| johnsom | keithmnemonic Have you tried running it with the full path? Cirros runs with a very basic shell, maybe that is the issue you have? | 15:35 |
| KeithMnemonic | which still has httpd and not test_server | 15:36 |
| johnsom | Yeah, we only renamed it when we added UDP to it | 15:36 |
| johnsom | Yeah, that is the rocky build. It works fine in our tempest gate jobs.... | 15:37 |
| KeithMnemonic | $ /home/cirros/httpd.bin | 15:37 |
| KeithMnemonic | -sh: /home/cirros/httpd.bin: not found | 15:37 |
| johnsom | What does ls -al give? | 15:37 |
| KeithMnemonic | -rwxr-xr-x 1 cirros cirros 4293448 May 5 17:06 httpd.bin | 15:39 |
| KeithMnemonic | same binary works fine on opensuse | 15:39 |
| openstackgerrit | Carlos Goncalves proposed openstack/octavia stable/rocky: Do not run Tempest in octavia-grenade job https://review.opendev.org/725901 | 15:39 |
| KeithMnemonic | exit | 15:39 |
| KeithMnemonic | opensuse@leap3:~> /home/opensuse/httpd.bin -h | 15:40 |
| KeithMnemonic | Usage of /home/opensuse/httpd.bin: | 15:40 |
| KeithMnemonic | -id string | 15:40 |
| KeithMnemonic | Server ID (default "1") | 15:40 |
| KeithMnemonic | -port int | 15:40 |
| KeithMnemonic | TCP port to listen on (default 8080) | 15:40 |
| KeithMnemonic | and as i said fine on ubuntu as well | 15:40 |
| johnsom | Here is how we install and run in the gate job: https://github.com/openstack/octavia-tempest-plugin/blob/master/octavia_tempest_plugin/tests/test_base.py#L854 | 15:40 |
| KeithMnemonic | once i swapped the tempest image to an opensuse it got past the check_webserver status error it was getting | 15:41 |
| johnsom | Maybe that version has the Go problem where they ballooned the memory required. Try "echo 1 > /proc/sys/vm/overcommit_memory" before you run it | 15:41 |
| *** gcheresh has quit IRC | 15:41 | |
| KeithMnemonic | nope | 15:43 |
| KeithMnemonic | here is the issue | 15:43 |
| KeithMnemonic | $ ldd /home/cirros/httpd.bin | 15:43 |
| KeithMnemonic | checking sub-depends for '/lib64/libpthread.so.0' | 15:43 |
| KeithMnemonic | ld64-uClibc.so.0 => /lib/ld64-uClibc.so.0 (0x7fa0a17df000) | 15:43 |
| KeithMnemonic | libdl.so.0 => /lib/libdl.so.0 (0x7fa0a15db000) | 15:43 |
| KeithMnemonic | libc.so.0 => /lib/libc.so.0 (0x7fa0a1371000) | 15:43 |
| KeithMnemonic | checking sub-depends for 'not found' | 15:43 |
| KeithMnemonic | libpthread.so.0 => /lib64/libpthread.so.0 (0x00000000) | 15:43 |
| KeithMnemonic | libc.so.6 => not found (0x00000000) | 15:43 |
| KeithMnemonic | /lib/ld64-uClibc.so.0 => /lib/ld64-uClibc.so.0 (0x00000000) | 15:43 |
| KeithMnemonic | can find libc in the default cirros | 15:43 |
| KeithMnemonic | i checked a cirros .5 as well | 15:43 |
| johnsom | We staticly compile it, so it should not be looking for shared libraries. | 15:46 |
| KeithMnemonic | let me try the current version | 15:47 |
| KeithMnemonic | but rpm-packaging is not pulling the current one | 15:47 |
| johnsom | $ file httpd.bin | 15:48 |
| johnsom | httpd.bin: ELF 64-bit LSB executable, x86-64, version 1 (GNU/Linux), statically linked, for GNU/Linux 2.6.32, BuildID[sha1]=aa8b01634784c9783c1e38db9422c21f3c4e097c, stripped | 15:48 |
| johnsom | I serious, we run that in cirros for every patch on stable/rocky. There is something strange with your version | 15:48 |
| johnsom | It also should be larger in size. I think someone recompiled it wrong for you. | 15:49 |
| johnsom | $ ls -al httpd.bin | 15:49 |
| johnsom | -rwxrwxr-x 1 johnsom johnsom 6421240 May 6 08:47 httpd.bin | 15:49 |
| KeithMnemonic | hmm that is interesting, let me go recheck that | 15:50 |
| KeithMnemonic | the rpm pkg has a bigger size as well | 15:50 |
| KeithMnemonic | and that is what we install from | 15:50 |
| KeithMnemonic | https://github.com/openstack/rpm-packaging/blob/stable/rocky/openstack/octavia-tempest-plugin/octavia-tempest-plugin.spec.j2#L43-L49 | 15:51 |
| KeithMnemonic | does this look wrong? https://github.com/openstack/rpm-packaging/blob/stable/rocky/openstack/octavia-tempest-plugin/octavia-tempest-plugin.spec.j2#L47 | 15:52 |
| johnsom | Yes. Looks like someone didn't read the README | 15:52 |
| johnsom | https://github.com/openstack/octavia-tempest-plugin/blob/master/octavia_tempest_plugin/contrib/test_server/README.rst | 15:53 |
| KeithMnemonic | i can patch rpm-packaging | 15:53 |
| KeithMnemonic | thanks johnsom: for helping me track this down | 15:55 |
| johnsom | Sure, NP | 15:55 |
| johnsom | #startmeeting Octavia | 16:01 |
| openstack | Meeting started Wed May 6 16:01:00 2020 UTC and is due to finish in 60 minutes. The chair is johnsom. Information about MeetBot at http://wiki.debian.org/MeetBot. | 16:01 |
| *** maciejjozefczyk has quit IRC | 16:01 | |
| openstack | Useful Commands: #action #agreed #help #info #idea #link #topic #startvote. | 16:01 |
| *** openstack changes topic to " (Meeting topic: Octavia)" | 16:01 | |
| openstack | The meeting name has been set to 'octavia' | 16:01 |
| johnsom | #chair rm_work | 16:01 |
| openstack | Current chairs: johnsom rm_work | 16:01 |
| haleyb | hi | 16:01 |
| cgoncalves | hi | 16:01 |
| ataraday_ | hi | 16:01 |
| johnsom | I am not sure if rm_work is around to host today or not. Next week is his last week as PTL for Ussuri.... | 16:02 |
| johnsom | #topic Announcements | 16:02 |
| *** openstack changes topic to "Announcements (Meeting topic: Octavia)" | 16:02 | |
| johnsom | If you did not see the e-mail, the PTG is open for registration now: | 16:03 |
| johnsom | #link https://www.openstack.org/ptg/ | 16:03 |
| johnsom | There is no fee to register and it will be virtual. | 16:03 |
| johnsom | Reminder we have an etherpad: | 16:04 |
| johnsom | #link https://etherpad.opendev.org/p/octavia-virtual-V-ptg | 16:04 |
| johnsom | Date and times are on the etherpad as well. | 16:05 |
| johnsom | The only other announcement I have is that I think our RC1 release for Ussuri is going to be our final release version. | 16:06 |
| *** maciejjozefczyk has joined #openstack-lbaas | 16:06 | |
| johnsom | I haven't heard of any critical patches. | 16:06 |
| johnsom | So, happy dance for that. | 16:06 |
| johnsom | Any other announcements today? | 16:06 |
| cgoncalves | https://github.com/openstack/octavia/compare/6.0.0.0rc1...stable/ussuri | 16:06 |
| cgoncalves | +1 for RC1 being our final release | 16:06 |
| *** maciejjozefczyk_ has joined #openstack-lbaas | 16:07 | |
| johnsom | #topic Brief progress reports / bugs needing review | 16:08 |
| *** openstack changes topic to "Brief progress reports / bugs needing review (Meeting topic: Octavia)" | 16:08 | |
| johnsom | I have been working on small backport related patches and miscellaneous stuff. | 16:09 |
| johnsom | I have a draft slide deck for the OpenStack "highlights" meeting next week. Ping me if you would like to review, etc. | 16:09 |
| johnsom | I have also started looking at porting the failover patch to the V2 code path. It probably won't be a lot of code, but is going to be slow going. | 16:10 |
| johnsom | Any other updates from anyone? | 16:10 |
| *** maciejjozefczyk has quit IRC | 16:11 | |
| cgoncalves | I proposed a couple of backport patches, proposed a patch that moves grenade job to native Zuul v3 and fix grenade in stable branches | 16:11 |
| johnsom | Nice, yeah, happy to see grenade is finally native zuul v3 | 16:12 |
| cgoncalves | the V2 code path is exciting! it is one step forward to defaulting to amphorav2 | 16:12 |
| ataraday_ | if some help needed with that I'm around | 16:12 |
| johnsom | ataraday_ Thank you. I was trying to wrap my head around the deciders changes yesterday. I may have some questions there. | 16:13 |
| ataraday_ | sure | 16:14 |
| johnsom | Ah, one other item of note. This week is the last week for the NDSU student course. | 16:15 |
| johnsom | Hopefully they will be interested and continue on with Octavia, grin, but .... | 16:15 |
| johnsom | They did get a lot of work done, so happy about that process. | 16:16 |
| johnsom | We will probably have some work left to wrap up. | 16:16 |
| cgoncalves | congratulations for all you achieved and work in Octavia! | 16:16 |
| cgoncalves | thanks also to Michael and Adam for mentorship | 16:17 |
| johnsom | And Kendall with the OpenStack foundation | 16:17 |
| cgoncalves | yes, sorry | 16:17 |
| johnsom | NP | 16:17 |
| johnsom | Any other updates today? | 16:17 |
| johnsom | #topic Open Discussion | 16:18 |
| *** openstack changes topic to "Open Discussion (Meeting topic: Octavia)" | 16:18 | |
| johnsom | How about other topics? | 16:18 |
| johnsom | There is a proposed spec for Active/Active open: | 16:18 |
| johnsom | #link https://review.opendev.org/723864 | 16:18 |
| johnsom | If you have some time please review/comment | 16:19 |
| johnsom | I have only had time for a quick glance. | 16:19 |
| johnsom | Seems to be an ECMP based proposal | 16:19 |
| johnsom | Anything else today? | 16:20 |
| johnsom | Ok then, thanks everyone! | 16:21 |
| johnsom | #endmeeting | 16:21 |
| *** openstack changes topic to "Discussions for OpenStack Octavia | Priority bug review list: https://etherpad.openstack.org/p/octavia-priority-reviews" | 16:21 | |
| openstack | Meeting ended Wed May 6 16:21:37 2020 UTC. Information about MeetBot at http://wiki.debian.org/MeetBot . (v 0.1.4) | 16:21 |
| openstack | Minutes: http://eavesdrop.openstack.org/meetings/octavia/2020/octavia.2020-05-06-16.01.html | 16:21 |
| openstack | Minutes (text): http://eavesdrop.openstack.org/meetings/octavia/2020/octavia.2020-05-06-16.01.txt | 16:21 |
| openstack | Log: http://eavesdrop.openstack.org/meetings/octavia/2020/octavia.2020-05-06-16.01.log.html | 16:21 |
| openstackgerrit | Merged openstack/octavia-dashboard stable/ussuri: Imported Translations from Zanata https://review.opendev.org/725784 | 16:23 |
| *** rpittau is now known as rpittau|afk | 16:24 | |
| *** psachin has quit IRC | 16:41 | |
| *** ataraday_ has quit IRC | 17:10 | |
| *** maciejjozefczyk has joined #openstack-lbaas | 17:18 | |
| *** ccamposr has joined #openstack-lbaas | 17:19 | |
| *** maciejjozefczyk_ has quit IRC | 17:20 | |
| *** irclogbot_1 has quit IRC | 17:20 | |
| *** maciejjozefczyk has quit IRC | 17:21 | |
| *** maciejjozefczyk has joined #openstack-lbaas | 17:21 | |
| *** ccamposr__ has quit IRC | 17:21 | |
| *** maciejjozefczyk_ has joined #openstack-lbaas | 17:22 | |
| johnsom | rm_work http://paste.openstack.org/show/793211/ | 17:22 |
| *** irclogbot_2 has joined #openstack-lbaas | 17:23 | |
| *** maciejjozefczyk_ has quit IRC | 17:23 | |
| johnsom | I am guessing we are not validating the networks in the AZ profile and we aren't expecting the "name" | 17:24 |
| *** maciejjozefczyk has quit IRC | 17:26 | |
| *** salmankhan has quit IRC | 17:36 | |
| *** livelace has quit IRC | 17:44 | |
| *** livelace has joined #openstack-lbaas | 18:03 | |
| openstackgerrit | Carlos Goncalves proposed openstack/octavia stable/rocky: Fix Rocky v2 scenario and grenade jobs https://review.opendev.org/725901 | 18:55 |
| openstackgerrit | Noah Mickus proposed openstack/python-octaviaclient master: Add the ability to specify TLS protocols for a pool https://review.opendev.org/724194 | 19:25 |
| openstackgerrit | Noah Mickus proposed openstack/python-octaviaclient master: Add the ability to specify TLS protocols for a pool https://review.opendev.org/724194 | 19:32 |
| *** gcheresh has joined #openstack-lbaas | 19:41 | |
| *** jamesdenton has quit IRC | 19:48 | |
| *** gcheresh has quit IRC | 19:56 | |
| *** jamesdenton has joined #openstack-lbaas | 20:04 | |
| *** gcheresh has joined #openstack-lbaas | 20:04 | |
| *** jamesden_ has joined #openstack-lbaas | 20:08 | |
| *** jamesdenton has quit IRC | 20:11 | |
| openstackgerrit | Noah Mickus proposed openstack/python-octaviaclient master: Add the ability to specify TLS protocols for a pool https://review.opendev.org/724194 | 20:16 |
| openstackgerrit | Noah Mickus proposed openstack/python-octaviaclient master: Add the ability to specify TLS protocols for a pool https://review.opendev.org/724194 | 20:20 |
| *** jamesdenton has joined #openstack-lbaas | 20:21 | |
| rm_work | johnsom: errr, no, we SHOULD be validating the networks? let me see, I swear i added code for that | 20:21 |
| rm_work | definitely not expecting name tho, for sure ID | 20:22 |
| johnsom | Yeah, mgmt-net also accepts names and later bombs | 20:22 |
| *** jamesden_ has quit IRC | 20:22 | |
| *** gcheresh has quit IRC | 20:43 | |
| openstackgerrit | Merged openstack/octavia master: Add py38 package metadata https://review.opendev.org/722715 | 20:46 |
| *** servagem has quit IRC | 20:57 | |
| nmickus | johnsom for the tls pools patch I'm getting a patch in mere conflict error | 21:38 |
| nmickus | *merge | 21:38 |
| johnsom | nmickus So, that means the parent patch also changed something that conflicted/overlapped with your patch. Just pull your patch down and rebase it. It will stop in the middle of the rebase, from there you can do "git status" and get a list of the files with conflicts. Search for the <<<<< and >>>>> tags, "merge" the changes, then git add the file. Once you are done with all of those, you can do the git rebase | 21:56 |
| johnsom | --continue, then git review | 21:56 |
| johnsom | Ping me if you want to do a hangout and fix it together | 21:57 |
| nmickus | johnsom is there anything special i need to do with the merge commit? | 21:59 |
| nmickus | do i need to do anything special to make sure its part of the same patch? | 22:03 |
| johnsom | No, the change ID in the commit message should tie them together | 22:08 |
| openstackgerrit | Noah Mickus proposed openstack/python-octaviaclient master: Add the ability to specify TLS protocols for a pool https://review.opendev.org/724194 | 22:10 |
| nmickus | johnsom Same issue :/ | 22:11 |
| johnsom | Hmm, that is interesting. Let me look at the patch for a minute | 22:13 |
| johnsom | nmickus I wonder if it is the depends-on patch somehow | 22:15 |
| openstackgerrit | Michael Johnson proposed openstack/octavia master: Add TLS version configuration for listeners https://review.opendev.org/721362 | 22:15 |
| nmickus | It seemed weird but i though some additions to the master since I'd started it | 22:16 |
| johnsom | nmickus It is this patch: https://review.opendev.org/#/c/721773 | 22:16 |
| johnsom | The one your patch depends on. I rebased it's parent, then when I went to rebase that patch it is showing conflict | 22:17 |
| johnsom | So, rebase 721773, then recheck the client patch | 22:17 |
| nmickus | so i need to re base damson's patch on my machine? | 22:19 |
| nmickus | dawson* | 22:19 |
| *** threestrands has joined #openstack-lbaas | 22:20 | |
| johnsom | I can do it real quick if you would like, but yeah, one of us needs to rebase it | 22:20 |
| nmickus | I can take a shot at it | 22:21 |
| johnsom | +1 | 22:21 |
| nmickus | johnsom while rebasing it does not list any conflicts | 22:28 |
| johnsom | Did you rebase it on the parent patch or to master? | 22:29 |
| nmickus | i just did git rebase | 22:29 |
| nmickus | do i need to git rebase master? | 22:29 |
| johnsom | Yeah, ok, so you rebased it onto master | 22:30 |
| johnsom | You changed the parent of that patch. You can confirm by doing a "git log", if the second log entry is for "837b7bf94092438e486d3e18c5b9a21bb1298f98" it is now parented on master | 22:31 |
| johnsom | It likely will not pass the tests that way | 22:31 |
| johnsom | You probably need to rebase --onto bbfff55bafc5c557924b4fc93b7d774a790e9e31 | 22:32 |
| nmickus | it says 41ba26f8aa77ad3ae07f6abd6c044bdce876d2e5 is the second patch in the log entry | 22:32 |
| nmickus | I have not pushed anything up yet | 22:33 |
| johnsom | yeah, um. I don't know what that patch is... | 22:33 |
| johnsom | Yeah, searching for that SHA I'm not finding one. | 22:34 |
| johnsom | Maybe just try the rebase --onto above? | 22:35 |
| nmickus | the commit message looks like dawsons listener patch | 22:35 |
| nmickus | will do | 22:35 |
| johnsom | Hmm, did you make changes to his listener patch locally? | 22:36 |
| nmickus | Not that i'm aware of | 22:36 |
| johnsom | How odd. I just don't see that SHA in gerrit. Well, see where the rebase --onto takes you | 22:36 |
| nmickus | Does not point to a valid commit | 22:37 |
| johnsom | So it's not in the local repo, check this out: "git fetch https://review.opendev.org/openstack/octavia refs/changes/62/721362/8 && git checkout FETCH_HEAD" and put it on another branch | 22:38 |
| nmickus | how would i put it on another branch? | 22:38 |
| johnsom | I was just going to type "git checkout -b <new branch name>" | 22:39 |
| johnsom | git branch will show all of the branches you have | 22:39 |
| johnsom | git checkout <branch name> will let you switch between them | 22:39 |
| nmickus | alright it's checked out on its on branch | 22:41 |
| nmickus | own* | 22:41 |
| johnsom | Now you can switch back to the branch to rebase, then do the rebase onto and it should find it | 22:42 |
| nmickus | rebase the new branch onto the old one? | 22:43 |
| johnsom | You will rebase https://review.opendev.org/#/c/721773 onto https://review.opendev.org/#/c/721362 | 22:43 |
| nmickus | alright i have a list of conflicts | 22:48 |
| *** abaindur has quit IRC | 22:52 | |
| *** TrevorV has quit IRC | 22:54 | |
| johnsom | Excellent! | 22:57 |
| rm_work | I would have done: | 23:07 |
| rm_work | git review -d 721362 | 23:07 |
| rm_work | git review -x 721773 | 23:07 |
| rm_work | that's the cleanest most gerrit-ey way to rebase onto a parent | 23:07 |
| *** livelace has quit IRC | 23:07 | |
| nmickus | johnsom I finished with all of the conflicts and now its warning me about multiple commits is it alright to go ahead? | 23:44 |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!