File project.diff of Package ocfs2-tools

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package ocfs2-tools (Revision 2dffe83bad578ab1ae9a0f317d23eca8)

Currently displaying revision 2dffe83bad578ab1ae9a0f317d23eca8 , Show latest

--- o2cb.ocf.orig
+++ o2cb.ocf
@@ -1,5 +1,6 @@
 #!/bin/bash
 # Copyright (c) 2008 Andrew Beekhof
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany
 #                    All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -33,347 +34,23 @@
 : ${OCF_RESKEY_configfs:="/sys/kernel/config"}
 : ${OCF_RESKEY_CRM_meta_gloablly_unique:="false"}
 
-# Common variables
-DAEMON="/usr/sbin/ocfs2_controld.${OCF_RESKEY_stack}"
-CLUSTER_STACK_FILE="${OCF_RESKEY_sysfs}/ocfs2/cluster_stack"
-LOADED_PLUGINS_FILE="${OCF_RESKEY_sysfs}/ocfs2/loaded_cluster_plugins"
-
-#
-# Check to see if a filesystem driver is loaded.
-# 0 is loaded, 1 is not.
-#
-driver_filesystem() {
-    if [ -z "$1" ]
-    then
-        ocf_log err "driver_filesystem(): Missing an argument"
-        exit 1
-    fi
-    FSNAME="$1"
-
-    FSOUT="$(awk '(NF == 1 && $1 ~ /^'$FSNAME'$/) || $2 ~ /^'$FSNAME'$/{
-                      print $1;exit
-                  }' /proc/filesystems 2>/dev/null)"
-
-    test -n "$FSOUT"
-    return $?
-}
-
-#
-# Check to see if a filesystem of type $1 is mounted at $2.
-#
-# 0 is mounted, 1 is not.
-#
-check_filesystem()
-{
-    if [ "$#" != "2" -o -z "$1" -o -z "$2" ]
-    then
-        ocf_log err "check_filesystem(): Missing arguments"
-        exit 4
-    fi
-    FSNAME="$1"
-    MOUNTPOINT="$2"
-
-    FULL_MOUNTSEARCH="`echo "$MOUNTPOINT" | sed -e 's/\//\\\\\//g'`"
-    MOUNTOUT="`awk '$2 ~ /^'$FULL_MOUNTSEARCH'$/ && $3 ~ /^'$FSNAME'$/{print $2; exit}' < /proc/mounts 2>/dev/null`"
-    test -n "$MOUNTOUT"
-    return $?
-}
-
-#
-# Unload a filesystem driver.  
-# Be careful to notice if the driver is built-in and do nothing.
-#
-# 0 is success, 1 is error, 2 is already unloaded.
-#
-unload_filesystem()
-{
-    if [ "$#" != "1" -o -z "$1" ]
-    then
-        ocf_log err "unload_filesystem(): Missing an argument"
-        return 1
-    fi
-    FSNAME="$1"
-
-    driver_filesystem "$FSNAME" || return 2
-
-    MODOUT="`awk '$1 ~ /^'$FSNAME'$/{print $1,$3;exit}' < /proc/modules 2>/dev/null`"
-    if [ -z "$MODOUT" ]; then
-        # The driver is built in, we can't unload it.
-        return 0
-    fi
-
-    case "$MODOUT" in
-    $FSNAME\ 0)
-        ;;
-    $FSNAME\ *)
-        # The driver is busy, leave it alone
-        ocf_log err "Module $FSNAME is still in use"
-        return 1
-        ;;
-    *)
-        ocf_log err "Invalid module parsing! "
-        return 1
-        ;;
-    esac
-
-    modprobe -rs "$FSNAME"
-    if [ "$?" != 0 ]; then
-        ocf_log err "Unable to unload module: $FSNAME"
-        return 1
-    fi
-
-    return 0
-}
-
-status_daemon()
-{
-    PID=`pidofproc "$DAEMON"`
-    if [ -n "$PID" ]; then
-	return $OCF_SUCCESS
-    fi
-    return $OCF_NOT_RUNNING
-}
-
-bringup_daemon()
-{
-    if [ ! -e "$DAEMON" ]; then
-	ocf_log err "Required binary not found: $DAEMON"
-	return $OCF_ERR_INSTALLED
-    fi
-
-    start_daemon "$DAEMON"; rc=$?
-    if [ $rc != 0 ]; then
-	ocf_log err "Could not start $DAEMON"
-	return $OCF_ERR_GENERIC
-    fi
-
-    sleep 1
-    COUNT=0
-    rc=$OCF_NOT_RUNNING
-
-    while [ $rc = $OCF_NOT_RUNNING ]; do
-        COUNT=`expr $COUNT + 1`
-        if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then
-	    ocf_log err "`basename $DAEMON` did not come up"
-	    ps axf | grep -C 3 $$
-	    return $OCF_ERR_GENERIC
-        fi
-	status_daemon; rc=$?
-        sleep 1
-    done
-
-    return $rc
-}
-
-kill_daemon()
-{
-    status_daemon; rc=$?
-    if [ $rc == $OCF_NOT_RUNNING ]; then
-	return 0
-    fi
-
-    ocf_log info "Stopping `basename "$DAEMON"`"
-    killproc "$DAEMON"
-
-    while [ $rc != $OCF_NOT_RUNNING ]; do
-	sleep 1
-	status_daemon; rc=$?
-    done
-    return 0
-}
-
-#
-# Unload a module
-# 0 is success, 1 is error, 2 is not loaded
-#
-unload_module()
-{
-    if [ "$#" -lt "1" -o -z "$1" ]
-    then
-	ocf_log err  "unload_module(): Requires an argument"
-        return 1
-    fi
-    MODNAME="$1"
-
-    MODOUT="`awk '$1 ~ /^'$MODNAME'$/{print $1,$3;exit}' < /proc/modules 2>/dev/null`"
-    if [ -z "$MODOUT" ]
-    then
-        return 2
-    fi
-
-    case "$MODOUT" in
-    $MODNAME\ 0)
-        ;;
-    $MODNAME\ *)
-        return 2
-        ;;
-    *)
-	ocf_log err "Invalid module parsing!"
-        return 1
-        ;;
-    esac
-
-    modprobe -rs "$MODNAME"
-    if [ "$?" != 0 ]; then
-	ocf_log err "Unable to unload module \"$MODNAME\""
-        return 1
-    fi
-
-    return 0
-}
-
 o2cb_start() {
-
-    o2cb_monitor; rc=$?
-    if [ $rc != $OCF_NOT_RUNNING ]; then 
-	return $rc
-    fi
-
-    ocf_log info "Starting $OCF_RESOURCE_INSTANCE"
-
-    if [ ! -e "$CLUSTER_STACK_FILE" ]; then
-	modprobe -s ocfs2_stackglue
-	if [ $? != 0 ]; then
-	    ocf_log err "Could not load ocfs2_stackglue"
-	    return $OCF_ERR_INSTALLED
-	fi
-    fi
-
-    SP_OUT="$(awk '/^'user'$/{print; exit}' "$LOADED_PLUGINS_FILE" 2>/dev/null)"
-    if [ -z "$SP_OUT" ]
-    then
-        modprobe -s ocfs2_stack_user
-	if [ $? != 0 ]; then
-	    ocf_log err "Could not load ocfs2_stack_user"
-	    return $OCF_ERR_INSTALLED
-	fi
-    fi
-
-    SP_OUT="$(awk '/^'user'$/{print; exit}' "$LOADED_PLUGINS_FILE" 2>/dev/null)"
-    if [ -z "$SP_OUT" ]; then
-	ocf_log err "Switch to userspace stack unsuccessful"
-	return $OCF_ERR_INSTALLED
-    fi
-
-    if [ -f "$CLUSTER_STACK_FILE" ]; then
-        echo "$OCF_RESKEY_stack" >"$CLUSTER_STACK_FILE"
-        if [ $? != 0 ]; then
-	    ocf_log err "Userspace stack '$OCF_RESKEY_stack' not supported"
-	    return $OCF_ERR_INSTALLED
-	fi
-    else
-	ocf_log err "Switch to userspace stack not supported"
-	return $OCF_ERR_INSTALLED
-    fi
-
-    driver_filesystem ocfs2; rc=$?
-    if [ $rc != 0 ]; then
-	modprobe -s ocfs2
-	if [ "$?" != 0 ]; then
-            ocf_log err "Unable to load ocfs2 module"
-            return $OCF_ERR_INSTALLED
-	fi
-    fi
-
-    bringup_daemon
-    return $?
+    ocf_log info "o2cb is now obsolete. Please remove the o2cb resource agent in your next maintenance window!"
+    return $OCF_SUCCESS
 }
 
 o2cb_stop() {
-    o2cb_monitor; rc=$?
-    case $rc in
-	$OCF_NOT_RUNNING) return $OCF_SUCCESS;;
-    esac
-
-    ocf_log info "Stopping $OCF_RESOURCE_INSTANCE"
-
-    kill_daemon
-    if [ $? != 0 ]; then 
-        ocf_log err "Unable to unload modules: the cluster is still online"
-	return $OCF_ERR_GENERIC
-    fi
-
-    unload_filesystem ocfs2
-    if [ $? = 1 ]; then
-	ocf_log err "Unable to unload ocfs2 module"
-	return $OCF_ERR_GENERIC
-    fi
-
-    # If we can't find the stack glue, we have nothing to do.
-    [ ! -e "$LOADED_PLUGINS_FILE" ] && return $OCF_SUCCESS
-
-    while read plugin
-    do
-        unload_module "ocfs2_stack_${plugin}"
-        if [ $? = 1 ]; then
-	    ocf_log err "Unable to unload ocfs2_stack_${plugin}"
-	    return $OCF_ERR_GENERIC
-	fi
-    done <"$LOADED_PLUGINS_FILE"
-
-    unload_module "ocfs2_stackglue"
-    if [ $? = 1 ]; then
-	ocf_log err "Unable to unload ocfs2_stackglue"
-	return $OCF_ERR_GENERIC
-    fi
-
-    # Dont unmount configfs - its always in use by libdlm
-}
-
-o2cb_monitor() {
-    o2cb_validate
-
-    # Assume that ocfs2_controld will terminate if any of the conditions below are met
-
-    driver_filesystem configfs; rc=$?
-    if [ $rc != 0 ]; then
-	ocf_log info "configfs not laoded"
-	return $OCF_NOT_RUNNING
-    fi
-
-    check_filesystem configfs "${OCF_RESKEY_configfs}"; rc=$?
-    if [ $rc != 0 ]; then
-	ocf_log info "configfs not mounted"
-	return $OCF_NOT_RUNNING
-    fi
-
-    if [ ! -e "$LOADED_PLUGINS_FILE" ]; then
-	ocf_log info "Stack glue driver not loaded"
-	return $OCF_NOT_RUNNING
-    fi
-
-    grep user "$LOADED_PLUGINS_FILE" >/dev/null 2>&1; rc=$?
-    if [ $rc != 0 ]; then
-	ocf_log err "Wrong stack `cat $LOADED_PLUGINS_FILE`"
-	return $OCF_ERR_INSTALLED
-    fi
-
-    driver_filesystem ocfs2; rc=$?
-    if [ $rc != 0 ]; then
-	ocf_log info "ocfs2 not loaded"
-	return $OCF_NOT_RUNNING
-    fi
-
-    status_daemon
-    return $?
+    ocf_log info "o2cb is now obsolete. Please remove the o2cb resource agent in your next maintenance window!"
+    return $OCF_SUCCESS
 }
 
 o2cb_usage() {
-    echo "usage: $0 {start|stop|monitor|validate-all|meta-data}"
-    echo "  Expects to have a fully populated OCF RA-compliant environment set."
-    echo "  In particualr, a value for OCF_ROOT"
+    echo "usage: $0 {start|stop|meta-data}"
+    return $OCF_SUCCESS
 }
 
-o2cb_validate() {
-    : TODO: check for gloablly_unique=true and return OCF_ERR_CONFIGURED
-    case ${OCF_RESKEY_CRM_meta_gloablly_unique} in
-	yes|Yes|true|True|1) 
-	    ocf_log err "$OCF_RESOURCE_INSTANCE must be configured with the gloablly_unique=false meta attribute"
-	    exit $OCF_ERR_CONFIGURED
-	    ;;
-    esac
-
-    return $OCF_SUCCESS
+o2cb_monitor() {
+	return $OCF_SUCCESS
 }
 
 meta_data() {
@@ -382,51 +59,16 @@ meta_data() {
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="o2cb">
   <version>1.0</version>
-  <shortdesc lang="en">o2cb resource agent</shortdesc>
+  <shortdesc lang="en">OBSOLETE o2cb resource agent OBSOLETE</shortdesc>
   <longdesc lang="en">
-This is a o2cb Resource Agent. It runs o2cb daemon as a instance of anonymous clone.
+This is a o2cb Resource Agent. This is now obsolete!
   </longdesc>
   <parameters>
-
-    <parameter name="sysfs" unique="0">
-      <longdesc lang="en">
-Location where sysfs is mounted
-      </longdesc>
-      <shortdesc lang="en">Sysfs location</shortdesc>
-      <content type="string" default="/sys/fs"/>
-    </parameter>
-
-    <parameter name="configfs" unique="0">
-      <longdesc lang="en">
-Location where configfs is mounted
-      </longdesc>
-      <shortdesc lang="en">Configfs location</shortdesc>
-      <content type="string" default="/sys/kernel/config"/>
-    </parameter>
-
-    <parameter name="stack" unique="0">
-      <longdesc lang="en">
-Which userspace stack to use.  Known values: pcmk, cman
-      </longdesc>
-      <shortdesc lang="en">Userspace stack</shortdesc>
-      <content type="string" default="pcmk"/>
-    </parameter>
-
-    <parameter name="daemon_timeout" unique="0">
-      <longdesc lang="en">
-Number of seconds to allow the control daemon to come up
-      </longdesc>
-      <shortdesc lang="en">Daemon Timeout</shortdesc>
-      <content type="string" default="10"/>
-    </parameter>
-
   </parameters>
   <actions>
     <action name="start"         timeout="90" />
     <action name="stop"          timeout="100" />
     <action name="monitor"       timeout="20" depth="0"/>
-    <action name="meta-data"     timeout="5" />
-    <action name="validate-all"  timeout="30" />
   </actions>
 </resource-agent>
 END
@@ -440,10 +82,8 @@ start)		o2cb_start
 		;;
 stop)		o2cb_stop
 		;;
-monitor)	o2cb_monitor
-		;;
-validate-all)	o2cb_validate
-		;;
+monitor)        o2cb_monitor
+                ;;
 usage|help)	o2cb_usage
 		exit $OCF_SUCCESS
 		;;
--- ocfs2-tools.changes.orig
+++ ocfs2-tools.changes
@@ -1,4 +1,70 @@
 -------------------------------------------------------------------
+Tue Sep  3 09:14:16 CDT 2013 - rgoldwyn@suse.com
+
+- Make mount.ocfs2 load ocfs2 kmp and setup cluster_stack if 
+  not found
+   + 0008-mount.ocfs2-Read-stack-from-device-and-setup-stack-i.patch
+
+-------------------------------------------------------------------
+Thu Aug 22 13:18:01 CDT 2013 - rgoldwyn@suse.com
+
+- Mark o2cb.ocf as obsolete. Anyone using o2cb.ocf will get an
+  info message stating so.
+
+-------------------------------------------------------------------
+Tue Aug 20 08:02:13 CDT 2013 - rgoldwyn@suse.com
+
+- The nocontrold effort (added nocontrold patches and disabled
+  corosync-2.3 controld compatibility patches): 
+  + 0001-libo2cb-Remove-controld-actions-from-group-join-leav.patch
+  + 0002-libo2cb-Remove-rest-of-controld-functions.patch
+  + 0003-Get-cluster-name-from-corosync-cmap.patch
+  + 0004-Remove-controld-structures-from-debugfs.ocfs2.patch
+  + 0005-Check-for-DLM-kernel-version-in-user_begin_group_joi.patch
+  + 0006-Add-cmap-and-dlm-libraries-in-the-tools.patch
+  - 0001-Remove-pacemaker-ais-stuff.patch
+  - 0002-Add-corosync-cfg-to-get-configuration-information.patch
+  - 0003-Remove-daemon-protocol-versions-and-consolidate-fs-v.patch
+  - 0005-Add-cluster_name-and-stack-name.patch
+
+-------------------------------------------------------------------
+Sat Aug 17 09:26:19 CDT 2013 - rgoldwyn@suse.com
+
+- libocfs2-Change-asserts-to-error.patch: Return control to 
+  fsck.ocfs2 instead of erring
+
+-------------------------------------------------------------------
+Fri Aug  9 13:55:01 CDT 2013 - rgoldwyn@suse.com
+
+- Add libraries back in devel package. This is required for
+  ocfs2-test
+- libocfs2-needs-libaio.patch: Add -laio to ocfs2.pc
+
+-------------------------------------------------------------------
+Tue Aug  6 09:21:41 CDT 2013 - rgoldwyn@suse.com
+
+- Fix FS protocol versions: 
+  + 0003-Remove-daemon-protocol-versions-and-consolidate-fs-v.patch
+  - 0003-Hard-code-protocol-versions.patch
+
+-------------------------------------------------------------------
+Wed Jul 31 08:01:02 CDT 2013 - rgoldwyn@suse.com
+
+- Get ocfs2_controld up to speed with corosync 2.3.x
+  + 0001-Remove-pacemaker-ais-stuff.patch
+  + 0002-Add-corosync-cfg-to-get-configuration-information.patch
+  + 0003-Hard-code-protocol-versions.patch
+  + 0005-Add-cluster_name-and-stack-name.patch
+  - ocfs2_controld-pacemaker.diff
+
+-------------------------------------------------------------------
+Mon Jul 22 10:57:44 UTC 2013 - ygao@suse.com
+
+- ocfs2_controld: ocfs2_controld-pacemaker.diff
+  * Replace use of send_ais_text() with send_cluster_text()
+  * Replace use of ais_dispatch() with plugin_dispatch()
+
+-------------------------------------------------------------------
 Wed Jul  3 07:40:31 CDT 2013 - rgoldwyn@suse.com
 - ocfs2console-libraries-include-aio.patch: Include aio 
   while compiling ocfs2console (bnc#827504)
--- ocfs2-tools.spec.orig
+++ ocfs2-tools.spec
@@ -29,7 +29,6 @@ Source2:        reflink.tar.bz2
 Patch101:       force-debug.patch
 Patch102:       extra-debug.patch
 Patch103:       debug-ocfs2_hb_ctl.patch
-Patch104:       ocfs2_controld-pacemaker.diff
 Patch105:       bug-470741-debug_start_failures.patch
 Patch106:       ocfs2-devel.diff
 Patch107:       reflink-no-syscall.patch
@@ -46,14 +45,22 @@ Patch212:       bug-805764-ocfs2-control
 Patch213:       bnc804707-reduce-RR-priority.patch
 Patch214:       use-symlink-in-udev-rules.patch
 Patch215:       ocfs2console-libraries-include-aio.patch
+Patch220:       libocfs2-needs-libaio.patch
+Patch221:       libocfs2-Change-asserts-to-error.patch
+Patch222:       0001-libo2cb-Remove-controld-actions-from-group-join-leav.patch
+Patch223:       0002-libo2cb-Remove-rest-of-controld-functions.patch
+Patch224:       0003-Get-cluster-name-from-corosync-cmap.patch
+Patch225:       0004-Remove-controld-structures-from-debugfs.ocfs2.patch
+Patch226:       0005-Check-for-DLM-kernel-version-in-user_begin_group_joi.patch
+Patch227:       0006-Add-cmap-and-dlm-libraries-in-the-tools.patch
+Patch229:       0008-mount.ocfs2-Read-stack-from-device-and-setup-stack-i.patch
+
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  libaio-devel
 BuildRequires:  libbz2-devel
 BuildRequires:  libcorosync-devel
 BuildRequires:  libdlm-devel
-BuildRequires:  libopenais-devel
-BuildRequires:  libpacemaker-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  libz1
 BuildRequires:  python-devel
@@ -69,7 +76,6 @@ Requires:       e2fsprogs
 Requires:       glib2 >= 2.2.3
 Requires:       modutils
 Requires:       net-tools
-Requires:       openais
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} < 1120
 # There's no separate kmp for openSUSE 11.2
@@ -128,7 +134,6 @@ managing the file system.
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
-%patch104 -p1
 %patch105 -p1
 %patch106 -p1
 %patch107 -p0
@@ -145,6 +150,15 @@ managing the file system.
 %patch213 -p1
 %patch214 -p1
 %patch215 -p1
+%patch220 -p1
+%patch221 -p1
+%patch222 -p1
+%patch223 -p1
+%patch224 -p1
+%patch225 -p1
+%patch226 -p1
+%patch227 -p1
+%patch229 -p1
 
 %build
 export PROJECT="ocfs2-tools"
@@ -181,9 +195,10 @@ cd ..
 
 mv %{buildroot}/{,/usr}/sbin/o2image
 mv %{buildroot}/{,/usr}/sbin/debugfs.ocfs2
-mv %{buildroot}/{,/usr}/sbin/ocfs2_controld.pcmk
-find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f
-find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f
+#mv %{buildroot}/{,/usr}/sbin/ocfs2_controld.pcmk
+chmod a-x %{buildroot}/%{_libdir}/libo2cb.a
+chmod a-x %{buildroot}/%{_libdir}/libo2dlm.a
+chmod a-x %{buildroot}/%{_libdir}/libocfs2.a
 python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}/ocfs2interface', ddir='%{py_sitedir}/ocfs2interface')"
 
 %preun o2cb
@@ -210,7 +225,7 @@ python -c "import compileall; compileall
 /sbin/o2cluster
 %{_sbindir}/o2image
 %{_sbindir}/debugfs.ocfs2
-%{_sbindir}/ocfs2_controld.pcmk
+#%{_sbindir}/ocfs2_controld.pcmk
 %{_sbindir}/o2hbmonitor
 %{_bindir}/reflink
 %{_bindir}/o2info
@@ -264,5 +279,8 @@ python -c "import compileall; compileall
 %{_libdir}/pkgconfig/o2cb.pc
 %{_libdir}/pkgconfig/o2dlm.pc
 %{_libdir}/pkgconfig/ocfs2.pc
+%{_libdir}/libo2cb.a
+%{_libdir}/libo2dlm.a
+%{_libdir}/libocfs2.a
 
 %changelog

Places

File project.diff of Package ocfs2-tools (Revision 2dffe83bad578ab1ae9a0f317d23eca8)

Places