From ca3784609fbc045ea7f06c4b8c031cbeece95b27 Mon Sep 17 00:00:00 2001
From: ashrod98 <ashrod98@gmail.com>
Date: Wed, 5 Jun 2024 11:00:10 -0400
Subject: [PATCH] Fix ingress deamon
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
---
 .zuul.yaml &#124; 5 +++++
 devstack/lib/cephadm &#124; 33 +++++++++++++++++++++++++++++++--
 devstack/plugin.sh &#124; 3 +++
 3 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/.zuul.yaml b/.zuul.yaml
index c8aaff9c..a39cad19 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -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
diff --git a/devstack/lib/cephadm b/devstack/lib/cephadm
index c4a591fe..8b36fccd 100755
--- a/devstack/lib/cephadm
+++ b/devstack/lib/cephadm
@@ -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."
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index d8694944..ccd8c3cd 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -119,6 +119,9 @@ elif [[ "1ドル" == "stack" && "2ドル" == "post-config" ]]; then
 fi
 fi
 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
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/devstack-plugin-ceph/commit/5deabcec6f7a0b630e713efb35e7a30e57f8b7f7.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/devstack-plugin-ceph/commit/5deabcec6f7a0b630e713efb35e7a30e57f8b7f7.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>