Fix ingress deamon

Code Issues Proposed changes

Fixes ingress deamon, for 18.0+ Ceph versions
by setting correct VIP.
Ingress daemon was added in Caracal, and when
backported to Bobcat encountered CI failures.
In this patch I've added verbose MDS logging
capabilities, and fixed the failures that were
present in Bobcat stable CI, cephfs-nfs-cephadm
job. History is in patchset 908940.
Resubmititng starting at master to backport
to stable branches in the correct order.
Depends-On: I5b7fd5b2b557203189c25fa2a988d790e7fda3eb
Change-Id: Ia1671de5c770d1cf5a3cd58e05fe5204f5bbc3c6

This commit is contained in:

ashrod98

2024年06月05日 11:00:10 -04:00

committed by Ashley Rodriguez

parent 13f94aaaf2

commit ca3784609f

3 changed files with 39 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

5
.zuul.yaml

View File

@@ -98,6 +98,11 @@

name:devstack-plugin-ceph-multinode-cephfs-nfs-cephadm

parent:manila-tempest-plugin-multinode-cephfs-nfs-cephadm

description:Test CephFS NFS (DHSS=False) in a Multinode devstack env

vars:

devstack_localrc:

MDS_LOGS:True

CEPH_INGRESS_IP:"{{hostvars['controller'].ansible_default_ipv6.address}}"

- job:

name:devstack-plugin-ceph-multinode-tempest-py3

33
devstack/lib/cephadm

View File

@@ -61,6 +61,8 @@ CEPH_CONF_FILE=${CEPH_CONF_FILE:-$CEPH_CONF_DIR/ceph.conf}

# LOG(s) and EXPORTED CONFIG FILES

EXPORT=$HOME/ceph_export.yml

RBD_CLIENT_LOG=/var/log/ceph/qemu-guest-\$pid.log

MDS_LOG_FILE="$HOME/mds_log.conf"

MDS_LOGS=${MDS_LOGS:-"False"}

# MANILA DEFAULTS

MANILA_CEPH_USER=${MANILA_CEPH_USER:-manila}

@@ -72,7 +74,7 @@ CEPHFS_CLIENT=0

CEPHFS_CLIENT_NAME="client.$MANILA_CEPH_USER"

CEPHFS_CLIENT_LOG="/var/log/ceph-$CEPHFS_CLIENT_NAME.log"

CEPHFS_MULTIPLE_FILESYSTEMS=${CEPHFS_MULTIPLE_FILESYSTEMS:-False}

VIP=$HOST_IP

VIP=$CEPH_INGRESS_IP

# GLANCE DEFAULTS

@@ -109,6 +111,33 @@ function set_debug {

fi

}

function enable_verbose_mds_logging {

$SUDO "$CEPHADM" shell --fsid $FSID --config $CEPH_CONFIG \

--keyring $CEPH_KEYRING -- ceph config set mds debug_mds 20

$SUDO "$CEPHADM" shell --fsid $FSID --config $CEPH_CONFIG \

--keyring $CEPH_KEYRING -- ceph config set mds debug_ms 20

$SUDO "$CEPHADM" shell --fsid $FSID --config $CEPH_CONFIG \

--keyring $CEPH_KEYRING -- ceph config set mds debug_client 20

$SUDO "$CEPHADM" shell --fsid $FSID --config $CEPH_CONFIG \

--keyring $CEPH_KEYRING -- ceph config set mds log_to_file true

$SUDO "$CEPHADM" shell --fsid $FSID --config $CEPH_CONFIG \

--keyring $CEPH_KEYRING -- ceph config set global mon_cluster_log_to_file true

$SUDO "$CEPHADM" shell --fsid $FSID --config $CEPH_CONFIG \

--keyring $CEPH_KEYRING -- ceph config set global log_to_file true

touch "$MDS_LOG_FILE"

cat <<EOF > "$MDS_LOG_FILE"

LOG {

COMPONENTS {

ALL = FULL_DEBUG;

}

EOF

$SUDO "$CEPHADM" shell --fsid $FSID --config $CEPH_CONFIG \

--keyring $CEPH_KEYRING -m $MDS_LOG_FILE -- ceph nfs cluster config set "$FSNAME" \

-i /mnt/mds_log.conf

}

# Admin: check ceph cluster status

function check_cluster_status {

$SUDO "$CEPHADM" shell --fsid $FSID --config $CEPH_CONFIG \

@@ -340,7 +369,7 @@ function ceph_nfs_config {

$SUDO "$CEPHADM" shell --fsid $FSID --config $CEPH_CONFIG \

--keyring $CEPH_KEYRING -- ceph nfs cluster create \

"$FSNAME" "$HOSTNAME" --port $NFS_PORT --ingress \

--ingress-mode haproxy-protocol --virtual_ip $HOST_IP

--ingress-mode haproxy-protocol --virtual_ip $VIP

else

echo "[CEPHADM] Ingress service is not deployed \

to preserve the ability to apply client restrictions."

3
devstack/plugin.sh

View File

@@ -119,6 +119,9 @@ elif [[ "1ドル" == "stack" && "2ドル" == "post-config" ]]; then

fi

if [[ "$MDS_LOGS" == "True" ]]; then

enable_verbose_mds_logging

fi

elif [[ "1ドル" == "stack" && "2ドル" == "test-config" ]]; then

if is_service_enabled tempest; then

iniset $TEMPEST_CONFIG compute-feature-enabled swap_volume False