From 64fc740d8a2cbe8e6b40d049ec3296f011e4c84e Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Wed, 16 Dec 2020 11:34:54 -0700 Subject: [PATCH] ceph: revert new node is not provisioned when useallnodes is true This reverts commit a6ee5657aeeee505964fe263b21b974426921891. The operator reconcile of the cephcluster was staying in an endless loop in clusters that did not have OSDs configured on all nodes. Now we revert this change for the patch release and will follow up with a more complete fix in https://github.com/rook/rook/pull/6813. Signed-off-by: Travis Nielsen --- pkg/daemon/ceph/client/crush.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkg/daemon/ceph/client/crush.go b/pkg/daemon/ceph/client/crush.go index 80e5d6416..0db1e0bbc 100644 --- a/pkg/daemon/ceph/client/crush.go +++ b/pkg/daemon/ceph/client/crush.go @@ -22,12 +22,10 @@ import ( "io/ioutil" "strconv" "strings" - "syscall" "github.com/pkg/errors" cephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1" "github.com/rook/rook/pkg/clusterd" - "github.com/rook/rook/pkg/util/exec" ) const ( @@ -204,10 +202,6 @@ func GetOSDOnHost(context *clusterd.Context, clusterInfo *ClusterInfo, node stri args := []string{"osd", "crush", "ls", node} buf, err := NewCephCommand(context, clusterInfo, args).Run() if err != nil { - // ENOENT as error means that node is not (yet) part of the ceph cluster - if code, ok := exec.ExitStatus(err); ok && code == int(syscall.ENOENT) { - return "", nil - } return "", errors.Wrapf(err, "failed to get osd list on host. %s", string(buf)) }