leaseshelper: Wait to acquire PID file

[PATCH 1/3] *** DO NOT APPLY UPSTREAM ***

Posted by Michal Privoznik 5 years, 7 months ago

This is a demo of the problem. Set up two NATed networks with
dnsmasq and start a domain with two interfaces, one from each
network. Only one network will report DHCP lease in 'virsh
net-dhcp-leases'.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/network/leaseshelper.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
index a1780ca4e4..02759f2314 100644
--- a/src/network/leaseshelper.c
+++ b/src/network/leaseshelper.c
@@ -172,6 +172,8 @@ main(int argc, char **argv)
     case VIR_LEASE_ACTION_ADD:
     case VIR_LEASE_ACTION_OLD:
         /* Create new lease */
+        sleep(60);
+
         if (virLeaseNew(&lease_new, mac, clientid, ip, hostname, iaid, server_duid) < 0)
             goto cleanup;
         /* Custom ipv6 leases *will not* be created if the env-var DNSMASQ_MAC
-- 
2.26.2

Re: [PATCH 1/3] *** DO NOT APPLY UPSTREAM ***

Posted by Peter Krempa 5 years, 7 months ago

On Mon, Jun 15, 2020 at 13:32:34 +0200, Michal Privoznik wrote:
> This is a demo of the problem. Set up two NATed networks with
> dnsmasq and start a domain with two interfaces, one from each
> network. Only one network will report DHCP lease in 'virsh
> net-dhcp-leases'.
> 
> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

I suggest you make use of the actual useful uses of a sign-off and that
is to omit it for patches which are not meant to be pushed upstream. The
pre-push hook will reject accidentally pushing it.

Re: [PATCH 1/3] *** DO NOT APPLY UPSTREAM ***

Posted by Michal Privoznik 5 years, 7 months ago

On 6/15/20 2:06 PM, Peter Krempa wrote:
> On Mon, Jun 15, 2020 at 13:32:34 +0200, Michal Privoznik wrote:
>> This is a demo of the problem. Set up two NATed networks with
>> dnsmasq and start a domain with two interfaces, one from each
>> network. Only one network will report DHCP lease in 'virsh
>> net-dhcp-leases'.
>>
>> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
> 
> I suggest you make use of the actual useful uses of a sign-off and that
> is to omit it for patches which are not meant to be pushed upstream. The
> pre-push hook will reject accidentally pushing it.
> 

Ah, sure; It's just that I have this alias 'cs' which does commit + sign 
off and I am so used to commit using that.

BTW: did we migrate these pre-commit hooks to gitlab too?

Michal

Re: [PATCH 1/3] *** DO NOT APPLY UPSTREAM ***

Posted by Daniel P. Berrangé 5 years, 7 months ago

On Mon, Jun 15, 2020 at 02:46:42PM +0200, Michal Privoznik wrote:
> On 6/15/20 2:06 PM, Peter Krempa wrote:
> > On Mon, Jun 15, 2020 at 13:32:34 +0200, Michal Privoznik wrote:
> > > This is a demo of the problem. Set up two NATed networks with
> > > dnsmasq and start a domain with two interfaces, one from each
> > > network. Only one network will report DHCP lease in 'virsh
> > > net-dhcp-leases'.
> > > 
> > > Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
> > 
> > I suggest you make use of the actual useful uses of a sign-off and that
> > is to omit it for patches which are not meant to be pushed upstream. The
> > pre-push hook will reject accidentally pushing it.
> > 
> 
> Ah, sure; It's just that I have this alias 'cs' which does commit + sign off
> and I am so used to commit using that.
> 
> BTW: did we migrate these pre-commit hooks to gitlab too?

Yes & no. You can't install arbitrary hooks server side. Instead we have
a regex filter that checks for the word "Signed-off-by" in the commit
message which applies when pushing directly to git. The CI job checks
this for code that will go in via merge requests.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|