This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: RHEL54 - clogd: Fix for bugs 474174 and 491340
- From: Jonathan Brassow <jbrassow at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Wed, 8 Jul 2009 22:20:46 +0000 (UTC)
- Subject: cluster: RHEL54 - clogd: Fix for bugs 474174 and 491340
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6cf7dbc393d206e56a14261af81b1aeeb5bb160a
Commit: 6cf7dbc393d206e56a14261af81b1aeeb5bb160a
Parent: 704f137b77fce75d27621b1571bbb142696d30d6
Author: Jonathan Brassow <jbrassow@redhat.com>
AuthorDate: Wed Jul 8 17:16:19 2009 -0500
Committer: Jonathan Brassow <jbrassow@redhat.com>
CommitterDate: Wed Jul 8 17:19:46 2009 -0500
clogd: Fix for bugs 474174 and 491340
Whether to continue mirror recovery or not was being queued
off of a variable that was set by doing (x - 1). However,
when 'x' was 0 the result was a very large number (unsigned).
When this large number was compared against the number of
total regions in the mirror, it was determined that recovery
was finished. The fix is simply to do:
y = x ? (x - 1) : 0;
instead of:
y = (x - 1);
---
cmirror/src/functions.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmirror/src/functions.c b/cmirror/src/functions.c
index 45fdc1a..d37c75a 100644
--- a/cmirror/src/functions.c
+++ b/cmirror/src/functions.c
@@ -1505,9 +1505,9 @@ static int clog_is_remote_recovering(struct clog_tfr *tfr)
/*
* Remember, 'lc->sync_search' is 1 plus the region
* currently being recovered. So, we must take off 1
- * to account for that.
+ * to account for that - UNLESS sync_search IS 0!
*/
- pkg->in_sync_hint = (lc->sync_search - 1);
+ pkg->in_sync_hint = lc->sync_search ? (lc->sync_search - 1) : 0;
LOG_DBG("[%s] Region is %s: %llu",
SHORT_UUID(lc->uuid),
(region == lc->recovering_region) ?