Cluster Project branch, RHEL5, updated. cmirror_1_1_15-63-g6bb8188

[jbrassow@sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=6bb8188b10227bb97a0fb1cbca88e5fc9a236f2a

The branch, RHEL5 has been updated
       via  6bb8188b10227bb97a0fb1cbca88e5fc9a236f2a (commit)
      from  4d3d73c3d60e4cce5f92bb71ec9a16d8aef4c055 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6bb8188b10227bb97a0fb1cbca88e5fc9a236f2a
Author: Jonathan Brassow <jbrassow@redhat.com>
Date:   Wed May 7 14:55:48 2008 -0500

    clogd:  Remove scary print statements that show up on --resync
    
    When LVM creates mirrors, it is kind enough to initialize the
    log.  However, when a 'lvchange --resync' is issued to resync
    a mirror, it simply wipes the log instead of reinitializing it.
    The log server was responding to this by issuing a warning that
    it couldn't read a valid log header.  This is not a problem,
    because it simply reinitializes it on its own... so the messages
    served no purpose.
    
    LVM should probably be consistent and initialize the log when
    a --resync is issued though.

-----------------------------------------------------------------------

Summary of changes:
 cmirror/src/functions.c |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/cmirror/src/functions.c b/cmirror/src/functions.c
index 822ec17..f34ed77 100644
--- a/cmirror/src/functions.c
+++ b/cmirror/src/functions.c
@@ -234,16 +234,8 @@ static int read_log(struct log_c *lc)
 		return -EIO; /* Failed disk read */
 
 	header_from_disk(&lh, lc->disk_buffer);
-	if (lh.magic != MIRROR_MAGIC) {
-		LOG_ERROR("Header not valid");
-		LOG_ERROR("  magic     : %x  (expected: %x)",
-			  lh.magic, MIRROR_MAGIC);
-		LOG_ERROR("  version   : %u", lh.version);
-		LOG_ERROR("  nr_regions: %llu",
-			  (unsigned long long)lh.nr_regions);
-		LOG_ERROR("*** %s ***", strerror(EINVAL));
+	if (lh.magic != MIRROR_MAGIC)
 		return -EINVAL;
-	}
 
 	lc->disk_nr_regions = lh.nr_regions;
 
@@ -745,8 +737,8 @@ static int clog_resume(struct clog_tfr *tfr)
 				SHORT_UUID(lc->uuid));
 		break;		
 	case -EINVAL:
-		LOG_DBG("[%s] Read log failed: not yet initialized",
-			SHORT_UUID(lc->uuid));
+		LOG_PRINT("[%s] (Re)initializing mirror log - resync issued.",
+			  SHORT_UUID(lc->uuid));
 		lc->disk_nr_regions = 0;
 		break;
 	default:


hooks/post-receive
--
Cluster Project