Merge "Rehome functions to enable Neutron's segments integration"
diff --git a/.zuul.yaml b/.zuul.yaml
index 8e20f6e..fa7f180 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -696,6 +696,9 @@
description: |
Simple multinode test to verify multinode functionality on devstack side.
This is not meant to be used as a parent job.
+ vars:
+ devstack_localrc:
+ MYSQL_REDUCE_MEMORY: true
# NOTE(ianw) Platform tests have traditionally been non-voting because
# we often have to rush things through devstack to stabilise the gate,
diff --git a/lib/databases/mysql b/lib/databases/mysql
index fbad44e..e805b3e 100644
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@@ -176,6 +176,16 @@
count INT, PRIMARY KEY (db, op)) ENGINE MEMORY" stats
fi
+ if [[ "$MYSQL_REDUCE_MEMORY" == "True" ]]; then
+ iniset -sudo $my_conf mysqld read_buffer_size 64K
+ iniset -sudo $my_conf mysqld innodb_buffer_pool_size 16M
+ iniset -sudo $my_conf mysqld thread_stack 192K
+ iniset -sudo $my_conf mysqld thread_cache_size 8
+ iniset -sudo $my_conf mysqld tmp_table_size 8M
+ iniset -sudo $my_conf mysqld sort_buffer_size 8M
+ iniset -sudo $my_conf mysqld max_allowed_packet 8M
+ fi
+
restart_service $MYSQL_SERVICE_NAME
}
diff --git a/lib/neutron_plugins/ovn_agent b/lib/neutron_plugins/ovn_agent
index 3490392..3526ccd 100644
--- a/lib/neutron_plugins/ovn_agent
+++ b/lib/neutron_plugins/ovn_agent
@@ -816,5 +816,5 @@
_cleanup $ovs_path
fi
- sudo rm -f $OVN_RUNDIR
+ sudo rm -rf $OVN_RUNDIR
}
diff --git a/stack.sh b/stack.sh
index 28576d1..ccd2d16 100755
--- a/stack.sh
+++ b/stack.sh
@@ -394,6 +394,13 @@
sudo dnf config-manager --set-enabled crb
# rabbitmq and other packages are provided by RDO repositories.
_install_rdo
+
+ # Some distributions (Rocky Linux 9) provide curl-minimal instead of curl,
+ # it triggers a conflict when devstack wants to install "curl".
+ # Swap curl-minimal with curl.
+ if is_package_installed curl-minimal; then
+ sudo dnf swap -y curl-minimal curl
+ fi
elif [[ $DISTRO == "openEuler-22.03" ]]; then
# There are some problem in openEuler. We should fix it first. Some required
# package/action runs before fixup script. So we can't fix there.
diff --git a/stackrc b/stackrc
index a05d1e5..442e9a0 100644
--- a/stackrc
+++ b/stackrc
@@ -201,6 +201,11 @@
# performance_schema that are of interest to us
MYSQL_GATHER_PERFORMANCE=$(trueorfalse True MYSQL_GATHER_PERFORMANCE)
+# This can be used to reduce the amount of memory mysqld uses while running.
+# These are unscientifically determined, and could reduce performance or
+# cause other issues.
+MYSQL_REDUCE_MEMORY=$(trueorfalse False MYSQL_REDUCE_MEMORY)
+
# Set a timeout for git operations. If git is still running when the
# timeout expires, the command will be retried up to 3 times. This is
# in the format for timeout(1);
diff --git a/unstack.sh b/unstack.sh
index a36af3f..33b069b 100755
--- a/unstack.sh
+++ b/unstack.sh
@@ -168,9 +168,7 @@
cleanup_etcd3
fi
-if is_service_enabled dstat; then
- stop_dstat
-fi
+stop_dstat
# NOTE: Cinder automatically installs the lvm2 package, independently of the
# enabled backends. So if Cinder is enabled, and installed successfully we are