src/lockspace.c

[David Teigland]

 src/lockspace.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 22ad01ac8d1c6c50c2565cf220878384a8c64694
Author: David Teigland <teigland(a)redhat.com&gt;
Date:   Mon Aug 11 10:51:34 2014 -0500

    sanlock: host event struct missing host_id in get_event
    
    The destination host_id should be set so the struct
    from get_event matches the struct from set_event.
    
    Signed-off-by: David Teigland <teigland(a)redhat.com&gt;

diff --git a/src/lockspace.c b/src/lockspace.c
index fe09d99..2db1cce 100644
--- a/src/lockspace.c
+++ b/src/lockspace.c
@@ -337,6 +337,7 @@ void check_other_leases(struct space *sp, char *buf)
 		 */
 
 		memset(&he, 0, sizeof(he));
+		he.host_id = sp->host_id;
 		he.generation = leader->write_id;
 		he.event = leader->write_generation;
 		he.data = leader->write_timestamp;

[Nir Soffer]

----- Original Message -----
>  From: "David Teigland" <teigland(a)fedoraproject.org&gt;
>  To: sanlock-devel(a)lists.fedorahosted.org
>  Sent: Monday, August 11, 2014 6:53:22 PM
>  Subject: src/lockspace.c
>  
>  src/lockspace.c |    1 +
>   1 file changed, 1 insertion(+)
>  
>  New commits:
>  commit 22ad01ac8d1c6c50c2565cf220878384a8c64694
>  Author: David Teigland <teigland(a)redhat.com&gt;
>  Date:   Mon Aug 11 10:51:34 2014 -0500
>  
>      sanlock: host event struct missing host_id in get_event
>      
>      The destination host_id should be set so the struct
>      from get_event matches the struct from set_event.
>      
>      Signed-off-by: David Teigland <teigland(a)redhat.com&gt;
>  
>  diff --git a/src/lockspace.c b/src/lockspace.c
>  index fe09d99..2db1cce 100644
>  --- a/src/lockspace.c
>  +++ b/src/lockspace.c
>  @@ -337,6 +337,7 @@ void check_other_leases(struct space *sp, char *buf)
>   		 */
>   
>   		memset(&he, 0, sizeof(he));
>  +		he.host_id = sp->host_id; 
This looks correct - but I still get:

{'data': 0L,
 'event': 1L,
 'from_generation': 24L,
 'from_host_id': 1L,
 'generation': 18L,
 'host_id': 0L}

Running master with the python-bindings patch.

>   		he.generation = leader->write_id;
>   		he.event = leader->write_generation;
>   		he.data = leader->write_timestamp;
>  
>  
>  _______________________________________________
>  sanlock-devel mailing list
>  sanlock-devel(a)lists.fedorahosted.org
>  https://lists.fedorahosted.org/mailman/listinfo/sanlock-devel
>

[David Teigland]

On Tue, Aug 12, 2014 at 03:12:20PM -0400, Nir Soffer wrote:
>  > +		he.host_id = sp->host_id;
>  
>  This looks correct - but I still get:
>  
>  {'data': 0L,
>   'event': 1L,
>   'from_generation': 24L,
>   'from_host_id': 1L,
>   'generation': 18L,
>   'host_id': 0L}
>  
>  Running master with the python-bindings patch. 
It works for me; maybe you missed a recompile or restart on the hosts?

host1: sanlock client set_event -s lvm_dd -i 2 -g 10 -e 8 -d 9

host2: ./sanlk_events lvm_dd
reg_event lvm_dd
get_event host_id 2 generation 10 event 0x8 data 0x9 from 1 31

[Nir Soffer]

----- Original Message -----
>  From: "David Teigland" <teigland(a)redhat.com&gt;
>  To: "Nir Soffer" <nsoffer(a)redhat.com&gt;
>  Cc: sanlock-devel(a)lists.fedorahosted.org
>  Sent: Tuesday, August 12, 2014 10:35:36 PM
>  Subject: Re: src/lockspace.c
>  
>  On Tue, Aug 12, 2014 at 03:12:20PM -0400, Nir Soffer wrote:
>  > > +		he.host_id = sp->host_id;
>  > 
>  > This looks correct - but I still get:
>  > 
>  > {'data': 0L,
>  >  'event': 1L,
>  >  'from_generation': 24L,
>  >  'from_host_id': 1L,
>  >  'generation': 18L,
>  >  'host_id': 0L}
>  > 
>  > Running master with the python-bindings patch.
>  
>  It works for me; maybe you missed a recompile or restart on the hosts? 
Right - I'm using new python-bindings with old sanlock :-)

Sorry for the noise.

Nir