[Pacemaker] [PATCH] Small fixes to the controld RA

[Andrew Beekhof]

Hi,

If you resend as a "hg export" I'll apply it (hg export includes your
details so you 'll be properly credited).
Be sure to use a non-inlined attachment, otherwise whitespace tends to
get mangled.

-- Andrew

On Mon, Dec 28, 2009 at 4:54 PM, Jiaju Zhang <jjzhang.linux at gmail.com> wrote:
> Hi,
>
> This patch contains two small fixes.
>
> One is to remove the configuration option for SCTP protocol. The
> reason is before dlm_controld.pcmk starts up, the directory
> /sys/kernel/config/dlm/cluster/protocol doesn't exist, so the original
> code can't work as expected. Also, as dlm_controld.pcmk for now has
> supported to configure SCTP protocol via command option or detect the
> protocol automatically, it may be no need to do this in the controld
> RA.
>
> The other is to make the directory /var/run/cluster since
> dlm_controld.pcmk has changed its lock file dlm_controld.pid from the
> directory /var/run to /var/run/cluster.
>
> Thanks for your review :)
>
> Thanks,
> Jiaju
>
> ---
> diff --git a/extra/resources/controld b/extra/resources/controld
> --- a/extra/resources/controld
> +++ b/extra/resources/controld
> @@ -54,14 +54,6 @@ Any additional options to start the dlm_
>  </longdesc>
>  <shortdesc lang="en">DLM Options</shortdesc>
>  <content type="string" default="-q 0" />
> -</parameter>
> -
> -<parameter name="sctp" unique="1">
> -<longdesc lang="en">
> -Multi-homed hosts, ones with multiple interfaces, need to use the SCTP protocol instead of TCP.
> -</longdesc>
> -<shortdesc lang="en">Enable the SCTP protocol</shortdesc>
> -<content type="boolean" default="false" />
>  </parameter>
>
>  <parameter name="configdir" unique="1">
> @@ -125,13 +117,6 @@ controld_start() {
>           fi
>        fi
>
> -    case $OCF_RESKEY_sctp in
> -      true|TRUE|True|yes|YES|Yes|1)
> -           echo 1 > /sys/kernel/config/dlm/cluster/protocol;;
> -      *)
> -           echo 0 > /sys/kernel/config/dlm/cluster/protocol;;
> -    esac
> -
>     ${OCF_RESKEY_daemon} $OCF_RESKEY_args
>
>     sleep 1
> @@ -184,6 +169,8 @@ controld_validate() {
>            ;;
>     esac
>
> +    [ -d /var/run/cluster ] || mkdir /var/run/cluster
> +
>     return $OCF_SUCCESS
>  }
>
>
> _______________________________________________
> Pacemaker mailing list
> Pacemaker at oss.clusterlabs.org
> http://oss.clusterlabs.org/mailman/listinfo/pacemaker
>