Merge pull request #354 from gbregman/devel

Change the type of rbd_image_size to 64 bits
ceph · Jan 3, 2024 · 4300218 · 4300218
2 parents 57e23c9 + a553bed
commit 4300218
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/control/proto/gateway.proto b/control/proto/gateway.proto
@@ -115,7 +115,7 @@ message namespace_add_req {
 	string rbd_image_name = 2;
 	string subsystem_nqn = 3;
 	optional uint32 nsid = 4;
-	int32 block_size = 5;
+	uint32 block_size = 5;
 	optional string uuid = 6;
 	optional int32 anagrpid = 7;
 }
@@ -346,8 +346,8 @@ message namespace {
 	string rbd_image_name = 3;
 	string rbd_pool_name = 4;
 	uint32 load_balancing_group = 5;
-	int32 block_size = 6;
-	int32 rbd_image_size = 7;
+	uint32 block_size = 6;
+	uint64 rbd_image_size = 7;
 	string uuid = 8;
 	uint64 rw_ios_per_second = 9;
 	uint64 rw_mbytes_per_second = 10;

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -236,7 +236,7 @@ def test_resize_namespace(self, caplog, gateway):
         cli(["--format", "json", "namespace", "list", "--subsystem", subsystem, "--nsid", nsid])
         assert f'"nsid": {nsid}' in caplog.text
         assert '"block_size": 512' in caplog.text
-        assert '"rbd_image_size": 16777216' in caplog.text
+        assert '"rbd_image_size": "16777216"' in caplog.text
         assert f'"uuid": "{uuid}"' in caplog.text
         caplog.clear()
         cli(["namespace", "resize", "--subsystem", subsystem, "--nsid", nsid, "--size", "32"])
@@ -245,7 +245,7 @@ def test_resize_namespace(self, caplog, gateway):
         cli(["--format", "json", "namespace", "list", "--subsystem", subsystem, "--nsid", nsid])
         assert f'"nsid": {nsid}' in caplog.text
         assert '"block_size": 512' in caplog.text
-        assert '"rbd_image_size": 33554432' in caplog.text
+        assert '"rbd_image_size": "33554432"' in caplog.text
         assert f'"uuid": "{uuid}"' in caplog.text
         assert '"nsid": 2' not in caplog.text
         assert '"nsid": 3' not in caplog.text
@@ -258,7 +258,7 @@ def test_resize_namespace(self, caplog, gateway):
         cli(["--format", "json", "namespace", "list", "--subsystem", subsystem, "--uuid", uuid])
         assert f'"nsid": {nsid}' in caplog.text
         assert '"block_size": 512' in caplog.text
-        assert '"rbd_image_size": 67108864' in caplog.text
+        assert '"rbd_image_size": "67108864"' in caplog.text
         assert f'"uuid": "{uuid}"' in caplog.text
         assert '"nsid": 2' not in caplog.text
         assert '"nsid": 3' not in caplog.text