From 827825e2e2945a40d5950a7b50694bc9acb35e61 Mon Sep 17 00:00:00 2001 From: Orlando Moreno Date: Fri, 27 Sep 2019 15:50:31 -0700 Subject: [PATCH 1/3] Use mkimage in ceph client ep create_rbd() --- client_endpoints/ceph_client_endpoints.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client_endpoints/ceph_client_endpoints.py b/client_endpoints/ceph_client_endpoints.py index b798dc87..382f8c41 100644 --- a/client_endpoints/ceph_client_endpoints.py +++ b/client_endpoints/ceph_client_endpoints.py @@ -93,8 +93,7 @@ def create_rbd(self): rbd_name = self.get_rbd_name(node, ep_num) # Make the RBD Image - cmd = '%s -c %s create %s --pool %s --size %s %s --order %s' % (self.rbd_cmd, self.tmp_conf, rbd_name, self.pool, self.endpoint_size, dp_option, self.order) - common.pdsh(settings.getnodes('head'), cmd, continue_if_error=False).communicate() + self.cluster.mkimage(rbd_name, self.endpoint_size, self.pool, self.data_pool, self.order) # Disable Features if self.disabled_features: From 1da54404c436d3063f350d978c2fb419aa733f3e Mon Sep 17 00:00:00 2001 From: Orlando Moreno Date: Fri, 27 Sep 2019 15:51:51 -0700 Subject: [PATCH 2/3] Cast cmd in mkimage to str so join_nostr returns the command properly --- cluster/ceph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/ceph.py b/cluster/ceph.py index fcad4dac..54491565 100644 --- a/cluster/ceph.py +++ b/cluster/ceph.py @@ -757,7 +757,7 @@ def mkimage(self, name, size, pool, data_pool, order): dp_option = '' if data_pool: dp_option = "--data-pool %s" % data_pool - common.pdsh(settings.getnodes('head'), '%s -c %s create %s --size %s --pool %s %s --order %s' % (self.rbd_cmd, self.tmp_conf, name, size, pool, dp_option, order)).communicate() + common.pdsh(settings.getnodes('head'), str('%s -c %s create %s --size %s --pool %s %s --order %s' % (self.rbd_cmd, self.tmp_conf, name, size, pool, dp_option, order))).communicate() def unmount_all(self): # Should take care of pretty much everything so long as wierd mnt_dirs aren't used. From 71614667b719f6bf956cbacf87aea981f4443fc1 Mon Sep 17 00:00:00 2001 From: Orlando Moreno Date: Fri, 4 Oct 2019 12:29:19 -0700 Subject: [PATCH 3/3] Revert "Cast cmd in mkimage to str so join_nostr returns the command properly" This reverts commit 1da54404c436d3063f350d978c2fb419aa733f3e. --- cluster/ceph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/ceph.py b/cluster/ceph.py index 54491565..fcad4dac 100644 --- a/cluster/ceph.py +++ b/cluster/ceph.py @@ -757,7 +757,7 @@ def mkimage(self, name, size, pool, data_pool, order): dp_option = '' if data_pool: dp_option = "--data-pool %s" % data_pool - common.pdsh(settings.getnodes('head'), str('%s -c %s create %s --size %s --pool %s %s --order %s' % (self.rbd_cmd, self.tmp_conf, name, size, pool, dp_option, order))).communicate() + common.pdsh(settings.getnodes('head'), '%s -c %s create %s --size %s --pool %s %s --order %s' % (self.rbd_cmd, self.tmp_conf, name, size, pool, dp_option, order)).communicate() def unmount_all(self): # Should take care of pretty much everything so long as wierd mnt_dirs aren't used.