[prev in list] [next in list] [prev in thread] [next in thread] 

List:       evms-devel
Subject:    [Evms-devel] [PATCH] HA installation, continue after lockfile failure
From:       Matt Zimmerman <mdz () debian ! org>
Date:       2004-03-15 20:51:21
Message-ID: 20040315205121.GA31259 () alcor ! net
[Download RAW message or body]

[Attachment #2 (multipart/mixed)]


Two small patches from the Debian diff:

evms-ha-install.diff - install evms_failover unconditionally, regardless of
whether $(HA_RESOURCEDIR) exists.  I see no reason to prevent it from being
installed, and it inadvertently caused evms_failover to be omitted from the
packages at one point (the install is done into an empty directory, not the
real root).

evms-engine-lockfile.diff - let the engine continue if locking fails.  This
may be controversial, but I ran into some situations (mostly with initrd)
where this was preventing evms_activate from working, which breaks
everything.  For example, if the locking directory does not exist on a
read-only filesystem.

--=20
 - mdz

["evms-ha-install.diff" (text/plain)]

--- evms-2.3.0.orig/plugins/ha/Makefile.in
+++ evms-2.3.0/plugins/ha/Makefile.in
@@ -43,12 +43,10 @@
 install: all
 	$(MKINSTALLDIRS) $(DESTDIR)$(evmspluginsdir)
 	$(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(HA_RESOURCEDIR)
 	$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(evmspluginsdir)
 	$(INSTALL) -m 755 evmsccm $(DESTDIR)$(sbindir)
-	@if [ -d $(DESTDIR)$(HA_RESOURCEDIR) ]; then	\
-		echo "$(INSTALL) -m 755 evms_failover $(DESTDIR)$(HA_RESOURCEDIR)"; \
-		$(INSTALL) -m 755 evms_failover $(DESTDIR)$(HA_RESOURCEDIR); \
-	fi
+	$(INSTALL) -m 755 evms_failover $(DESTDIR)$(HA_RESOURCEDIR)
=20
 uninstall:
 	rm -f $(DESTDIR)$(evmspluginsdir)/$(TARGET)

["evms-engine-lockfile.diff" (text/plain)]

--- evms-2.3.0.orig/engine/engine.c
+++ evms-2.3.0/engine/engine.c
@@ -965,13 +965,8 @@
 		}
 
 	} else {
-		sprintf(lock_msg, "Unable to open the Engine lock file %s: %s.", ENGINE_LOCK_FILE, \
                strerror(rc));
-		if (rc == EROFS) {
-			strcat(lock_msg, "  The Engine is not protected against other instances of the \
                Engine being opened at the same time.\n");
-			rc = 0;
-		} else {
-			strcat(lock_msg, "\n");
-		}
+		sprintf(lock_msg, "Unable to open the Engine lock file %s: %s.  The Engine is not \
protected against other instances of the Engine being opened at the same time.\n", \
ENGINE_LOCK_FILE, strerror(rc)); +                rc = 0;
 		engine_user_message(NULL, NULL, lock_msg);
 		lock_file_fd = 0;
 	}


["signature.asc" (application/pgp-signature)]
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Evms-devel mailing list
Evms-devel@lists.sourceforge.net
To subscribe/unsubscribe, please visit:
https://lists.sourceforge.net/lists/listinfo/evms-devel

[prev in list] [next in list] [prev in thread] [next in thread]