Remove "san" from VDDK transports list.

Some versions of the VDDK crash when determining system support for its "san" transport mode, if there are no SCSI disks present. This transport mode is active by default, and is not used by CDI, so avoid the crash by setting the list of allowable transports to not include "san". Signed-off-by: Matthew Arnold <[email protected]>
kubevirt-bot · Aug 20, 2024 · 614a0fa · 614a0fa
1 parent bfd0000
commit 614a0fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/image/nbdkit.go b/pkg/image/nbdkit.go
@@ -162,6 +162,7 @@ func NewNbdkitVddk(nbdkitPidFile, socket string, args NbdKitVddkPluginArgs) (Nbd
 	}
 	if args.Snapshot != "" {
 		pluginArgs = append(pluginArgs, "snapshot="+args.Snapshot)
+		pluginArgs = append(pluginArgs, "transports=file:nbdssl:nbd")
 	}
 	pluginArgs = append(pluginArgs, "--verbose")
 	pluginArgs = append(pluginArgs, "-D", "nbdkit.backend.datapath=0")

diff --git a/tools/vddk-test/vddk-test-plugin.c b/tools/vddk-test/vddk-test-plugin.c
@@ -30,7 +30,7 @@ void fakevddk_close(void *handle) {
 int fakevddk_config(const char *key, const char *value) {
     arg_count++;
     if (strcmp(key, "snapshot") == 0) {
-        expected_arg_count = 8;
+        expected_arg_count = 9; // Expect one for 'snapshot' and one for 'transports'
     }
     return 0;
 }