2 commits - src/paxos_lease.c

[David Teigland]

 src/paxos_lease.c |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 12f4276f4adaecdd3a6b4ef409c25ac2e5c13a2a
Author: David Teigland <teigland(a)redhat.com&gt;
Date:   Mon Feb 27 12:52:11 2012 -0600

    sanlock: fix leaking fd
    
    Recent shared lease commit started leaking this fd.
    
    Signed-off-by: David Teigland <teigland(a)redhat.com&gt;

diff --git a/src/paxos_lease.c b/src/paxos_lease.c
index 19218eb..807972f 100644
--- a/src/paxos_lease.c
+++ b/src/paxos_lease.c
@@ -1064,6 +1064,7 @@ int paxos_lease_acquire(struct task *task,
 			error = SANLK_ACQUIRE_IDDISK;
 			goto out;
 		}
+		disk_open = 1;
 	}
 
 	rv = host_info(cur_leader.space_name, cur_leader.owner_id, &hs);


commit dc0e0927d9f1e63f8f53feffe14cee1aede30e3f
Author: David Teigland <teigland(a)redhat.com&gt;
Date:   Mon Feb 27 11:00:59 2012 -0600

    sanlock: add paxos sanity check
    
    Check for a condition that I don't think should ever happen.
    
    Signed-off-by: David Teigland <teigland(a)redhat.com&gt;

diff --git a/src/paxos_lease.c b/src/paxos_lease.c
index d1243cb..19218eb 100644
--- a/src/paxos_lease.c
+++ b/src/paxos_lease.c
@@ -1293,6 +1293,12 @@ int paxos_lease_acquire(struct task *task,
 		goto restart;
 	}
 
+	if (memcmp(&cur_leader, &tmp_leader, sizeof(struct leader_record))) {
+		/* I don't think this should ever happen. */
+		log_errot(token, "paxos_acquire restart leader changed2");
+		goto restart;
+	}
+
 	error = run_ballot(task, token, cur_leader.num_hosts, next_lver, our_mbal,
 			   &dblock);