]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
vstart.sh: add --require-osd-and-client-version and --use-crush-tunables flags
authorSamuel Just <sjust@redhat.com>
Fri, 1 Dec 2023 06:12:19 +0000 (22:12 -0800)
committerSamuel Just <sjust@redhat.com>
Tue, 9 Jan 2024 03:25:55 +0000 (19:25 -0800)
Signed-off-by: Samuel Just <sjust@redhat.com>
src/vstart.sh

index 01fc493978ae768445454eed05a0000ec86b895f..23ae7ef6cc8d0c055f51d60f52dcc966ea5bc1fb 100755 (executable)
@@ -177,6 +177,8 @@ io_uring_enabled=0
 with_jaeger=0
 force_addr=0
 osds_per_host=0
+require_osd_and_client_version=""
+use_crush_tunables=""
 
 with_mgr_dashboard=true
 if [[ "$(get_cmake_variable WITH_MGR_DASHBOARD_FRONTEND)" != "ON" ]] ||
@@ -605,6 +607,16 @@ case $1 in
         shift
         echo "osds_per_host $osds_per_host"
         ;;
+    --require-osd-and-client-version)
+        require_osd_and_client_version="$2"
+        shift
+        echo "require_osd_and_client_version $require_osd_and_client_version"
+        ;;
+    --use-crush-tunables)
+        use_crush_tunables="$2"
+        shift
+        echo "use_crush_tunables $use_crush_tunables"
+        ;;
     *)
         usage_exit
 esac
@@ -1101,6 +1113,15 @@ EOF
     if [ "$crimson" -eq 1 ]; then
         $CEPH_BIN/ceph osd set-allow-crimson --yes-i-really-mean-it
     fi
+
+    if [ -n "$require_osd_and_client_version" ]; then
+        $CEPH_BIN/ceph osd set-require-min-compat-client $require_osd_and_client_version
+        $CEPH_BIN/ceph osd require-osd-release $require_osd_and_client_version --yes-i-really-mean-it
+    fi
+
+    if [ -n "$use_crush_tunables" ]; then
+        $CEPH_BIN/ceph osd crush tunables $use_crush_tunables
+    fi
 }
 
 start_osd() {