DLPX-81529 DOSE-Azure: object-protocol is not getting set as a zpool …

…property (openzfs#476)
pcd1193182 · Jun 14, 2022 · 484b664 · 484b664
1 parent 4869939
commit 484b664
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
@@ -1655,6 +1655,14 @@ zpool_do_create(int argc, char **argv)
 		goto errout;
 	}
 
+	/* Allocate props before passing it */
+	if (props == NULL &&
+	    nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) {
+		(void) fprintf(stderr,
+		    gettext("internal error: out of memory\n"));
+		return (1);
+	}
+
 	char *profile;
 	if ((nvlist_lookup_string(props,
 	    zpool_prop_to_name(ZPOOL_PROP_OBJ_CRED_PROFILE), &profile)) == 0) {

diff --git a/cmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c
@@ -1721,6 +1721,15 @@ construct_spec(nvlist_t *props, int argc, char **argv)
 			    argv[1])) == NULL) {
 				goto spec_out;
 			}
+
+			/*
+			 * Add object-protocol as a property so that it is set
+			 * as a zpool property.
+			 */
+			fnvlist_add_string(props,
+			    zpool_prop_to_name(ZPOOL_PROP_OBJ_PROTOCOL),
+			    fulltype);
+
 			argc -= 2;
 			argv += 2;
 		} else {