From 299753e7fab6e9b7387a2c881378659f5bcb97bd Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 20 Feb 2023 18:25:59 +0100 Subject: [PATCH 1/3] spdk: update to 23.01 Signed-off-by: Ilya Dryomov --- spdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spdk b/spdk index 47737f16..10edc60a 160000 --- a/spdk +++ b/spdk @@ -1 +1 @@ -Subproject commit 47737f16b47522cbc41b5106c69598cd7ff1a76a +Subproject commit 10edc60aa8b5f1b04d6496fea976dec75e276a95 From 9088e58ca26cb8fd69636f1435791080e365b24a Mon Sep 17 00:00:00 2001 From: Sandy Kaur Date: Thu, 16 Mar 2023 14:55:31 -0500 Subject: [PATCH 2/3] fix spdk rpc import path Signed-off-by: Sandy Kaur --- control/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/control/server.py b/control/server.py index d29089f6..b4d19069 100644 --- a/control/server.py +++ b/control/server.py @@ -144,9 +144,9 @@ def _start_spdk(self): # Get path and import SPDK's RPC modules spdk_path = self.config.get("spdk", "spdk_path") - sys.path.append(spdk_path) + sys.path.append(os.path.join(spdk_path, "spdk/python")) self.logger.info(f"SPDK PATH: {spdk_path}") - import spdk.scripts.rpc as spdk_rpc + import spdk.rpc as spdk_rpc self.spdk_rpc = spdk_rpc # Start target From a589ce478844590ff1543f3d97520d5a428557f1 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 20 Mar 2023 16:27:33 +0100 Subject: [PATCH 3/3] README: don't mention the SPDK version that is bundled Signed-off-by: Ilya Dryomov --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index daae1cc4..78ace56c 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ This daemon runs as root. It provides the ability to export existing RBD images $ make grpc -5. SPDK v21.04 is included in this repository. Edit the config file to set: +5. SPDK is included in this repository as a submodule. Edit the config file to set: spdk_path = spdk_tgt =