Merge pull request #282 from gbregman/devel

Write SPDK and discovery service PIDs to the log. Display conf file earlier in the log.

control/__main__.py

@@ -31,6 +31,7 @@
     args = parser.parse_args()
 
     config = GatewayConfig(args.config)
+    config.dump_config_file(logger)
     with GatewayServer(config) as gateway:
         gateway.serve()
         gateway.keep_alive()

control/config.py

@@ -18,6 +18,7 @@ class GatewayConfig:
     """
     def __init__(self, conffile):
         self.filepath = conffile
+        self.conffile_logged = False
         with open(conffile) as f:
             self.config = configparser.ConfigParser()
             self.config.read_file(f)
@@ -45,3 +46,21 @@ def getint_with_default(self, section, param, value):
 
     def getfloat_with_default(self, section, param, value):
         return self.config.getfloat(section, param, fallback=value)
+
+    def dump_config_file(self, logger):
+        if self.conffile_logged:
+            return
+
+        try:
+            logger.info(f"Using configuration file {self.filepath}")
+            with open(self.filepath) as f:
+                logger.info(
+                    f"====================================== Configuration file content ======================================")
+                for line in f:
+                    line = line.rstrip()
+                    logger.info(f"{line}")
+                logger.info(
+                    f"========================================================================================================")
+                self.conffile_logged = True
+        except Exception:
+            pass

control/grpc.py

@@ -67,17 +67,7 @@ def __init__(self, config, gateway_state, spdk_rpc_client) -> None:
         if git_modified:
             self.logger.info(f"NVMeoF gateway uncommitted modified files: {git_modified}")
         self.config = config
-        self.logger.info(f"Using configuration file {config.filepath}")
-        try:
-            with open(config.filepath) as f:
-                self.logger.info(f"Configuration file content:")
-                self.logger.info(f"============================================================================")
-                for line in f:
-                    line = line.rstrip()
-                    self.logger.info(f"{line}")
-                self.logger.info(f"============================================================================")
-        except Exception:
-            pass
+        config.dump_config_file(self.logger)
         self.rpc_lock = threading.Lock()
         self.gateway_state = gateway_state
         self.spdk_rpc_client = spdk_rpc_client

control/server.py

@@ -147,6 +147,8 @@ def _start_discovery_service(self):
             self.logger.info("Starting ceph nvmeof discovery service")
             DiscoveryService(self.config).start_service()
             os._exit(0)
+        else:
+            self.logger.info(f"Discovery service process id: {self.discovery_pid}")
 
     def _add_server_listener(self):
         """Adds listener port to server."""
@@ -208,6 +210,7 @@ def _start_spdk(self):
         log_level = self.config.get("spdk", "log_level")
         # connect timeout: spdk client retries 5 times per sec
         conn_retries = int(timeout * 5)
+        self.logger.info(f"SPDK process id: {self.spdk_process.pid}")
         self.logger.info(
             f"Attempting to initialize SPDK: rpc_socket: {spdk_rpc_socket},"
             f" conn_retries: {conn_retries}, timeout: {timeout}"