[gentoo-commits] gentoo-x86 commit in sys-cluster/pvfs2/files: pvfs2-client-init.d 2.6.3-no-pointer-sign.patch 2.6.3-as-needed.patch digest-pvfs2-2.6.3 2.6.3-soname.patch 2.6.3-kmem-and-dtor-fix.patch 2.6.3-link-librt-properly.patch 2.6.3-register_sysctl_table.patch pvfs2-server.conf pvfs2-server.rc pvfs2-client.conf

[Matti Bickel (mabi)]

mabi        07/10/05 14:03:14

  Added:                pvfs2-client-init.d 2.6.3-no-pointer-sign.patch
                        2.6.3-as-needed.patch digest-pvfs2-2.6.3
                        2.6.3-soname.patch 2.6.3-kmem-and-dtor-fix.patch
                        2.6.3-link-librt-properly.patch
                        2.6.3-register_sysctl_table.patch pvfs2-server.conf
                        pvfs2-server.rc pvfs2-client.conf
  Log:
  revbump + cvs backport of kmem fix
  (Portage version: 2.1.3.11)

Revision  Changes    Path
1.1                  sys-cluster/pvfs2/files/pvfs2-client-init.d

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-client-init.d?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-client-init.d?rev=1.1&content-type=text/plain

Index: pvfs2-client-init.d
===================================================================
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-client-init.d,v 1.1 2007/10/05 14:03:13 mabi Exp $


depend() {
	need net
	need localmount
	before pbs_mom
	after pvfs2-server
}

checkconfig() {
	if [ ! -x "${PVFS2_CLIENT}" ] || [ ! -x "${PVFS2_CLIENT_CORE}" ]; then
		eend 1 "pvfs-2 was not correctly installed."
		return 1
	fi

	if [ ! -d "${PVFS2_MOUNTPOINT}" ]; then
		ewarn "Creating ${PVFS2_MOUNTPOINT}"
		mkdir -p ${PVFS2_MOUNTPOINT} || return 1
	fi

	local piddir=$(dirname ${PVFS2_CLIENT_PIDFILE})
	if [ ! -d "${piddir}" ]; then
		ewarn "Creating ${piddir}"
		mkdir -p ${piddir} || return 1
	fi

	return 0
}

start() {
	ebegin "Starting pvfs2-client"
	local rc=0

	$(lsmod | egrep "^pvfs2 " &> /dev/null) || modprobe pvfs2 
	if [[ $? -ne 0 ]]; then
		eend 1 "Failed to load the pvfs2 module"
		return 1
	fi

    # -f so start-stop-daemon can snag the pid. 
	start-stop-daemon --start -q -b -m -p ${PVFS2_CLIENT_PIDFILE} \
	--exec ${PVFS2_CLIENT} -- -f -p ${PVFS2_CLIENT_CORE} ${PVFS2_CLIENT_ARGS}
	rc=$?

	if [[ $rc -ne 0 ]]; then
		eend ${rc} "Failed to run pvfs2-client"
		return ${rc} 
	fi

	mount -t pvfs2 tcp://${PVFS2_SERVER_HOST}:3334/pvfs2-fs "${PVFS2_MOUNTPOINT}"
	rc=$?
	if [[ $rc -ne 0 ]]; then
		eend 1 "Failed to mount the pvfs2 filesystem on ${PVFS2_MOUNTPOINT}"
		return 1
	fi

	eend ${rc}
}

stop() {
	ebegin "Stopping pvfs2-client"
	if [ -n "$(mount | awk '{print $3}' | grep ${PVFS2_MOUNTPOINT})" ]; then
		umount -f ${PVFS2_MOUNTPOINT}
	fi

	start-stop-daemon --stop -p ${PVFS2_CLIENT_PIDFILE} 

	modprobe -r pvfs2 

	eend $?
}




1.1                  sys-cluster/pvfs2/files/2.6.3-no-pointer-sign.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/2.6.3-no-pointer-sign.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/2.6.3-no-pointer-sign.patch?rev=1.1&content-type=text/plain

Index: 2.6.3-no-pointer-sign.patch
===================================================================
--- maint/config/kernel.m4.old	2007-04-30 16:46:16.000000000 +0200
+++ maint/config/kernel.m4	2007-04-30 16:48:26.000000000 +0200
@@ -348,11 +348,8 @@
 		)
 	fi
 
-	dnl we need the compiler to error on warnings about prototypes, but
-	dnl certain Fedora FC5 kernel header files throw extra (spurious)
-	dnl warnings, which -Wno-pointer-sign silences.	
+
         tmp_cflags=$CFLAGS
-	CFLAGS="$CFLAGS -Werror -Wno-pointer-sign"
 	dnl if this test passes, there is a struct dentry* argument
 	AC_MSG_CHECKING(if statfs callbacks' arguments in kernel has struct dentry argument)
 	dnl if this test passes, the kernel has it



1.1                  sys-cluster/pvfs2/files/2.6.3-as-needed.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/2.6.3-as-needed.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/2.6.3-as-needed.patch?rev=1.1&content-type=text/plain

Index: 2.6.3-as-needed.patch
===================================================================
--- maint/config/openssl.m4~	2007-04-16 04:17:53.000000000 +0200
+++ maint/config/openssl.m4	2007-04-16 04:17:53.000000000 +0200
@@ -12,7 +12,7 @@
             LDFLAGS="$LDFLAGS -L${opensslpath}/lib64 -L${opensslpath}/lib"
             SERVER_LDFLAGS="$SERVER_LDFLAGS -L${opensslpath}/lib64 -L${opensslpath}/lib"
         fi
-        LIBS="$LIBS -lcrypt -lssl"
+        LIBS="$LIBS -lcrypt -lcrypto -lssl"
     
         AC_COMPILE_IFELSE(
     	    [#include "openssl/bio.h"],
@@ -36,7 +36,7 @@
 [
     AC_MSG_CHECKING([for openssl library])
     TMPLIBS=${LIBS}
-    LIBS="$LIBS -lcrypt -lssl"
+    LIBS="$LIBS -lcrypt -lcrypto -lssl"
 
     AC_COMPILE_IFELSE(
       [#include "openssl/bio.h"],



1.1                  sys-cluster/pvfs2/files/digest-pvfs2-2.6.3

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/digest-pvfs2-2.6.3?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/digest-pvfs2-2.6.3?rev=1.1&content-type=text/plain

Index: digest-pvfs2-2.6.3
===================================================================
MD5 f7ba22bb0b4bdaadb69ca1c2d8e102a4 pvfs-2.6.3.tar.gz 3971014
RMD160 a2dcfcf60bde46a3f99b1cc490e9148fdbaacda6 pvfs-2.6.3.tar.gz 3971014
SHA256 e8468c277b8832ef26308400a41244fad6e98f38ffcfd417b42aae9f796c03f6 pvfs-2.6.3.tar.gz 3971014



1.1                  sys-cluster/pvfs2/files/2.6.3-soname.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/2.6.3-soname.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/2.6.3-soname.patch?rev=1.1&content-type=text/plain

Index: 2.6.3-soname.patch
===================================================================
--- Makefile.in	2007-04-15 11:11:51.000000000 +0200
+++ Makefile.in	2007-04-15 11:11:51.000000000 +0200
@@ -591,7 +591,7 @@
 lib/libpvfs2.so: $(LIBPICOBJS)
 	$(Q) "  LDSO		$@"
 	$(E)$(INSTALL) -d lib
-	$(E)$(LDSHARED) -o $@ $(LIBPICOBJS)
+	$(E)$(LDSHARED) -Wl,-soname,libpvfs2.so -o $@ $(LIBPICOBJS)
 
 # rule for building the pvfs2 _multithreaded_ library
 lib/libpvfs2-threaded.so: $(LIBTHREADEDPICOBJS)



1.1                  sys-cluster/pvfs2/files/2.6.3-kmem-and-dtor-fix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/2.6.3-kmem-and-dtor-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/2.6.3-kmem-and-dtor-fix.patch?rev=1.1&content-type=text/plain

Index: 2.6.3-kmem-and-dtor-fix.patch
===================================================================
diff -u -r pvfs-2.6.3/src/kernel/linux-2.6/pvfs2-cache.c pvfs-2.6.3-new/src/kernel/linux-2.6/pvfs2-cache.c
--- pvfs-2.6.3/src/kernel/linux-2.6/pvfs2-cache.c	2007-10-02 14:54:45.000000000 +0200
+++ pvfs-2.6.3-new/src/kernel/linux-2.6/pvfs2-cache.c	2007-10-02 14:49:10.000000000 +0200
@@ -203,14 +203,7 @@
     pvfs2_kmem_cache_t * cachep,
     unsigned long flags)
 {
-    if (flags & SLAB_CTOR_CONSTRUCTOR)
-    {
-        memset(req, 0, sizeof(MAX_ALIGNED_DEV_REQ_DOWNSIZE));
-    }
-    else
-    {
-        gossip_err("WARNING!! devreq_ctor called without ctor flag\n");
-    }
+    memset(req, 0, sizeof(MAX_ALIGNED_DEV_REQ_DOWNSIZE));
 }
 
 int dev_req_cache_initialize(void)
@@ -269,45 +262,24 @@
 {
     pvfs2_inode_t *pvfs2_inode = (pvfs2_inode_t *)new_pvfs2_inode;
 
-    if (flags & SLAB_CTOR_CONSTRUCTOR)
-    {
-        memset(pvfs2_inode, 0, sizeof(pvfs2_inode_t));
-        ClearInitFlag(pvfs2_inode);
+    memset(pvfs2_inode, 0, sizeof(pvfs2_inode_t));
+    ClearInitFlag(pvfs2_inode);
 
-        pvfs2_inode_initialize(pvfs2_inode);
+    pvfs2_inode_initialize(pvfs2_inode);
 
 #ifndef PVFS2_LINUX_KERNEL_2_4
-        /*
-           inode_init_once is from 2.6.x's inode.c; it's normally run
-           when an inode is allocated by the system's inode slab
-           allocator.  we call it here since we're overloading the
-           system's inode allocation with this routine, thus we have
-           to init vfs inodes manually
-        */
-        inode_init_once(&pvfs2_inode->vfs_inode);
-        pvfs2_inode->vfs_inode.i_version = 1;
+    /*
+       inode_init_once is from 2.6.x's inode.c; it's normally run
+       when an inode is allocated by the system's inode slab
+       allocator.  we call it here since we're overloading the
+       system's inode allocation with this routine, thus we have
+       to init vfs inodes manually
+    */
+    inode_init_once(&pvfs2_inode->vfs_inode);
+    pvfs2_inode->vfs_inode.i_version = 1;
 #endif
-        /* Initialize the reader/writer semaphore */
-        init_rwsem(&pvfs2_inode->xattr_sem);
-    }
-    else
-    {
-        gossip_err("WARNING!! inode_ctor called without ctor flag\n");
-    }
-}
-
-static void pvfs2_inode_cache_dtor(
-    void *old_pvfs2_inode,
-    pvfs2_kmem_cache_t * cachep,
-    unsigned long flags)
-{
-    pvfs2_inode_t *pvfs2_inode = (pvfs2_inode_t *)old_pvfs2_inode;
-
-    if (pvfs2_inode && pvfs2_inode->link_target)
-    {
-        kfree(pvfs2_inode->link_target);
-        pvfs2_inode->link_target = NULL;
-    }
+    /* Initialize the reader/writer semaphore */
+    init_rwsem(&pvfs2_inode->xattr_sem);
 }
 
 static inline void add_to_pinode_list(pvfs2_inode_t *pvfs2_inode)
@@ -330,8 +302,7 @@
 {
     pvfs2_inode_cache = kmem_cache_create(
         "pvfs2_inode_cache", sizeof(pvfs2_inode_t), 0,
-        PVFS2_CACHE_CREATE_FLAGS, pvfs2_inode_cache_ctor,
-        pvfs2_inode_cache_dtor);
+        PVFS2_CACHE_CREATE_FLAGS, pvfs2_inode_cache_ctor, NULL);
 
     if (!pvfs2_inode_cache)
     {
@@ -403,14 +374,7 @@
     pvfs2_kmem_cache_t * cachep,
     unsigned long flags)
 {
-    if (flags & SLAB_CTOR_CONSTRUCTOR)
-    {
-        memset(req, 0, sizeof(pvfs2_kiocb));
-    }
-    else
-    {
-        gossip_err("WARNING!! kiocb_ctor called without ctor flag\n");
-    }
+    memset(req, 0, sizeof(pvfs2_kiocb));
 }
 
 
diff -u -r pvfs-2.6.3/src/kernel/linux-2.6/pvfs2-kernel.h pvfs-2.6.3-new/src/kernel/linux-2.6/pvfs2-kernel.h
--- pvfs-2.6.3/src/kernel/linux-2.6/pvfs2-kernel.h	2007-10-02 14:54:45.000000000 +0200
+++ pvfs-2.6.3-new/src/kernel/linux-2.6/pvfs2-kernel.h	2007-10-02 14:49:10.000000000 +0200
@@ -47,6 +47,7 @@
 #include <linux/statfs.h>
 #include <linux/buffer_head.h>
 #include <linux/backing-dev.h>
+#include <linux/device.h>
 #include <linux/mpage.h>
 #include <linux/namei.h>
 #include <linux/errno.h>
@@ -363,7 +364,7 @@
 typedef struct
 {
     PVFS_object_ref refn;
-    char *link_target;
+    char link_target[PVFS_NAME_MAX];
     /*
      * Reading/Writing Extended attributes need to acquire the appropriate
      * reader/writer semaphore on the pvfs2_inode_t structure.
@@ -571,6 +572,15 @@
 
 #endif
 
+typedef struct pvfs2_stats {
+    unsigned long cache_hits;
+    unsigned long cache_misses;
+    unsigned long reads;
+    unsigned long writes;
+} pvfs2_stats;
+
+extern pvfs2_stats g_pvfs2_stats;
+
 /*
   NOTE: See Documentation/filesystems/porting for information
   on implementing FOO_I and properly accessing fs private data
@@ -821,8 +831,8 @@
  * defined in devpvfs2-req.c
  ****************************/
 
-int     pvfs2_ioctl32_init(void);
-void    pvfs2_ioctl32_cleanup(void);
+int     pvfs2_dev_init(void);
+void    pvfs2_dev_cleanup(void);
 int     is_daemon_in_service(void);
 int     fs_mount_pending(PVFS_fs_id fsid);
 
@@ -1250,6 +1260,18 @@
 }
 #endif
 
+#ifndef HAVE_KZALLOC
+static void *kzalloc(size_t size, gfp_t mask)
+{
+    void *ptr;
+    ptr = kmalloc(size, mask);
+    if (ptr) {
+        memset(ptr, 0, size);
+    }
+    return ptr;
+}
+#endif
+
 #endif /* PVFS2_LINUX_KERNEL_2_4 */
 
 static inline unsigned int diff(struct timeval *end, struct timeval *begin)
@@ -1268,11 +1290,10 @@
 	void * ptr;
 
 	ptr = kmalloc(size, flags);
-	if(!ptr)
+	if (ptr)
 	{
-		return ptr;
+            memset(ptr, 0, size);
 	}
-	memset(ptr, 0, size);
 	return ptr;
 }
 #endif
diff -u -r pvfs-2.6.3/src/kernel/linux-2.6/pvfs2-utils.c pvfs-2.6.3-new/src/kernel/linux-2.6/pvfs2-utils.c
--- pvfs-2.6.3/src/kernel/linux-2.6/pvfs2-utils.c	2007-10-02 14:54:45.000000000 +0200
+++ pvfs-2.6.3-new/src/kernel/linux-2.6/pvfs2-utils.c	2007-10-02 15:04:12.000000000 +0200
@@ -101,18 +101,24 @@
 static void pvfs2_set_inode_flags(struct inode *inode, 
         PVFS_sys_attr *attrs)
 {
-    if (attrs->flags & PVFS_IMMUTABLE_FL)
+    if (attrs->flags & PVFS_IMMUTABLE_FL) {
         inode->i_flags |= S_IMMUTABLE;
-    else 
+    }
+    else {
         inode->i_flags &= ~S_IMMUTABLE;
-    if (attrs->flags & PVFS_APPEND_FL)
+    }
+    if (attrs->flags & PVFS_APPEND_FL) {
         inode->i_flags |= S_APPEND;
-    else
+    }
+    else {
         inode->i_flags &= ~S_APPEND;
-    if (attrs->flags & PVFS_NOATIME_FL)
+    }
+    if (attrs->flags & PVFS_NOATIME_FL) {
         inode->i_flags |= S_NOATIME;
-    else
+    }
+    else {
         inode->i_flags &= ~S_NOATIME;
+    }
     return;
 }
 
@@ -288,17 +294,7 @@
                 /* copy link target to inode private data */
                 if (pvfs2_inode && symname)
                 {
-                    if (pvfs2_inode->link_target)
-                    {
-                        kfree(pvfs2_inode->link_target);
-                        pvfs2_inode->link_target = NULL;
-                    }
-                    pvfs2_inode->link_target = kmalloc(
-                        (strlen(symname) + 1), PVFS2_GFP_FLAGS);
-                    if (pvfs2_inode->link_target)
-                    {
-                        strcpy(pvfs2_inode->link_target, symname);
-                    }
+                    strncpy(pvfs2_inode->link_target, symname, PVFS_NAME_MAX);
                     gossip_debug(GOSSIP_UTILS_DEBUG, "Copied attr link target %s\n",
                                 pvfs2_inode->link_target);
                 }
@@ -1791,7 +1787,8 @@
 {
     void *buf;
 
-    buf = kmalloc(sizeof(pvfs2_opaque_handle_t), PVFS2_BUFMAP_GFP_FLAGS);
+    buf = kmalloc(sizeof(pvfs2_opaque_handle_t), 
+                  PVFS2_BUFMAP_GFP_FLAGS);
     return buf;
 }
 
@@ -1956,7 +1953,7 @@
         pvfs2_inode->refn.handle = PVFS_HANDLE_NULL;
         pvfs2_inode->refn.fs_id = PVFS_FS_ID_NULL;
         pvfs2_inode->last_failed_block_index_read = 0;
-        pvfs2_inode->link_target = NULL;
+        memset(pvfs2_inode->link_target, 0, sizeof(pvfs2_inode->link_target));
         pvfs2_inode->error_code = 0;
         SetInitFlag(pvfs2_inode);
     }
@@ -1964,7 +1961,6 @@
 
 /*
   this is called from super:pvfs2_destroy_inode.
-  pvfs2_inode_cache_dtor frees the link_target if any
 */
 void pvfs2_inode_finalize(pvfs2_inode_t *pvfs2_inode)
 {



1.1                  sys-cluster/pvfs2/files/2.6.3-link-librt-properly.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/2.6.3-link-librt-properly.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/2.6.3-link-librt-properly.patch?rev=1.1&content-type=text/plain

Index: 2.6.3-link-librt-properly.patch
===================================================================
diff -urN pvfs-2.6.0.orig/maint/config/rt.m4 pvfs-2.6.0/maint/config/rt.m4
--- pvfs-2.6.0.orig/maint/config/rt.m4	2006-12-10 23:16:47.000000000 -0800
+++ pvfs-2.6.0/maint/config/rt.m4	2006-12-10 23:36:17.000000000 -0800
@@ -12,7 +12,7 @@
 	[lio_listio(LIO_NOWAIT, NULL, 0, NULL);],
 	[AC_MSG_RESULT(no)],
 	[
-		LDFLAGS="$LDFLAGS -lrt"
+		LIBS="$LIBS -lrt"
 		AC_TRY_LINK(
 			[#include <stdlib.h>
 			 #include <unistd.h>



1.1                  sys-cluster/pvfs2/files/2.6.3-register_sysctl_table.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/2.6.3-register_sysctl_table.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/2.6.3-register_sysctl_table.patch?rev=1.1&content-type=text/plain

Index: 2.6.3-register_sysctl_table.patch
===================================================================
--- src/kernel/linux-2.6/pvfs2-proc.c.old	2007-04-30 10:02:55.000000000 +0200
+++ src/kernel/linux-2.6/pvfs2-proc.c	2007-04-30 10:01:50.000000000 +0200
@@ -337,7 +337,7 @@
 #ifdef CONFIG_SYSCTL
     if (!fs_table_header)
     {
-        fs_table_header = register_sysctl_table(fs_table, 0);
+        fs_table_header = register_sysctl_table(fs_table);
     }
 #endif
 



1.1                  sys-cluster/pvfs2/files/pvfs2-server.conf

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-server.conf?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-server.conf?rev=1.1&content-type=text/plain

Index: pvfs2-server.conf
===================================================================
# The three following variables set where pvfs2 will find the fs and server
# configuration files.  If you don't set anything, these default to
# ${PVFS2_CONF_PATH}/pvfs2-<server/fs>.conf
PVFS2_FS_CONF=""

# You can set either of the following.  If PVFS2_SERVER_CONF is set, we
# look for that exact config file.  If PVFS2_SERVER_CONF_BASE is set,
# we look for ${PVFS2_SERVER_CONF_BASE}-$(hostname -s).  The latter
# is useful when distributing an image across multiple machines.  When
# both are defined, preference is given to the the latter.
PVFS2_SERVER_CONF=""
PVFS2_SERVER_CONF_BASE=""


# your server binary, default is shown.
PVFS2SERVER=/usr/sbin/pvfs2-server

# location of your config files
PVFS2_CONF_PATH=/etc

# the server will record its PID in this file using the -p argument
PVFS2_PIDFILE=/var/run/pvfs2.pid

#Additional options
PVFS2_OPTIONS=""

# Automatically call pvfs2-server with --mkfs when we detect that the
# server is not continuing to run?
PVFS2_AUTO_MKFS=0



1.1                  sys-cluster/pvfs2/files/pvfs2-server.rc

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-server.rc?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-server.rc?rev=1.1&content-type=text/plain

Index: pvfs2-server.rc
===================================================================
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-server.rc,v 1.1 2007/10/05 14:03:13 mabi Exp $

checkconfig() {
	local piddir=$(dirname "${PVFS2_PIDFILE}")
	if [ ! -d "${piddir}" ]; then
		mkdir -p "${piddir}" || return 1
	fi

	# verify presence of server binary
	if ! [ -x "${PVFS2SERVER}" ]; then
		eerror "Error: could not find executable ${PVFS2SERVER}"
		return 1
	fi

	# look for fs conf
	if [ -n "${PVFS2_FS_CONF}" ]; then
		PVFS2_FS_CONF="${PVFS2_CONF_PATH}/${PVFS2_FS_CONF}"
	else
		PVFS2_FS_CONF="${PVFS2_CONF_PATH}"/pvfs2-fs.conf
	fi

	if ! [ -r "${PVFS2_FS_CONF}" ]; then
		eerror "Error: could not read ${PVFS2_FS_CONF}"
		return 1
	fi

	# look for server conf
	if [ -n "${PVFS2_SERVER_CONF_BASE}" ]; then 
		local myhost=`hostname -s`
		if [ "${myhost}" == "localhost" ]; then
			ewarn "Warning: detected hostname as localhost, may confuse PVFS2 startup"
		fi
		PVFS2_SERVER_CONF="${PVFS2_CONF_PATH}/${PVFS2_SERVER_CONF_BASE}-${myhost}"
	elif [ -n "${PVFS2_SERVER_CONF}" ]; then
		PVFS2_SERVER_CONF="${PVFS2_CONF_PATH}/${PVFS2_SERVER_CONF}"
	else
		PVFS2_SERVER_CONF="${PVFS2_CONF_PATH}/pvfs2-server.conf"
	fi

	if ! [ -r "${PVFS2_SERVER_CONF}" ]; then
		eerror "Error: could not read ${PVFS2_SERVER_CONF}"
		return 1
	fi
}

depend() {
	after localmount netmount nfsmount dns
	use net
}

start() {
	ebegin "Starting PVFS2 server"
	local rc
	checkconfig || return 1

	start-stop-daemon -b --start  --quiet \
		--pidfile "${PVFS2_PIDFILE}" \
		--exec "${PVFS2SERVER}" -- -p "${PVFS2_PIDFILE}" ${PVFS2_OPTIONS} \
		"${PVFS2_FS_CONF}" "${PVFS2_SERVER_CONF}"
	rc=$?

	# Optionally force pvfs2-server to generate the pvfs2 filesystem.
	if [[ $PVFS2_AUTO_MKFS -ne 0 ]]; then
		local test_pid
		sleep 1
		test_pid=$(pidof pvfs2-server)
		if [ -z "$test_pid" ] || [ ! -f "${PVFS2_PIDFILE}" ] || [[ $test_pid -ne `cat ${PVFS2_PIDFILE}` ]]; then
			rm -f "${PVFS2_PIDFILE}" &>/dev/null
			ewarn "Initializing the file system storage with --mkfs"
			"${PVFS2SERVER}"  --mkfs "${PVFS2_FS_CONF}" "${PVFS2_SERVER_CONF}"
			rc=$?
			if [[ $rc -ne 0 ]]; then
				eerror "Failed to initialize the filesystem storage with --mkfs"
				eend ${rc}
				return 1
			fi
			start-stop-daemon -b --start  --quiet \
				--pidfile ${PVFS2_PIDFILE} \
				--exec ${PVFS2SERVER} -- -p "${PVFS2_PIDFILE}" ${PVFS2_OPTIONS} \
				"${PVFS2_FS_CONF}" "${PVFS2_SERVER_CONF}"
			rc=$?
		fi
	fi

	if [[ $rc -ne 0 ]]; then
		eend $rc "Error starting PVFS2 server"
		return 1
	else
		eend 0
		return 0
	fi
}

stop() {
	ebegin "Stopping PVFS2 server"
	start-stop-daemon --stop  --quiet --pidfile "${PVFS2_PIDFILE}"
	eend $? "Error stopping PVFS2 server"
}

restart() {
	svc_stop
	sleep 2
	svc_start
}



1.1                  sys-cluster/pvfs2/files/pvfs2-client.conf

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-client.conf?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/pvfs2/files/pvfs2-client.conf?rev=1.1&content-type=text/plain

Index: pvfs2-client.conf
===================================================================
# Extra arguments to supply to the pvfs2-client daemon
#PVFS2_CLIENT_ARGS="-L /var/log/pvfs2-client.log"

# Location of the pvfs2-client binaries.  Defaults are shown
PVFS2_CLIENT="/usr/sbin/pvfs2-client"
PVFS2_CLIENT_CORE="/usr/sbin/pvfs2-client-core"

# Location to mount the pvfs2 filesystem
PVFS2_MOUNTPOINT="/pfs"

# A pvfs2 metadata server.
PVFS2_SERVER_HOST="localhost"

# Location to store pid
PVFS2_CLIENT_PIDFILE="/var/run/pvfs2-client.pid"



-- 
gentoo-commits@g.o mailing list