Lock OMAP file before changing it to avoid corruption in multi-gatewa…

…y environemnt. Fixes ceph#56 Signed-off-by: Gil Bregman <[email protected]>
gbregman · Oct 3, 2023 · 8fda271 · 8fda271
1 parent 666cd04
commit 8fda271
Show file tree

Hide file tree

Showing 7 changed files with 227 additions and 31 deletions.
diff --git a/.env b/.env
@@ -8,6 +8,8 @@ QUAY_CEPH="${CONTAINER_REGISTRY}/vstart-cluster"
 QUAY_NVMEOF="${CONTAINER_REGISTRY}/nvmeof"
 QUAY_NVMEOFCLI="${CONTAINER_REGISTRY}/nvmeof-cli"
 MAINTAINER="Ceph Developers <[email protected]>"
+COMPOSE_PROJECT_NAME="ceph-nvmeof"
+NVMEOF_CONTAINER_NAME="${COMPOSE_PROJECT_NAME}-nvmeof-1"
 
 # Performance
 NVMEOF_NOFILE=20480 # Max number of open files (depends on number of hosts connected)

diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
@@ -197,7 +197,7 @@ jobs:
 
       - name: Test
         run: |
-          make demo OPTS=-T
+          make demo OPTS=-T NVMEOF_CONTAINER_NAME="ceph-nvmeof_nvmeof_1"
 
       - name: Get subsystems
         run: |

diff --git a/ceph-nvmeof.conf b/ceph-nvmeof.conf
@@ -18,6 +18,10 @@ state_update_interval_sec = 5
 #min_controller_id = 1
 #max_controller_id = 65519
 enable_discovery_controller = false
+#omap_file_lock_timeout = 60
+#omap_file_lock_retries = 15
+#omap_file_lock_retry_sleep_interval = 5
+#omap_file_update_retries = 10
 
 [discovery]
 addr = 0.0.0.0