Merge pull request #665 from gbregman/devel

Get version string from SPDK

control/config.py

@@ -78,7 +78,7 @@ def display_environment_info(self, logger):
             logger.info(f"Using NVMeoF gateway version {ver}")
         spdk_ver = os.getenv("NVMEOF_SPDK_VERSION")
         if spdk_ver:
-            logger.info(f"Using SPDK version {spdk_ver}")
+            logger.info(f"Configured SPDK version {spdk_ver}")
         ceph_ver = os.getenv("NVMEOF_CEPH_VERSION")
         if ceph_ver:
             logger.info(f"Using vstart cluster version based on {ceph_ver}")

control/server.py

@@ -401,6 +401,18 @@ def _start_spdk(self, omap_state):
         for trtype in spdk_transports.split():
             self._create_transport(trtype.lower())
 
+        with self.ping_lock:
+            try:
+                return_version = spdk.rpc.spdk_get_version(self.spdk_rpc_ping_client)
+                try:
+                    version_string = return_version["version"]
+                    self.logger.info(f"Started SPDK with version \"{version_string}\"")
+                except KeyError:
+                    self.logger.error(f"Can't find SPDK version string in {return_version}")
+            except Exception:
+                self.logger.exception(f"Can't read SPDK version")
+                pass
+
     def _stop_subprocess(self, proc, timeout):
         """Stops SPDK process."""
         assert proc is not None # should be verified by the caller