Merge pull request #829 from gbregman/devel

A temporary fix for gh tests failures
ceph · Aug 27, 2024 · 5ade6e7 · 5ade6e7
2 parents 191325d + 714c3b3
commit 5ade6e7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/.env b/.env
@@ -65,13 +65,13 @@ SPDK_CENTOS_REPO_VER="9.0-21.el9"
 
 # Ceph Cluster
 CEPH_CLUSTER_VERSION="${CEPH_VERSION}"
-CEPH_BRANCH=main-nvmeof
-CEPH_SHA=5eb5dc7942d1c14e2e0a8a24e734a7d4c385aa49
+CEPH_BRANCH=wip-leonidc-20242108-upgrade-fast-reboot-centos9-only
+CEPH_SHA=ccc9c8006a8580a3eaf914451d9fe9f93ebae60b
 
 CEPH_DEVEL_MGR_PATH=../ceph
 
 # Atom
-ATOM_SHA=1be910ad7ef0acfc923b0704c2e9de873c12bffa
+ATOM_SHA=3506b53e1da8a769f079d0b600899e45e513df34
 
 # Demo settings
 RBD_POOL=rbd

diff --git a/control/server.py b/control/server.py
@@ -347,8 +347,17 @@ def _start_spdk(self, omap_state):
         if spdk_tgt_cmd_extra_args:
             cmd += shlex.split(spdk_tgt_cmd_extra_args)
         self.logger.info(f"Starting {' '.join(cmd)}")
+        sockdir = os.path.dirname(self.spdk_rpc_socket_path)
+        if not os.path.isdir(sockdir):
+            self.logger.warning(f"Directory {sockdir} does not exist, will create it")
+            try:
+                os.makedirs(sockdir, 0o755)
+            except Exception:
+                self.logger.exception(f"Error trying to create {sockdir}")
+                raise
         try:
             # start spdk process
+            time.sleep(2)      # this is a temporary hack, we have a timing issue here. Once we solve it the sleep will ve removed
             self.spdk_process = subprocess.Popen(cmd)
         except Exception:
             self.logger.exception(f"Unable to start SPDK")

diff --git a/tests/atom/clusterBuildTestsRun.sh b/tests/atom/clusterBuildTestsRun.sh
@@ -27,7 +27,7 @@ sudo docker run \
     quay.ceph.io/ceph-ci/ceph:"$CEPH_SHA" \
     quay.io/ceph/nvmeof:"$VERSION" \
     quay.io/ceph/nvmeof-cli:"$VERSION" \
-    None None None None None 4 1 1 2 4 1024 2 2 200M 0 1 20 \
+    None None None None None None 4 1 1 2 4 1024 2 2 200M 0 1 20 \
     --stopNvmeofDaemon \
     --stopNvmeofSystemctl \
     --stopMonLeader \
@@ -36,5 +36,5 @@ sudo docker run \
     --dontUseMTLS \
     --skipLbalancingTest \
     --journalctlToConsole \
-    --dontPowerOffCloudVMs noKey \
+    --dontPowerOffCloudVMs noKey noKey \
     --multiIBMCloudServers_m2