diff --git a/pkg/operator/ceph/csi/peermap/config.go b/pkg/operator/ceph/csi/peermap/config.go index 2f27a459f..f8517b656 100644 --- a/pkg/operator/ceph/csi/peermap/config.go +++ b/pkg/operator/ceph/csi/peermap/config.go @@ -46,6 +46,8 @@ const ( var logger = capnslog.NewPackageLogger("github.com/rook/rook", "peer-map") +var peerPoolTempFile = "peerPool" + type PeerIDMapping struct { ClusterIDMapping map[string]string RBDPoolIDMapping []map[string]string @@ -351,12 +353,31 @@ func decodePeerToken(token string) (*cephclient.PeerToken, error) { } func getPeerPoolDetails(ctx *clusterd.Context, args ...string) (cephclient.CephStoragePoolDetails, error) { - peerPoolDetails, err := ctx.Executor.ExecuteCommandWithTimeout(exec.CephCommandsTimeout, "ceph", args...) + poolDetailsTempFile, err := os.CreateTemp("", peerPoolTempFile) + if err != nil { + return cephclient.CephStoragePoolDetails{}, errors.Wrap(err, "failed to generate temporary file") + } + + defer func() { + err := os.Remove(poolDetailsTempFile.Name()) + if err != nil { + logger.Errorf("failed to remove file %q. %v", poolDetailsTempFile.Name(), err) + } + }() + + args = append(args, "--out-file", poolDetailsTempFile.Name()) + + _, err = ctx.Executor.ExecuteCommandWithTimeout(exec.CephCommandsTimeout, "ceph", args...) if err != nil { return cephclient.CephStoragePoolDetails{}, errors.Wrap(err, "failed to get pool details from peer cluster") } - return cephclient.ParsePoolDetails([]byte(peerPoolDetails)) + data, err := os.ReadFile(poolDetailsTempFile.Name()) + if err != nil { + return cephclient.CephStoragePoolDetails{}, errors.Wrapf(err, "failed to read from the temporary json output file %q", poolDetailsTempFile.Name()) + } + + return cephclient.ParsePoolDetails(data) } func getMapKV(input map[string]string) (string, string) { diff --git a/pkg/operator/ceph/csi/peermap/config_test.go b/pkg/operator/ceph/csi/peermap/config_test.go index 8a1abd93e..8dcf8468b 100644 --- a/pkg/operator/ceph/csi/peermap/config_test.go +++ b/pkg/operator/ceph/csi/peermap/config_test.go @@ -18,6 +18,9 @@ package peermap import ( "context" + "fmt" + "os" + "path/filepath" "reflect" "strings" "testing" @@ -235,6 +238,23 @@ var fakeMultiPeerCephBlockPool = cephv1.CephBlockPool{ }, } +func saveMockDataInTempFile(data, filePattern string) error { + matches, _ := filepath.Glob(fmt.Sprintf("/tmp/%s*", filePattern)) + for _, m := range matches { + file, err := os.OpenFile(m, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) + if err != nil { + return fmt.Errorf("failed to open file %q. %v", m, err) + } + + defer file.Close() + _, err = file.WriteString(data) + if err != nil { + return fmt.Errorf("failed to write data to the file %q. %v", m, err) + } + } + return nil +} + var mockExecutor = &exectest.MockExecutor{ MockExecuteCommandWithOutput: func(command string, args ...string) (string, error) { logger.Infof("Command: %s %v", command, args) @@ -253,22 +273,46 @@ var mockExecutor = &exectest.MockExecutor{ logger.Infof("Command: %s %v", command, args) if args[0] == "osd" && args[1] == "pool" && args[2] == "get" && strings.HasSuffix(args[5], "peer1") { if args[3] == "mirrorPool1" { + err := saveMockDataInTempFile(`{"pool_id": 2}`, peerPoolTempFile) + if err != nil { + return "", err + } return `{"pool_id": 2}`, nil } else if args[3] == "mirrorPool2" { + err := saveMockDataInTempFile(`{"pool_id": 3}`, peerPoolTempFile) + if err != nil { + return "", err + } return `{"pool_id": 3}`, nil } } if args[0] == "osd" && args[1] == "pool" && args[2] == "get" && strings.HasSuffix(args[5], "peer2") { if args[3] == "mirrorPool1" { + err := saveMockDataInTempFile(`{"pool_id": 3}`, peerPoolTempFile) + if err != nil { + return "", err + } return `{"pool_id": 3}`, nil } else if args[3] == "mirrorPool2" { + err := saveMockDataInTempFile(`{"pool_id": 4}`, peerPoolTempFile) + if err != nil { + return "", err + } return `{"pool_id": 4}`, nil } } if args[0] == "osd" && args[1] == "pool" && args[2] == "get" && strings.HasSuffix(args[5], "peer3") { if args[3] == "mirrorPool1" { + err := saveMockDataInTempFile(`{"pool_id": 4}`, peerPoolTempFile) + if err != nil { + return "", err + } return `{"pool_id": 4}`, nil } else if args[3] == "mirrorPool2" { + err := saveMockDataInTempFile(`{"pool_id": 5}`, peerPoolTempFile) + if err != nil { + return "", err + } return `{"pool_id": 5}`, nil } }