From ab87e1d2389fe034c16a215a71d4d1fba6570ad9 Mon Sep 17 00:00:00 2001
From: Rakshith R <rar@redhat.com>
Date: Wed, 6 Oct 2021 16:32:30 +0530
Subject: [PATCH] ceph: initialize rbd block pool after creation

This is done in order to prevent deadlock when parallel
PVC create requests are issued on a new uninitialized
rbd block pool due to https://tracker.ceph.com/issues/52537.

Fixes: #8696

Signed-off-by: Rakshith R <rar@redhat.com>
---
 pkg/operator/ceph/pool/controller.go      | 8 ++++++++
 pkg/operator/ceph/pool/controller_test.go | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/pkg/operator/ceph/pool/controller.go b/pkg/operator/ceph/pool/controller.go
index f0214164aeca..2d62feef3de7 100644
--- a/pkg/operator/ceph/pool/controller.go
+++ b/pkg/operator/ceph/pool/controller.go
@@ -356,6 +356,14 @@ func createPool(context *clusterd.Context, clusterInfo *cephclient.ClusterInfo,
 		return errors.Wrapf(err, "failed to create pool %q", p.Name)
 	}
 
+	logger.Infof("initializing pool %q", p.Name)
+	args := []string{"pool", "init", p.Name}
+	output, err := cephclient.NewRBDCommand(context, clusterInfo, args).Run()
+	if err != nil {
+		return errors.Wrapf(err, "failed to initialize pool %q. %s", p.Name, string(output))
+	}
+	logger.Infof("successfully initialized pool %q", p.Name)
+
 	return nil
 }
 
diff --git a/pkg/operator/ceph/pool/controller_test.go b/pkg/operator/ceph/pool/controller_test.go
index c51eaa097db2..91ddf9b71ec9 100644
--- a/pkg/operator/ceph/pool/controller_test.go
+++ b/pkg/operator/ceph/pool/controller_test.go
@@ -51,6 +51,9 @@ func TestCreatePool(t *testing.T) {
 			if command == "ceph" && args[1] == "erasure-code-profile" {
 				return `{"k":"2","m":"1","plugin":"jerasure","technique":"reed_sol_van"}`, nil
 			}
+			if command == "rbd" {
+				assert.Equal(t, []string{"pool", "init", "mypool"}, args[0:3])
+			}
 			return "", nil
 		},
 	}