Hi,

comments inline.

On 1/23/20 3:56 AM, Rosen Penev wrote:
> From: Joseph Tingiris <joseph.tingi...@gmail.com>
> 
> This is a significant revision of /etc/init.d/mdadm.  It adds new
> features, support for new configuration options, safer error
> handling, (configurable) verbose output, and contains multiple bug
> fixes.
> 
> Most notably, mdadm was being started with the --config flag and
> that prevented it from using its built in Auto Assembly features.
> Users were required to put a correct uuid in /etc/config/mdadm.
> 
> The new default startup mode is now to automatically assemble all
> RAID arrays attached to the machine using device scans, rather than
> configuation options.
> 
> A new UCI section, config mdadm global, was added with new options that
> are supported by the accompanying /etc/init.d/mdadm. Documentation for all
> new (and previous) options was added as well.  See the
> /etc/config/mdadmin or mdadm.init file itself for more details.
> 
> Additionally, a new stateful 'auto' feature was added that functions
> similarly to the stateless Auto Assembly feature.  The benefits of
> stateful auto assembly are to support features that mdadm 4.0 will only
> read from a configuration file, such as setting the MAILFROM value.  The
> new mdadm_conf_auto() function will also aid users in troubleshooting.
> When verbose is turned on it provides tips and better visibility for what's
> actually happening.
> 
> Backward compatibility was retained.  Stateful UCI only configurations are
> supported.  All previously existing configurations will work in this mode.
> However, these users will now have to explicitly turn it on.
> 
> A new reload_service() function was added to prevent reloads from
> stopping mdadm.  Reloads will now be ignored, though the stage is set for
> reloads to trigger scans for new devices.  Explicit restarts still work as
> expected.
> 
> The start_service() function was enhanced to query new UCI mdadm.global
> options: alert_program, config, email, email_from, monitor_frequency,
> and verbose.  Each option is documented in /etc/mdadm/config (config.init) and
> some additional code comments were added.
> 
> Finally, error handling and verbose output was enhanced.  Users will
> know what's going on (if verbose is turned on).
> 
> Strict reliance on a shell global ($CONF) was removed and replaced with a
> single global ($TMP_FILE) that's for development convenience.  When/if a 
> config
> file is not specified in the UCI config, it will fall back to using $TMP_FILE 
> as the
> configuration file.
> 
> Incremented PKG_RELEASE from 1 to 2
> 
> Signed-off-by: Joseph Tingiris <joseph.tingi...@gmail.com>
> (rebased and ran through shellcheck)
> Signed-off-by: Rosen Penev <ros...@gmail.com>
> ---
>  v3: Simplified several sections
>  v2: Rebased after sysmacro patches
>  package/utils/mdadm/Makefile           |   2 +-
>  package/utils/mdadm/files/mdadm.config | 162 +++++++-
>  package/utils/mdadm/files/mdadm.init   | 552 ++++++++++++++++++++++---
>  3 files changed, 643 insertions(+), 73 deletions(-)
> 
> diff --git a/package/utils/mdadm/Makefile b/package/utils/mdadm/Makefile
> index f20a58b704..d5ea91eeed 100644
> --- a/package/utils/mdadm/Makefile
> +++ b/package/utils/mdadm/Makefile
> @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
>  
>  PKG_NAME:=mdadm
>  PKG_VERSION:=4.1
> -PKG_RELEASE:=2
> +PKG_RELEASE:=3
>  
>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
>  PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm
> diff --git a/package/utils/mdadm/files/mdadm.config 
> b/package/utils/mdadm/files/mdadm.config
> index 50afbc2ab6..0c78c964a8 100644
> --- a/package/utils/mdadm/files/mdadm.config
> +++ b/package/utils/mdadm/files/mdadm.config
> @@ -1,18 +1,154 @@
> -config mdadm
> +#
> +# The mdadm 'global' section is for options that apply to all sections.
> +#
> +
> +config mdadm global
> +
> +     #
> +     # option 'alert_program' values may be a path to a valid, executable 
> binary.
> +     #
> +     # The default 'alert_program' is not set.
> +     #
> +     # When mdadm detects an event it will execute this program with 3 
> arguments, see https://linux.die.net/man/8/mdadm
> +     # $1 = will be the event
> +     # $2 = will be the meta device
> +     # $3 = may be a related component (if one exists)
> +     #
> +     # * alert_program runs independently from sendmail.
> +     # * If both options alert_program and email are set, and both work, 
> then an email and a
> +     #   custom alert will be generated.
> +     # * no alert program is included in mdadm 4.0-4.
> +     #
> +     # Lots of possibilities exist, i.e. scripts for netdata, slack, etc.
> +     #
> +     #option alert_program /usr/sbin/mdadm_alerts
> +
> +
> +     #
> +     # option 'config' values may be one of the following.
> +     #
> +     # The default 'config' is none (stateless auto assembly).
> +     #
> +     # auto          - stateful, dynamically generated mdadm.conf via block 
> info,
> +     #                 stored in /var/etc/mdadm.conf
> +     # containers    - stateless, mdadm --assemble --scan 
> --config=containers; see https://linux.die.net/man/8/mdadm
> +     # none          - stateless, mdadm --assemble --scan --config=none; aka 
> 'Auto Assembly',
> +     #                 see https://linux.die.net/man/8/mdadm
> +     # partition     - stateless, mdadm --assemble --scan 
> --config=partition; see https://linux.die.net/man/8/mdadm
> +     # uci           - stateful, dynamically generated mdadm.conf via uci 
> array values (below),
> +     #                 stored in /var/etc/mdadm.conf
> +     # file          - stateful, manually generated mdadm.conf file(s),
> +     #                 'file' must be preceded by a / and may be a readable 
> filename
> +     #                 or directory with multiple .conf files
> +     #
> +     # Try uncommenting this and using 'auto' if there are issues.  It 
> provides more comprehensive
> +     # diagnostics via verbose messages & the ability to set an email from 
> address.
> +     #
> +     #option config auto
> +
> +
> +     #
> +     # option 'email' values may be a valid (to) email address, or empty.
> +     #
> +     # The default 'email' to send to is root (monitor email will be sent to 
> the local root user).
> +     #
> +     # * Sending mail will only work if /usr/lib/sendmail or 
> /usr/sbin/sendmail is available. Install postfix.
> +     # * Comment, or unset, the email value causes mail to be disabled.  
> With no email value, mdadm wont even try.
> +     # * A single word name must be a valid user on the system, or it will 
> bounce back to root.
> +     #   Unless user 'mdadm' exists (it doesn't by default), this will 
> bounce:
> +     #   option email mdadm
> +     # * A full email address does not need quoting and will deliver if tcp 
> port 25 (SMTP) is allowed outbound, i.e.
> +     #   option email joseph.tingi...@gmail.com
> +     # * mdadm only supports one email address (MAILADDR) for all arrays. 
> see mdadm.conf(5)
> +     #
> +     # mail will be to 'root@$HOSTNAME', i.e. root@OpenWrt
> +     #
>       option email root
> -     # list devices /dev/hd*
> -     # list devices /dev/sd*
> -     # list devices partitions
>  
> -config array
> -     option uuid 52c5c44a:d2162820:f75d3464:799750f8
> -     option device /dev/md0
> -     # option name raid:0
> -     # option super_minor 0
> -     # list devices /dev/sda1
> -     # list devices /dev/sdb1
> -     # option spares 0
> -     # option spare_group spares
> +
> +     #
> +     # option 'email_from' values may be a valid (from) email address, or 
> empty.
> +     #
> +     # The default 'email_from' is 'OpenWrt RAID Monitoring 
> <mdadm@$HOSTNAME>', i.e. mdadm@OpenWrt
> +     #
> +     # * Sending mail will only work if /usr/lib/sendmail or 
> /usr/sbin/sendmail is available. Install postfix.
> +     # * Comment, or unset, the email_from value causes mdadm to send mail 
> from
> +     #   root@$HOSTNAME, e.g. root@OpenWrt
> +     # * A complete from envelope can be specified within quotes, i.e.
> +     #   option email_from 'mdadm monitoring <this_is_not_s...@example.com>'
> +     # * mdadm only supports setting a from address (MAILFROM) with a 
> stateful config,
> +     #   e.g. 'auto' or 'uci'. see mdadm.conf(5)
> +     #
> +     # mail will be from 'OpenWrt RAID Monitoring <mdadm@$HOSTNAME>', i.e. 
> mdadm@OpenWrt
> +     #
> +     option email_from 'OpenWrt RAID Monitoring <mdadm>'
> +
> +
> +     #
> +     # option 'monitor_frequency' values may be a valid integer, or empty.
> +     #
> +     # The default monitor frequency (delayed poll) is 120 seconds.
> +     #
> +     # * This is the polling interval, frequency, or delay.  It's the value 
> for mdadm --delay.  see https://linux.die.net/man/8/mdadm
> +     #
> +     option monitor_frequency 300
> +
> +     #
> +     # option 'verbose' values may be '1', 'on', or 'true', everything else 
> is false.
> +     #
> +     # The default verbosity is false (quiet).
> +     #
> +     # * Standard errors will be sent to console and syslog regardless of 
> this setting.
> +     # * When verbose is false mdadm will run in --quiet mode and generate 
> very little log
> +     #   or standard output.
> +     #
> +     # Turn this on if you're having problems, or want more detail.  With 
> SSH_TTY set output will
> +     # be to that TTY, otherwise it will go to syslog via logger.
> +     #
> +     #option verbose on
> +
> +
> +#
> +# The mdadm 'array' section(s) are for stateful, manual configurations. 
> Experts only.  Use with caution.
> +#
> +#
> +# The use of multiple 'array' sections is supported by /etc/init.d/mdadm.
> +# They must all be named 'array'.
> +#
> +# As of this writing unnamed 'mdadm' sections are still allowed, but 
> deprecated. Do not use.
> +#
> +
> +#config array
> +     #
> +     # example 'array' options may be a valid mix of:
> +     #
> +     # bitmap
> +     # container
> +     # device
> +     # devices
> +     # member
> +     # name
> +     # spare_group
> +     # spares
> +     # super_minor
> +     # uuid
> +     #
>       # option bitmap /bitmap.md
>       # option container 00000000:00000000:00000000:00000000
> +     # option device /dev/md0
> +     # -and/or a devices list-
> +     # list devices /dev/hd* # mdadm allows glob, see glob(7)
> +     # list devices /dev/sd*
> +     # list devices /dev/sda1
> +     # list devices /dev/sdb1
> +     # list devices containers
> +     # list devices partitions
>       # option member 1
> +     # option name raid:0
> +     # option spare_group spares
> +     # option spares 0
> +     # option super_minor 0
> +     # use uuid from block info (preferred), or mdadm --misc --detail 
> /dev/md0
> +     # option uuid 2084de11-70c4-4521-8f95-6113e75f1fe9
> +     #
> +     # These options directly translate to mdadm -- options, see 
> https://linux.die.net/man/8/mdadm
> diff --git a/package/utils/mdadm/files/mdadm.init 
> b/package/utils/mdadm/files/mdadm.init
> index 64a50b35de..eb323ecad0 100644
> --- a/package/utils/mdadm/files/mdadm.init
> +++ b/package/utils/mdadm/files/mdadm.init
> @@ -1,93 +1,527 @@
>  #!/bin/sh /etc/rc.common
>  
> -START=13
> -STOP=98
> +START=12
> +STOP=99
>  
>  USE_PROCD=1
>  PROG=/sbin/mdadm
>  NAME=mdadm
>  
> -CONF="/var/etc/mdadm.conf"
> +LOGGER=0 # off
> +VERBOSE=1 # off
> +
> +TMP_FILE="/var/etc/mdadm.conf" # /var/etc is on /tmp; used for temporary 
> state, to enable stateful only mdadm features
> +
> +[ -x "$PROG" ] || exit 1
>  
>  append_list_item() {
> -     append "$2" "$1" "$3"
> +    append "$2" "$1" "$3"
>  }
>  
>  append_option() {
> -     local var="$1"
> -     local cfg="$2"
> -     local opt="$3"
> -     local name="$4"
> -     local sep="$5"
> -     local str
> -
> -     if [ -n "$sep" ]; then
> -             config_list_foreach "$cfg" "$opt" append_list_item str "$sep"
> -     else
> -             config_get str "$cfg" "$opt"
> -     fi
> -
> -     [ -n "$str" ] && append "$var" $(printf "%s=%s" "${name:-${opt//_/-}}" 
> "$str")
> +    local var="$1"
> +    local cfg="$2"
> +    local opt="$3"
> +    local name="$4"
> +    local sep="$5"
> +    local str
> +
> +    if [ -n "$sep" ]; then
> +        config_list_foreach "$cfg" "$opt" append_list_item str "$sep"
> +    else
> +        config_get str "$cfg" "$opt"
> +    fi
> +
> +    [ -n "$str" ] && append "$var" $(printf "%s=%s" "${name:-${opt//_/-}}" 
> "$str")
>  }
>  
> -mdadm_common() {
> -     local cfg="$1"
> -     local email devices
> +verbose() {
> +    local msg="$1"
> +    local level="$2"
>  
> -     if [ -x /usr/sbin/sendmail ]; then
> -             config_get email "$cfg" email
> -             [ -n "$email" ] && printf "MAILADDR %s\n" "$email" >> $CONF
> -     fi
> +    [ -z "$level" ] && level="INFO"
>  
> -     config_list_foreach "$cfg" devices append_list_item devices " "
> -     [ -n "$devices" ] && printf "DEVICE %s\n" "$devices" >> $CONF
> +    [ "$VERBOSE" = "1" ] && {
> +        if [ ${#SSH_TTY} -gt 0 ]; then
> +            printf "$NAME: init %7s - %b\n" "$level" "$msg"
> +        else
> +            # no SSH_TTY goes to logger
> +            printf "$NAME: init %7s - %b\n" "$level" "$msg" | logger -t mdadm
> +        fi
> +    }
>  }
>  
> -mdadm_array() {
> -     local cfg="$1"
> -     local uuid device devices name array
> +mdadm_conf_auto() {
> +    local mdadm_conf="$1"
> +
> +    [ -w "$mdadm_conf" ] || {
> +        if [ -z "$mdadm_conf" ]; then
> +            verbose "mdadm_conf value is empty" ERROR
> +        else
> +            verbose "'$mdadm_conf' file not found writable" ERROR
> +        fi
> +        return 1
> +    }
> +
> +    local block_md block_uuid mdadm_md mdadm_md_rc mdadm_uuid
> +
> +    # Check block info for active linux_raid_members, if necessary then 
> compare with mdadm, & dynamically update $mdadm_conf
> +
> +    block_md=0 # counter
> +    for block_uuid in $(block info 2> /dev/null | sed -nEe 's#^.* 
> UUID="([^"]*)".*TYPE="linux_raid_member"#\1#p'); do
> +        mdadm_md=""
> +        mdadm_md_rc=0
> +
> +        while [ -z "$mdadm_md" ]; do
> +            if [ -b "/dev/md$block_md" ]; then
> +                # handle mdadm restart, service reload, multiple starts 
> without stops, physical unplug, etc.
> +
> +                verbose "/dev/md$block_md block device already exists" NOTICE
>  
> -     config_get uuid "$cfg" uuid
> -     config_get name "$cfg" name
> -     config_get device "$cfg" device
> +                # active arrays will promptly respond; first check
> +                mdadm_uuid=$($PROG --detail --test --brief 
> "/dev/md$block_md" 2> /dev/null | sed -nEe '1s#^.*UUID=((.){35})#\1#p')
>  
> -     if [ -z "$device" ] || [ -z "$uuid$name" ]; then
> -             echo "Skipping array without device, uuid or name" >&2
> -             return
> -     fi
> +                [ -z "$mdadm_uuid" ] && {
> +                    # When an array is unplugged and then plugged in again 
> (without rebooting) then it becomes an INACTIVE-ARRAY
> +                    # however the device file persists, e.g. /dev/md0, and 
> should be reused, rather than a new device assigned.
> +                    if $PROG --detail --test --scan "/dev/md$block_md" 2> 
> /dev/null | grep -E "^(INACTIVE-ARRAY(\ |\t)(.*)/dev/md(|/)$block_md(\ 
> |\t)metadata)" > /dev/null 2>&1; then
> +                        verbose "attempting to revive INACTIVE-ARRAY on 
> /dev/md$block_md" NOTICE
> +                        if $PROG --examine --scan 2> /dev/null | grep -qE 
> "^(ARRAY(\ |\t)(.*)/dev/md(|/)$block_md(\ |\t))"; then
> +                            # this is relatively safe with the above regex 
> validation
> +                            mdadm_md="/dev/md$block_md"
> +                        fi
> +                    else
> +                        # This is an unsafe condition to handle with a 
> shell, mdadm sees an inactive device with a different /dev.
> +                        # Err to the side of caution;--assemble --scan shoud 
> know what to do ... it will abandon the block device.
> +                        # If these are happening, suggest stateless & 
> sacrifice some minor functionality, e.g. MAILFROM
> +                        # May be an mdadm or kernel bug with this hardware 
> setup.
> +                        verbose "bug? unsafe to revive INACTIVE-ARRAY on 
> /dev/md$block_md" WARNING
> +                        block_md=$((block_md+1))
> +                        continue
> +                    fi
> +                }
>  
> -     [ -n "$uuid" ] && append array "uuid=$uuid"
> -     [ -n "$name" ] && append array "name=$name"
> +                if [ "${block_uuid//-/}" = "${mdadm_uuid//:/}" ]; then
> +                    # block info & mdadm concur all's well; the meta device 
> is active; reuse
> +                    mdadm_md="/dev/md$block_md"
> +                    verbose "auto conf found active RAID member 
> block_uuid=$block_uuid and will reused device '$mdadm_md'" OK
> +                else
> +                    if [ ! -e "/dev/md$block_md" ]; then
> +                        # this block device was never assembled previously; 
> new
> +                        mdadm_md="/dev/md$block_md"
> +                        verbose "auto conf found new RAID member 
> block_uuid=$block_uuid and will assign device '$mdadm_md'" OK
> +                    else
> +                        block_md=$((block_md+1))
> +                        continue
> +                    fi
> +                fi
>  
> -     append_option array "$cfg" super_minor
> -     append_option array "$cfg" spares
> -     append_option array "$cfg" spare_group
> -     append_option array "$cfg" bitmap
> -     append_option array "$cfg" container
> -     append_option array "$cfg" member
> -     append_option array "$cfg" devices devices ","
> +            else
> +                if [ ! -e "/dev/md$block_md" ]; then
> +                    # best scenario; no device or file (yet), safest
> +                    mdadm_md="/dev/md$block_md"
> +                    verbose "auto conf found missing RAID member 
> block_uuid=$block_uuid and will assign device '$mdadm_md'" OK
> +                else
> +                    # a file exists, but it's not a block device? It's 
> possible (touch), albeit a corner case; discretely say
> +                    # we know & pass over it.
> +                    verbose "/dev/md$block_md file found, not a block 
> device" WARNING
> +                    block_md=$((block_md+1))
> +                    continue
> +                fi
> +            fi
>  
> -     printf "ARRAY %s %s\n" "$device" "$array" >> $CONF
> +            $PROG --detail --test --brief $mdadm_md > /dev/null 2>&1 # rc 
> 1=ok, 1=degrade, 2=dead, 4=missing
> +            mdadm_md_rc=$?
> +
> +            # todo: annouce degraded arrays in the logs? mdadmin monitor 
> will do it but not on demand, only per frequency.
> +            #       nice to have for hot plugs ...
> +
> +            verbose "block_md=$block_md, block_uuid=$block_uuid, 
> mdadm_md=$mdadm_md, mdadm_uuid=$mdadm_uuid, rc=$mdadm_md_rc" INFO
> +
> +            if [ $mdadm_md_rc -lt 4 ]; then
> +                $PROG --detail --test --brief $mdadm_md 2> /dev/null >> 
> $mdadm_conf
> +            else
> +                # there's a device with no header.  maybe it's to replace a 
> failed device ...
> +                echo "ARRAY $mdadm_md uuid=$block_uuid" >> $mdadm_conf
> +            fi
> +
> +        done
> +
> +    done
> +
> +    if [ -n "$mdadm_md" ]; then
> +        return 0
> +    else
> +        return 1
> +    fi
> +}
> +
> +mdadm_conf_uci() {
> +    local cfg="$1"
> +    local mdadm_conf="$2"
> +
> +    [ -z "$cfg" ] && {
> +        verbose "cfg is empty" WARNING
> +        return 1
> +    }
> +
> +    local cfg_name
> +    cfg_name=$(uci_get mdadm.$cfg 2> /dev/null)
> +
> +    [ -z "$cfg_name" ] && verbose "($cfg) mdadm config name is empty" NOTICE
> +
> +    [ -z "$mdadm_conf" ] && {
> +        verbose "($cfg) skipping mdadm.$cfg_name array; config file is 
> empty" WARNING
> +        return 1
> +    }
> +
> +    if ! touch "$mdadm_conf" 2> /dev/null; then
> +        verbose "($cfg) skipping mdadm.$cfg_name array; can't touch 
> '$mdadm_conf'" ERROR
> +        return 1
> +    fi
> +
> +    local array device devices name uuid
> +
> +    config_get name "$cfg" name
> +    config_get device "$cfg" device
> +    config_get uuid "$cfg" uuid
> +
> +    config_list_foreach "$cfg" devices append_list_item devices " "
> +    [ -n "$devices" ] && printf "DEVICE %s\n" "$devices" >> $mdadm_conf
> +
> +    if [ -z "$device" ] || [ -z "$uuid$name" ]; then
> +        verbose "($cfg) skipping mdadm.$cfg_name array; no device, uuid, or 
> name" WARNING
> +        return 1
> +    fi
> +
> +    [ -n "$uuid" ] && append array "uuid=$uuid"
> +    [ -n "$name" ] && append array "name=$name"
> +
> +    append_option array "$cfg" super_minor
> +    append_option array "$cfg" spares
> +    append_option array "$cfg" spare_group
> +    append_option array "$cfg" bitmap
> +    append_option array "$cfg" container
> +    append_option array "$cfg" member
> +    append_option array "$cfg" devices devices ","
> +
> +    printf "ARRAY %s %s\n" "$device" "$array" >> $mdadm_conf
> +}
> +
> +reload_service() {
> +    while read -r line; do echo $line; done
> +    # running start_service() on reload should be OK in all modes, except 
> manual configs.
> +    # for auto & none, start_service() already rescans for hotplugged 
> devices, add new arrays, etc.
> +    # could check for the configured mode & call appropriately?  doing 
> nothing is safer; todo: test & resolve
> +    verbose "reload_service called, ignoring" NOTICE
> +    return 0
>  }
>  
>  start_service() {
> -     local email
> +    local config config_detail config_file config_level config_mode 
> config_rc config_state config_verbose mdadm_conf
> +
> +    # mdadm.global specific locals
> +    local alert_program email email_from mail_program mdadm_args 
> monitor_frequency
> +
> +    config_verbose=$(uci_get mdadm.global.verbose 2> /dev/null | awk '{print 
> tolower($1)}')

Suggest replace awk with `tr 'A-Z' 'a-z'`. Invoking awk for the sake of
lowercasing option values (which is done in no other init script) seems 
overkill.

> +    if [ "$config_verbose" = "1" ] || [ "$config_verbose" = "on" ] || [ 
> "$config_verbose" = "true" ]; then
> +        VERBOSE=1 # turn verbose on globally
> +        config_verbose=1
> +        mdadm_args="--verbose"
> +    else
> +        unset -v config_verbose
> +        mdadm_args="--quiet"
> +    fi
> +
> +    verbose "start_service $*" INFO
> +
> +    config_rc=0
> +    config_detail="start"
> +    config_level="INFO"
> +    config_mode="service"
> +
> +    config=$(uci_get mdadm.global.config 2> /dev/null)
> +    if [ -z "$config" ]; then
> +        # per PR1713 discussion; this works very well for the majority of 
> use cases; let mdadm do the heavy lifting.
> +        # none is (Auto Assemble; or no --config); see mdadm(8), default
> +        config='none'
> +        config_detail="mdadm.global.config value is empty"
> +        config_state='stateless'
> +        config_mode="default"
> +        config_level='OK'
> +    else
> +        # experts only
>  
> -     mkdir -p "${CONF%/*}"
> -     printf "# Autogenerated from /etc/config/mdadm, do not edit!\n" > $CONF
> +        config_mode="manual"
>  
> -     config_load mdadm
> -     config_foreach mdadm_common mdadm
> -     config_foreach mdadm_array array
> +        # check file values first, to preserve case of file name values
> +        if [ "${config:0:1}" = "/" ]; then
> +            config_state='stateful' # all types of file configs are stateful
>  
> -     $PROG --assemble --scan --config="$CONF"
> +            if [ -d "$config" ] && [ -r "$config" ]; then
> +                local config_file_count=0
> +                for config_file in ${config}/*.conf; do
> +                    if [ -r "$config_file" ]; then
> +                        config_file_count=$((config_file_count+1))
> +                    fi
> +                done
> +                if [ $config_file_count -eq 0 ]; then
> +                    config_level="WARNING"
> +                else
> +                    config_level="OK"
> +                fi
> +                config_detail="directory found with $config_file_count 
> readable .conf files"
> +            else
> +                if [ -w "$config" ]; then
> +                    if [ -s "$config" ]; then
> +                        # regardless, this will rely on mdadm for final 
> validation; for informational purposes ...
> +                        grep -E '^((DEVICE){1}(\ 
> |\t)(.*)(/dev/|containers|partitions))' "$config" > /dev/null 2>&1 # pattern 
> per mdadm(8)
> +                        if [ $? -eq 0 ]; then
> +                            config_detail="file found, readable with a 
> ^DEVICE"
> +                            config_level="OK"
> +                        else
> +                            config_detail="file found, readable without a 
> ^DEVICE"
> +                            config_level="WARNING"
> +                        fi
> +                    else
> +                        config_detail="file found, writable and empty"
> +                        config_level="OK"
> +                    fi
> +                else
> +                    config_detail="file not found, unwritable"
> +                    config_level="FATAL"
> +                    config_rc=1
> +                fi
> +            fi
> +        else
> +            config_mode="dynamic"
>  
> -     procd_open_instance
> -     procd_set_param command "$PROG" --monitor --syslog --scan 
> --config="$CONF"
> -     procd_close_instance
> +            # allow static values in mixed case; convert to lower
> +            config="$(awk -v config="$config" 'BEGIN{print 
> tolower(config)}')"

`tr 'A-Z' 'a-z'`

> +            if [ "$config" = "containers" ] || [ "$config" = "none" ] || [ 
> "$config" = "partition" ]; then
> +                # pass through to mdadm --config=
> +                config_detail="dynamic; uci static key value"
> +                config_level="OK"
> +                config_state='stateless'
> +            else
> +                if [ "$config" = "auto" ] || [ "$config" = "uci" ]; then
> +                    config_detail="dynamic; $config config"
> +                    config_level="OK"
> +                    config_state='stateful'
> +                    mdadm_conf="$TMP_FILE"
> +                else
> +                    config_detail="invalid; unsupported uci config key value"
> +                    config_level="FATAL"
> +                    config_state='stateful'
> +                    config_rc=1
> +                fi
> +            fi
> +        fi
> +    fi
> +
> +    # final safety & functional checks
> +
> +    # check for fatality
> +    [ -z "$config" ] && {
> +        config="${config}?"
> +        config_detail="$config_detail (sorry, something went wrong; check 
> the config settings)"
> +        config_level="FATAL"
> +        config_mode="${config_mode}?"
> +        config_state="${config_state}?"
> +        config_rc=1
> +    }
> +
> +    # Prefer mdadm.global.email; only one is allowed and can be an --email 
> argument per mdadm.conf(5)
> +    email=$(uci_get mdadm.global.email 2> /dev/null)
> +
> +    # mdadm (or postfix?) bug; workaround.  mdadm 4.0 for 18.06.1 has a 
> compiled in default of '/usr/lib/sendmail -t'.
> +    # There's no configurable way to change it and mdadm must be recompiled 
> differently for Openwrt, or posfix should
> +    # add the link. In 18.06.1, postfix 3.3.0-1 installs sendmail in 
> /usr/sbin; mdadm complains & no mail is delivered.
> +    # Other distro's postfix pkg typically installs this link ... or one in 
> /etc/alternatives.
> +    # Since mdadm needs it, I'm adding it here to be sure mdadm can send 
> email if there's a /usr/sbin/sendmail.
> +
> +    # There's really no point in making mdadm's compiled in sendmail 
> configurable via uci.
> +    mail_program="/usr/lib/sendmail"
> +    [ -x /usr/sbin/sendmail ] && [ ! -e "$mail_program" ] && {
> +        # a sym link will suffice
> +        if ! ln -s /usr/sbin/sendmail "$mail_program"; then
> +            verbose "ln -s /usr/bin/sendmail /usr/lib/sendmail failed" 
> WARNING
> +        fi
> +    }

Remove this workaround, packages should be fixed instead.

> +
> +    [ -x "$mail_program" ] || {
> +        verbose "disabling email; mail program '/usr/lib/sendmail' not found 
> executable (install postfix)" WARNING
> +        email=""
> +    }
> +
> +    if [ "$config_state" = "stateful" ] && [ -n "$mdadm_conf" ]; then
> +        if mkdir -p "${mdadm_conf%/*}" > /dev/null 2>&1; then
> +            printf "# Autogenerated from /etc/init.d/mdadm, do not edit!\n" 
> > $mdadm_conf
> +
> +            # Use mdadm.global.email_from only if there's a valid mta; only 
> one is allowed per mdadm.conf(5)
> +            # todo: see what other mtas Openwrt has in their opkg repos & 
> maybe support others
> +            [ -x "$mail_program" ] && email_from=$(uci_get 
> mdadm.global.email_from 2> /dev/null)
> +
> +            if [ "$config" = "auto" ]; then
> +                # stateful mdadm.conf auto configuration
> +                if ! mdadm_conf_auto "$mdadm_conf"; then
> +                    #there's quite a bit of logic & error handling in 
> mdadm_conf_auto; if it doesn't return 0 then it's a fatality
> +                    config_detail="$config_detail (couldn't find any meta 
> devices; check connections, or try stateless autoconfig)"
> +                    config_level="FATAL"
> +                    config_rc=1
> +                fi
> +            else
> +                # stateful mdadm.conf uci configuration
> +
> +                # load uci config from /etc/config/mdadm
> +                config_load mdadm
> +
> +                # This is how mdadm uci mdadm config sections should be 
> named, like fstab does with 'mount'.
> +                # The included uci /etc/config/mdadm provides more 
> documentation & direction.
> +                config_foreach mdadm_conf_uci array "$mdadm_conf"
> +
> +                # The unlabled mdadm.@mdadm[0] section should be (is now) 
> deprecated.
> +                # It's more difficult to document how to use, redundant, and 
> over complicated this init configuration.
> +
> +                # Confused; originally config_foreach?
> +                # It's possible to specify multiple mdadm sections with 
> array options in all sections.
> +                # Thus multiple option emails which could result in multiple 
> MAILADDR being appended to mdadm.conf.
> +                # That confuses mdadm.
> +
> +                # The following code is here to prevent regressions.
> +
> +                config_foreach mdadm_conf_uci mdadm "$mdadm_conf"
> +
> +                # For backward compatibility; this will allow an 
> mdadm.@mdadm[0] section's option email.
> +                # (only if mdadm.global.email is not set; again, prefer 
> mdadm.global.email)
> +                #
> +                # bug fixed. The first legacy mdadm section option email 
> will be used.
> +                # a better fix would be to *only* support array sections.
> +                #
> +                [ -z "$email" ] && [ -x "$mail_program" ] && email=$(uci_get 
> mdadm.@mdadm[0].email 2> /dev/null)
> +                # email_from is a new feature; was not previously handled; 
> no need to and please don't backport
> +
> +            fi
> +
> +            # This is nice feature to have to get mdadm mails through spam 
> filters, etc.
> +            # Too bad mdadm (4.0) doesn't have an argument for it.
> +            # Maybe mdadm 4.1 will ... todo: revisit when making mdadm 4.1 & 
> it's in Openwrt mainline.
> +            # This tests successfully with the postfix workaround above & 
> mdadm 4.0.
> +            [ -x "$mail_program" ] && {
> +                printf "MAILFROM %s\n" "$email_from" >> $mdadm_conf # only 
> supported via stateful configs; see mdadm.conf(5)
> +            }
> +
> +            [ -n "$config_verbose" ] && [ -r "$mdadm_conf" ] && {
> +                verbose "mdadm_conf = $mdadm_conf 
> (config_verbose=$config_verbose)" INFO
> +                verbose "---cut $mdadm_conf cut---" INFO
> +                while read -r line; do
> +                    verbose "$line" INFO
> +                done < "$mdadm_conf"
> +                unset -v line
> +                verbose "---cut $mdadm_conf cut---" INFO
> +            }
> +
> +        else
> +            config_detail="$config_detail (mkdir failed; check permissions)"
> +            config_level="FATAL"
> +            config_rc=1
> +        fi
> +    fi
> +
> +    [ $config_rc -ne 0 ] && {
> +        # FATAL
> +        verbose "$config_state,$config_mode config='$config', 
> $config_detail" "$config_level" INFO
> +        [ -n "$mdadm_conf" ] && [ -w "$mdadm_conf" ] && rm -f "$mdadm_conf"
> +        exit $config_rc
> +    }
> +
> +    # Good to go, no more fatal exits, finish getting global & setting local 
> values ... they're all optional.
> +
> +    mdadm_args="$mdadm_args --scan"
> +
> +    if [ -n "$mdadm_conf" ]; then
> +        # mdadm.global.config </file>
> +        mdadm_args="$mdadm_args --config=$mdadm_conf"
> +    else
> +        # mdadm.global.config all (containers, partitions, etc), except none
> +        [ -n "$config" ] && [ "$config" != 'none' ] && 
> mdadm_args="$mdadm_args --config=$config"
> +    fi
> +
> +    local assemble_count assemble_rc
> +
> +    assemble_count=$($PROG --detail --brief --scan 2> /dev/null | wc -l)
> +    verbose "$assemble_count arrays are currently assembled" INFO
> +
> +    # setup assembly mode
> +
> +    verbose "(assemble) '$PROG --assemble $mdadm_args'" INFO
> +    $PROG --assemble $mdadm_args > /dev/null 2>&1
> +    assemble_rc=$?
> +
> +    if [ $assemble_rc -eq 0 ]; then
> +        verbose "all arrays assembled successfully" OK
> +        [ -n "$config_verbose" ] && {
> +            true > /var/log/mdadm.detail
> +            local assemble_dev assemble_devs
> +            assemble_devs=$($PROG --detail --brief --scan | awk '{print $2}')
> +            for assemble_dev in $assemble_devs; do
> +             {
> +                printf "\n"
> +                $PROG --verbose --detail $assemble_dev
> +                printf "\n"
> +             } >> /var/log/mdadm.detail
> +            done
> +            unset -v assemble_dev
> +            while read -r line; do
> +                verbose "$line" INFO
> +            done < "/var/log/mdadm.detail"
> +            unset -v line
> +        }
> +    else
> +        if [ $assemble_count -eq 0 ]; then
> +            verbose "no arrays assembled successfully" ERROR
> +        else
> +            verbose "no new arrays need assembly" NOTICE
> +        fi
> +    fi
> +
> +    # setup monitor mode
> +
> +    alert_program=$(uci_get mdadm.global.alert_program 2> /dev/null)
> +    [ -n "$alert_program" ] && {
> +        if [ -x "$alert_program" ]; then
> +            mdadm_args="$mdadm_args --alert=$alert_program"
> +        else
> +            verbose "disabling alerts; alert_progam '$alert_program' not 
> found executable" WARNING
> +        fi
> +    }
> +
> +    [ -n "$email" ] && mdadm_args="$mdadm_args --mail=$email"
> +
> +    monitor_frequency=$(uci_get mdadm.global.monitor_frequency 2> /dev/null 
> | sed -e 's/[^0-9]*//g')
> +    [ -n "$monitor_frequency" ] && {
> +        mdadm_args="$mdadm_args --delay=$monitor_frequency"
> +        verbose "setting monitor frequency to '$monitor_frequency' seconds"
> +    }
> +
> +    verbose "(monitor) '$PROG --monitor --syslog $mdadm_args'" INFO
> +
> +    # /etc/rc.common doesn't like valid sh constructs like while read line; 
> do echo $line; done <<< "$(echo hello; echo world)" # 8|
> +    # Taking the time machine back to sh is rough enough as it is ... I need 
> to better understand its purpose. I spent too much time
> +    # in /lib/functions.  It's all circa 2006-2013.  Yikes.  Where's the man 
> pages?  Or even code comments?  It would've been way
> +    # easier just to do *everything* the good ol' sysvinit fashioned way, or 
> use systemd.  Just a gripe, I really do like OpenWrt.

Remove this comment.

> +    procd_open_instance
> +    procd_set_param command "$PROG" --monitor --syslog $mdadm_args
> +    procd_close_instance
> +
> +    verbose "$config_state,$config_mode config=$config, $config_detail 
> complete" "$config_level"
>  }
>  
>  stop_service() {
> -     $PROG --stop --scan
> +    $PROG --stop --scan
> +    if echo "here VERBOSE=$VERBOSE"; then

This looks like debug code. To me it seems the condition will always be true.

> +        verbose "'$PROG --stop --scan' stop_service succeeded" OK
> +    else
> +        verbose "'$PROG --stop --scan' stop_service failed" ERROR
> +    fi
>  }
> -
> 

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to