[ovs-dev] [PATCH branch-2.10 0/2] Fix syslog and make travis great again.

Ilya Maximets i.maximets at samsung.com
Wed Mar 20 07:49:40 UTC 2019


On 18.03.2019 23:38, Ben Pfaff wrote:
> On Mon, Mar 18, 2019 at 11:31:32AM +0300, Ilya Maximets wrote:
>> On 18.03.2019 11:03, Simon Horman wrote:
>>> On Fri, Mar 15, 2019 at 01:12:09PM +0300, Ilya Maximets wrote:
>>>> On 15.03.2019 12:39, Simon Horman wrote:
>>>>> On Fri, Mar 15, 2019 at 12:28:03PM +0300, Ilya Maximets wrote:
>>>>>> On 15.03.2019 11:50, Simon Horman wrote:
>>>>>>> On Thu, Mar 14, 2019 at 01:14:05PM +0300, Ilya Maximets wrote:
>>>>>>>> On 14.03.2019 11:48, Simon Horman wrote:
>>>>>>>>> On Wed, Mar 13, 2019 at 12:06:51PM +0100, Simon Horman wrote:
>>>>>>>>>> On Tue, Feb 26, 2019 at 04:00:02PM +0300, Ilya Maximets wrote:
>>>>>>>>>>> First patch is a bugfix backport. Second one fixes the testsuite
>>>>>>>>>>> jobs on TravisCI failure due to 50 minutes timeout.
>>>>>>>>>>>
>>>>>>>>>>> Both patches needs to be applied to branch-2.10 and backported as far
>>>>>>>>>>> as possible. I tested them on branches from 2.10 down to 2.6.
>>>>>>>>>>>
>>>>>>>>>>> The second patch disables rsyslog daemon on travis, so the first
>>>>>>>>>>> fix required to make it work fine in this configuration.
>>>>>>>>>>>
>>>>>>>>>>> Branch 2.11 and master are not affected by the slow syslog issue
>>>>>>>>>>> because syslog-null is in use for the testsuite invocations.
>>>>>>>>>>>
>>>>>>>>>>> Ilya Maximets (2):
>>>>>>>>>>>   vlog: Better handle syslog handler exceptions.
>>>>>>>>>>>   travis: Stop rsyslog before start.
>>>>>>>>>>
>>>>>>>>>> Thanks Ilya,
>>>>>>>>>>
>>>>>>>>>> I have tested these patches and with both applied I now see
>>>>>>>>>> that travis-ci runs successfully while this was not the case
>>>>>>>>>> without these patches.
>>>>>>>>>>
>>>>>>>>>> https://travis-ci.org/horms2/ovs/builds/505654239
>>>>>>>>>>
>>>>>>>>>> Tested-by: Simon Horman <simon.horman at netronome.com>
>>>>>>>>>>
>>>>>>>>>> Ben, I'd be happy to go ahead and apply these if there are no objections.
>>>>>>>>>> Or I'm just as happy for someone else to apply them.
>>>>>>>>>
>>>>>>>>> I have gone ahead and push this series to branch-2.10.
>>>>>>>>
>>>>>>>> Thanks! branch-2.10 is green now.
>>>>>>>>
>>>>>>>> BTW, It'll be good to have these patches down to branch-2.6.
>>>>>>>>
>>>>>>>> Best regards, Ilya Maximets.
>>>>>>>
>>>>>>> Thanks,
>>>>>>>
>>>>>>> I've gone ahead and pushed these to branch-2.9, branch-2.8, branch-2.7
>>>>>>> and branch-2.6.
>>>>>>>
>>>>>>> In the case of branch-2.9 and branch-2.8 my testing indicates that
>>>>>>> travis-ci should now turn green (hooray!).
>>>>>>>
>>>>>>> https://travis-ci.org/horms2/ovs/builds/506251905
>>>>>>> https://travis-ci.org/horms2/ovs/builds/506252393
>>>>>>>
>>>>>>> In the case of branch-2.7 and branch-2.6, I had to resolve a minor
>>>>>>> conflict when applying the patches. You may want to check to make sure
>>>>>>> that I got that right.
>>>>>>
>>>>>> Thanks fro working on this!
>>>>>> Rebase is minor, looks good.
>>>>>
>>>>> Likewise, thanks for your help.
>>>>> We seem to be making good progress.
>>>>>
>>>>>>> For these branches it seems to make travis-ci happier and there are
>>>>>>> no more aborted ("!") builds. However, there does still seem to be an
>>>>>>> unrelated failure so those branches do not turn green.
>>>>>>>
>>>>>>> https://travis-ci.org/horms2/ovs/builds/506253422
>>>>>>> https://travis-ci.org/horms2/ovs/jobs/506253451
>>>>>>>
>>>>>>> https://travis-ci.org/horms2/ovs/builds/506254580
>>>>>>> https://travis-ci.org/horms2/ovs/jobs/506254614
>>>>>>
>>>>>>
>>>>>> For OSX build we probably need to backport following patch to 2.6 and 2.7:
>>>>>>
>>>>>> commit 10fd9f6e477555ca93d28094c2976b2ea0198798
>>>>>> Author: Richard Oliver <richard at richard-oliver.co.uk>
>>>>>> Date:   Sat Oct 28 16:38:30 2017 +0100
>>>>>>
>>>>>>     timeval: Check for OS-provided clock_gettime on macOS
>>>>>>     
>>>>>>     [Problem]
>>>>>>     Compilation error on newer versions of macOS (Sierra onwards) due to
>>>>>>     multiple declarations of clock_gettime.
>>>>>>     
>>>>>>     [Solution]
>>>>>>     Have configure check for clock_gettime and check this result in
>>>>>>     timeval to avoid incorrectly declaring/defining clock_gettime again.
>>>>>>     
>>>>>>     [Testing]
>>>>>>     Source code now successfully builds on macOS.
>>>>>>     
>>>>>>     Signed-off-by: Richard Oliver <richard at richard-oliver.co.uk>
>>>>>>     Signed-off-by: Ben Pfaff <blp at ovn.org>
>>>>>
>>>>> Thanks,
>>>>>
>>>>> I've as per your suggestion I have tried applying these (locally) to
>>>>> branch-2.7 and branch-2.6. Which involved resolving a minor conflict.
>>>>> Travis-CI is now chewing over this.
>>>>>
>>>>> https://travis-ci.org/horms2/ovs/builds/506681468
>>>>> https://travis-ci.org/horms2/ovs/builds/506681370
>>>>
>>>> I noticed that you have no 'rsyslog' patches on your local branches,
>>>> so the testsuite jobs will take 50 mins and will be aborted.
>>>> However, you still able to wait some to and check the result of OSX job.
>>>>
>>>> One more thing that order of authors in your local 2.6 branch is not alphabetical.
>>>> You'll probably want to fix that before pushing to main repo.
>>>
>>> Thanks, fixed and pushed.
>>
>> Thank you.
>>
>> If someone wants to go further, branch-2.4 needs backporting of:
>>
>> commit 48035edbe782be63daa9e2c4f71860d405b4d479                                                                                      
>> Author: Ben Pfaff <blp at ovn.org>                                                                                                      
>> Date:   Thu Jul 27 16:48:54 2017 -0700                                                                                               
>>                                                                                                                                      
>>     travis: Explicitly disable LLVM for sparse build.                                                                                
>>                                                                                                                                      
>>     Newer travis environments claim to have LLVM support (llvm-config exists                                                         
>>     and works) but in reality don't, which prevents sparse from building and                                                         
>>     later parts of the build from succeeding.                                                                                        
>>                                                                                                                                      
>>     Signed-off-by: Ben Pfaff <blp at ovn.org>                                                                                           
>>     Acked-by: Justin Pettit <jpettit at ovn.org>
>>
>> from master, or:
>>
>> commit f7158faf655266e4ab2ac20c158a826df56d5011
>> Author: Ben Pfaff <blp at ovn.org>
>> Date:   Tue Oct 16 13:57:10 2018 -0700
>>
>>     travis: Remove sparse support.
>>     
>>     "sparse" failed to build with this old branch, see e.g.
>>     https://travis-ci.org/openvswitch/ovs/jobs/436851158
>>     
>>     Signed-off-by: Ben Pfaff <blp at ovn.org>
>>
>> from branch-2.5.
> 
> Thanks.  I backported the latter.
> 
> I'll consider branch-2.4 closed from now.

OK. Thank you.

I case we want green build on branch-2.5 someone could backport following patches:

* 0d3f21520 2016-02-24 | tests: Add ability to automatically rerun failed tests. [Ben Pfaff]
* 655306c82 2016-02-09 | travis: Automatically recheck failed tests. [Ben Pfaff]

This will make testsuite more reliable. Works for my travis builds on branch-2.5.

This is actually the last step to have green builds on all branches from 2.5 to master.

Best regards, Ilya Maximets.


More information about the dev mailing list