core: convert util.NewSet() to sets.NewString()
Converting util.NewSet() instance to use sets.NewString() instance Closes: https://github.com/rook/rook/issues/8479 Signed-off-by: parth-gr <paarora@redhat.com>
This commit is contained in:
1 parent
6582bac8e7
commit
77ba1ef11b
3 files changed
+84
-84
No files matched your search
@@ -25,17 +25,17 @@ import (
|
||||
osdconfig "github.com/rook/rook/pkg/operator/ceph/cluster/osd/config"
|
||||
opcontroller "github.com/rook/rook/pkg/operator/ceph/controller"
|
||||
"github.com/rook/rook/pkg/operator/k8sutil"
|
||||
"github.com/rook/rook/pkg/util"
|
||||
v1 "k8s.io/api/core/v1"
|
||||
kerrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
"k8s.io/apimachinery/pkg/util/sets"
|
||||
"k8s.io/apimachinery/pkg/util/version"
|
||||
)
|
||||
|
||||
type createConfig struct {
|
||||
cluster *Cluster
|
||||
provisionConfig *provisionConfig
|
||||
awaitingStatusConfigMaps *util.Set // These status configmaps were created for OSD prepare jobs
|
||||
finishedStatusConfigMaps *util.Set // Status configmaps are added here as provisioning is completed for them
|
||||
awaitingStatusConfigMaps sets.String // These status configmaps were created for OSD prepare jobs
|
||||
finishedStatusConfigMaps sets.String // Status configmaps are added here as provisioning is completed for them
|
||||
deployments *existenceList // these OSDs have existing deployments
|
||||
}
|
||||
|
||||
@@ -49,27 +49,27 @@ var (
|
||||
|
||||
func (c *Cluster) newCreateConfig(
|
||||
provisionConfig *provisionConfig,
|
||||
awaitingStatusConfigMaps *util.Set,
|
||||
awaitingStatusConfigMaps sets.String,
|
||||
deployments *existenceList,
|
||||
) *createConfig {
|
||||
if awaitingStatusConfigMaps == nil {
|
||||
awaitingStatusConfigMaps = util.NewSet()
|
||||
awaitingStatusConfigMaps = sets.NewString()
|
||||
}
|
||||
return &createConfig{
|
||||
c,
|
||||
provisionConfig,
|
||||
awaitingStatusConfigMaps,
|
||||
util.NewSet(),
|
||||
sets.NewString(),
|
||||
deployments,
|
||||
}
|
||||
}
|
||||
|
||||
func (c *createConfig) progress() (completed, initial int) {
|
||||
return c.finishedStatusConfigMaps.Count(), c.awaitingStatusConfigMaps.Count()
|
||||
return c.finishedStatusConfigMaps.Len(), c.awaitingStatusConfigMaps.Len()
|
||||
}
|
||||
|
||||
func (c *createConfig) doneCreating() bool {
|
||||
return c.awaitingStatusConfigMaps.Count() == c.finishedStatusConfigMaps.Count()
|
||||
return c.awaitingStatusConfigMaps.Len() == c.finishedStatusConfigMaps.Len()
|
||||
}
|
||||
|
||||
func (c *createConfig) createNewOSDsFromStatus(
|
||||
@@ -77,13 +77,13 @@ func (c *createConfig) createNewOSDsFromStatus(
|
||||
nodeOrPVCName string,
|
||||
errs *provisionErrors,
|
||||
) {
|
||||
if !c.awaitingStatusConfigMaps.Contains(statusConfigMapName(nodeOrPVCName)) {
|
||||
if !c.awaitingStatusConfigMaps.Has(statusConfigMapName(nodeOrPVCName)) {
|
||||
// If there is a dangling OSD prepare configmap from another reconcile, don't process it
|
||||
logger.Infof("not creating deployments for OSD prepare results found in ConfigMap %q which was not created for the latest storage spec", statusConfigMapName(nodeOrPVCName))
|
||||
return
|
||||
}
|
||||
|
||||
if c.finishedStatusConfigMaps.Contains(statusConfigMapName(nodeOrPVCName)) {
|
||||
if c.finishedStatusConfigMaps.Has(statusConfigMapName(nodeOrPVCName)) {
|
||||
// If we have already processed this configmap, don't process it again
|
||||
logger.Infof("not creating deployments for OSD prepare results found in ConfigMap %q which was already processed", statusConfigMapName(nodeOrPVCName))
|
||||
return
|
||||
@@ -115,7 +115,7 @@ func (c *createConfig) createNewOSDsFromStatus(
|
||||
|
||||
// Call this if createNewOSDsFromStatus() isn't going to be called (like for a failed status)
|
||||
func (c *createConfig) doneWithStatus(nodeOrPVCName string) {
|
||||
c.finishedStatusConfigMaps.Add(statusConfigMapName(nodeOrPVCName))
|
||||
c.finishedStatusConfigMaps.Insert(statusConfigMapName(nodeOrPVCName))
|
||||
}
|
||||
|
||||
// Returns a set of all the awaitingStatusConfigMaps that will be updated by provisioning jobs.
|
||||
@@ -124,34 +124,34 @@ func (c *createConfig) doneWithStatus(nodeOrPVCName string) {
|
||||
//
|
||||
// Creation of prepare jobs is most directly related to creating new OSDs. And we want to keep all
|
||||
// usage of awaitingStatusConfigMaps in this file.
|
||||
func (c *Cluster) startProvisioningOverPVCs(config *provisionConfig, errs *provisionErrors) (*util.Set, error) {
|
||||
func (c *Cluster) startProvisioningOverPVCs(config *provisionConfig, errs *provisionErrors) (sets.String, error) {
|
||||
// Parsing storageClassDeviceSets and parsing it to volume sources
|
||||
c.prepareStorageClassDeviceSets(errs)
|
||||
|
||||
// no valid VolumeSource is ready to run an osd
|
||||
if len(c.deviceSets) == 0 {
|
||||
logger.Info("no storageClassDeviceSets defined to configure OSDs on PVCs")
|
||||
return util.NewSet(), nil
|
||||
return sets.NewString(), nil
|
||||
}
|
||||
|
||||
// Check k8s version
|
||||
k8sVersion, err := k8sutil.GetK8SVersion(c.context.Clientset)
|
||||
if err != nil {
|
||||
errs.addError("failed to provision OSDs on PVCs. user has specified storageClassDeviceSets, but the Kubernetes version could not be determined. minimum Kubernetes version required: 1.13.0. %v", err)
|
||||
return util.NewSet(), nil
|
||||
return sets.NewString(), nil
|
||||
}
|
||||
if !k8sVersion.AtLeast(version.MustParseSemantic("v1.13.0")) {
|
||||
errs.addError("failed to provision OSDs on PVCs. user has specified storageClassDeviceSets, but the Kubernetes version is not supported. user must update Kubernetes version. minimum Kubernetes version required: 1.13.0. version detected: %s", k8sVersion.String())
|
||||
return util.NewSet(), nil
|
||||
return sets.NewString(), nil
|
||||
}
|
||||
|
||||
existingDeployments, err := c.getExistingOSDDeploymentsOnPVCs()
|
||||
if err != nil {
|
||||
errs.addError("failed to provision OSDs on PVCs. failed to query existing OSD deployments on PVCs. %v", err)
|
||||
return util.NewSet(), nil
|
||||
return sets.NewString(), nil
|
||||
}
|
||||
|
||||
awaitingStatusConfigMaps := util.NewSet()
|
||||
awaitingStatusConfigMaps := sets.NewString()
|
||||
for _, volume := range c.deviceSets {
|
||||
// Check whether we need to cancel the orchestration
|
||||
if err := opcontroller.CheckForCancelledOrchestration(c.context); err != nil {
|
||||
@@ -233,7 +233,7 @@ func (c *Cluster) startProvisioningOverPVCs(config *provisionConfig, errs *provi
|
||||
}
|
||||
|
||||
// Skip OSD prepare if deployment already exists for the PVC
|
||||
if existingDeployments.Contains(dataSource.ClaimName) {
|
||||
if existingDeployments.Has(dataSource.ClaimName) {
|
||||
logger.Debugf("skipping OSD prepare job creation for PVC %q because OSD daemon using the PVC already exists", osdProps.crushHostname)
|
||||
continue
|
||||
}
|
||||
@@ -251,7 +251,7 @@ func (c *Cluster) startProvisioningOverPVCs(config *provisionConfig, errs *provi
|
||||
// record the name of the status configmap that will eventually receive results from the
|
||||
// OSD provisioning job we just created. This will help us determine when we are done
|
||||
// processing the results of provisioning jobs.
|
||||
awaitingStatusConfigMaps.Add(cmName)
|
||||
awaitingStatusConfigMaps.Insert(cmName)
|
||||
}
|
||||
|
||||
return awaitingStatusConfigMaps, nil
|
||||
@@ -263,10 +263,10 @@ func (c *Cluster) startProvisioningOverPVCs(config *provisionConfig, errs *provi
|
||||
//
|
||||
// Creation of prepare jobs is most directly related to creating new OSDs. And we want to keep all
|
||||
// usage of awaitingStatusConfigMaps in this file.
|
||||
func (c *Cluster) startProvisioningOverNodes(config *provisionConfig, errs *provisionErrors) (*util.Set, error) {
|
||||
func (c *Cluster) startProvisioningOverNodes(config *provisionConfig, errs *provisionErrors) (sets.String, error) {
|
||||
if !c.spec.Storage.UseAllNodes && len(c.spec.Storage.Nodes) == 0 {
|
||||
logger.Info("no nodes are defined for configuring OSDs on raw devices")
|
||||
return util.NewSet(), nil
|
||||
return sets.NewString(), nil
|
||||
}
|
||||
|
||||
if c.spec.Storage.UseAllNodes {
|
||||
@@ -278,7 +278,7 @@ func (c *Cluster) startProvisioningOverNodes(config *provisionConfig, errs *prov
|
||||
hostnameMap, err := k8sutil.GetNodeHostNames(c.context.Clientset)
|
||||
if err != nil {
|
||||
errs.addError("failed to provision OSDs on nodes. failed to get node hostnames. %v", err)
|
||||
return util.NewSet(), nil
|
||||
return sets.NewString(), nil
|
||||
}
|
||||
c.spec.Storage.Nodes = nil
|
||||
for _, hostname := range hostnameMap {
|
||||
@@ -300,15 +300,15 @@ func (c *Cluster) startProvisioningOverNodes(config *provisionConfig, errs *prov
|
||||
// no valid node is ready to run an osd
|
||||
if len(validNodes) == 0 {
|
||||
logger.Warningf("no valid nodes available to run osds on nodes in namespace %q", c.clusterInfo.Namespace)
|
||||
return util.NewSet(), nil
|
||||
return sets.NewString(), nil
|
||||
}
|
||||
|
||||
if len(c.spec.DataDirHostPath) == 0 {
|
||||
errs.addError("failed to provision OSDs on nodes. user has specified valid nodes for storage, but dataDirHostPath is empty. user must set CephCluster dataDirHostPath")
|
||||
return util.NewSet(), nil
|
||||
return sets.NewString(), nil
|
||||
}
|
||||
|
||||
awaitingStatusConfigMaps := util.NewSet()
|
||||
awaitingStatusConfigMaps := sets.NewString()
|
||||
for _, node := range c.ValidStorage.Nodes {
|
||||
// Check whether we need to cancel the orchestration
|
||||
if err := opcontroller.CheckForCancelledOrchestration(c.context); err != nil {
|
||||
@@ -353,7 +353,7 @@ func (c *Cluster) startProvisioningOverNodes(config *provisionConfig, errs *prov
|
||||
// record the name of the status configmap that will eventually receive results from the
|
||||
// OSD provisioning job we just created. This will help us determine when we are done
|
||||
// processing the results of provisioning jobs.
|
||||
awaitingStatusConfigMaps.Add(cmName)
|
||||
awaitingStatusConfigMaps.Insert(cmName)
|
||||
}
|
||||
|
||||
return awaitingStatusConfigMaps, nil
|
||||
|
||||
@@ -27,7 +27,6 @@ import (
|
||||
cephclient "github.com/rook/rook/pkg/daemon/ceph/client"
|
||||
cephver "github.com/rook/rook/pkg/operator/ceph/version"
|
||||
"github.com/rook/rook/pkg/operator/test"
|
||||
"github.com/rook/rook/pkg/util"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/tevino/abool"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
@@ -35,6 +34,7 @@ import (
|
||||
apiresource "k8s.io/apimachinery/pkg/api/resource"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/util/sets"
|
||||
"k8s.io/client-go/kubernetes/fake"
|
||||
k8stesting "k8s.io/client-go/testing"
|
||||
)
|
||||
@@ -93,7 +93,7 @@ func Test_createNewOSDsFromStatus(t *testing.T) {
|
||||
|
||||
spec := cephv1.ClusterSpec{}
|
||||
var status *OrchestrationStatus
|
||||
awaitingStatusConfigMaps := util.NewSet()
|
||||
awaitingStatusConfigMaps := sets.NewString()
|
||||
|
||||
var c *Cluster
|
||||
var createConfig *createConfig
|
||||
@@ -102,10 +102,10 @@ func Test_createNewOSDsFromStatus(t *testing.T) {
|
||||
// none of this code should ever add or remove deployments from the existence list
|
||||
assert.Equal(t, 3, deployments.Len())
|
||||
// Simulate environment where provision jobs were created for node0, node2, pvc1, and pvc2
|
||||
awaitingStatusConfigMaps = util.NewSet()
|
||||
awaitingStatusConfigMaps.AddMultiple([]string{
|
||||
awaitingStatusConfigMaps = sets.NewString()
|
||||
awaitingStatusConfigMaps.Insert(
|
||||
statusNameNode0, statusNameNode2,
|
||||
statusNamePVC1, statusNamePVC2})
|
||||
statusNamePVC1, statusNamePVC2)
|
||||
createCallsOnNode = createCallsOnNode[:0]
|
||||
createCallsOnPVC = createCallsOnPVC[:0]
|
||||
errs = newProvisionErrors()
|
||||
@@ -128,9 +128,9 @@ func Test_createNewOSDsFromStatus(t *testing.T) {
|
||||
assert.Len(t, createCallsOnNode, 0)
|
||||
assert.Len(t, createCallsOnPVC, 0)
|
||||
// status map should have been marked completed
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Count())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Count())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Contains(statusNameNode0))
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Len())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Len())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Has(statusNameNode0))
|
||||
})
|
||||
|
||||
t.Run("test: node: create all OSDs on node when all do not exist", func(t *testing.T) {
|
||||
@@ -146,9 +146,9 @@ func Test_createNewOSDsFromStatus(t *testing.T) {
|
||||
assert.ElementsMatch(t, createCallsOnNode, []int{0, 1, 2})
|
||||
assert.Len(t, createCallsOnPVC, 0)
|
||||
// status map should have been marked completed
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Count())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Count())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Contains(statusNameNode2))
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Len())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Len())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Has(statusNameNode2))
|
||||
})
|
||||
|
||||
t.Run("node: create only nonexistent OSDs on node when some already exist", func(t *testing.T) {
|
||||
@@ -167,9 +167,9 @@ func Test_createNewOSDsFromStatus(t *testing.T) {
|
||||
assert.ElementsMatch(t, createCallsOnNode, []int{5, 7})
|
||||
assert.Len(t, createCallsOnPVC, 0)
|
||||
// status map should have been marked completed
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Count())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Count())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Contains(statusNameNode0))
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Len())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Len())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Has(statusNameNode0))
|
||||
})
|
||||
|
||||
t.Run("node: skip creating OSDs for status configmaps that weren't created for this reconcile", func(t *testing.T) {
|
||||
@@ -185,8 +185,8 @@ func Test_createNewOSDsFromStatus(t *testing.T) {
|
||||
assert.ElementsMatch(t, createCallsOnNode, []int{})
|
||||
assert.Len(t, createCallsOnPVC, 0)
|
||||
// status map should NOT have been marked completed
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Count())
|
||||
assert.Equal(t, 0, createConfig.finishedStatusConfigMaps.Count())
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Len())
|
||||
assert.Equal(t, 0, createConfig.finishedStatusConfigMaps.Len())
|
||||
})
|
||||
|
||||
t.Run("node: errors reported if OSDs fail to create", func(t *testing.T) {
|
||||
@@ -203,9 +203,9 @@ func Test_createNewOSDsFromStatus(t *testing.T) {
|
||||
assert.ElementsMatch(t, createCallsOnNode, []int{0, 1, 2})
|
||||
assert.Len(t, createCallsOnPVC, 0)
|
||||
// status map should have been marked completed
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Count())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Count())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Contains(statusNameNode0))
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Len())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Len())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Has(statusNameNode0))
|
||||
induceFailureCreatingOSD = -1 // off
|
||||
})
|
||||
|
||||
@@ -220,9 +220,9 @@ func Test_createNewOSDsFromStatus(t *testing.T) {
|
||||
assert.Len(t, createCallsOnNode, 0)
|
||||
assert.Len(t, createCallsOnPVC, 0)
|
||||
// status map should have been marked completed
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Count())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Count())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Contains(statusNamePVC1))
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Len())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Len())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Has(statusNamePVC1))
|
||||
})
|
||||
|
||||
t.Run("pvc: create all OSDs on pvc when all do not exist", func(t *testing.T) {
|
||||
@@ -238,9 +238,9 @@ func Test_createNewOSDsFromStatus(t *testing.T) {
|
||||
assert.ElementsMatch(t, createCallsOnPVC, []int{0, 1, 2})
|
||||
assert.Len(t, createCallsOnNode, 0)
|
||||
// status map should have been marked completed
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Count())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Count())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Contains(statusNamePVC2))
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Len())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Len())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Has(statusNamePVC2))
|
||||
})
|
||||
|
||||
t.Run("pvc: create only nonexistent OSDs on pvc when some already exist", func(t *testing.T) {
|
||||
@@ -259,9 +259,9 @@ func Test_createNewOSDsFromStatus(t *testing.T) {
|
||||
assert.ElementsMatch(t, createCallsOnPVC, []int{5, 7})
|
||||
assert.Len(t, createCallsOnNode, 0)
|
||||
// status map should have been marked completed
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Count())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Count())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Contains(statusNamePVC1))
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Len())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Len())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Has(statusNamePVC1))
|
||||
})
|
||||
|
||||
t.Run("pvc: skip creating OSDs for status configmaps that weren't created for this reconcile", func(t *testing.T) {
|
||||
@@ -277,8 +277,8 @@ func Test_createNewOSDsFromStatus(t *testing.T) {
|
||||
assert.ElementsMatch(t, createCallsOnPVC, []int{})
|
||||
assert.Len(t, createCallsOnNode, 0)
|
||||
// no status maps should have been marked completed
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Count())
|
||||
assert.Equal(t, 0, createConfig.finishedStatusConfigMaps.Count())
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Len())
|
||||
assert.Equal(t, 0, createConfig.finishedStatusConfigMaps.Len())
|
||||
})
|
||||
|
||||
t.Run("pvc: errors reported if OSDs fail to create", func(t *testing.T) {
|
||||
@@ -295,9 +295,9 @@ func Test_createNewOSDsFromStatus(t *testing.T) {
|
||||
assert.ElementsMatch(t, createCallsOnPVC, []int{0, 1, 2})
|
||||
assert.Len(t, createCallsOnNode, 0)
|
||||
// status map should have been marked completed
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Count())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Count())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Contains(statusNamePVC1))
|
||||
assert.Equal(t, 4, awaitingStatusConfigMaps.Len())
|
||||
assert.Equal(t, 1, createConfig.finishedStatusConfigMaps.Len())
|
||||
assert.True(t, createConfig.finishedStatusConfigMaps.Has(statusNamePVC1))
|
||||
induceFailureCreatingOSD = -1 // off
|
||||
})
|
||||
}
|
||||
@@ -323,7 +323,7 @@ func Test_startProvisioningOverPVCs(t *testing.T) {
|
||||
var errs *provisionErrors
|
||||
var c *Cluster
|
||||
var config *provisionConfig
|
||||
var awaitingStatusConfigMaps *util.Set
|
||||
var awaitingStatusConfigMaps sets.String
|
||||
var err error
|
||||
doSetup := func() {
|
||||
test.SetFakeKubernetesVersion(clientset, fakeK8sVersion) // PVCs require k8s version v1.13+
|
||||
@@ -341,7 +341,7 @@ func Test_startProvisioningOverPVCs(t *testing.T) {
|
||||
doSetup()
|
||||
awaitingStatusConfigMaps, err = c.startProvisioningOverPVCs(config, errs)
|
||||
assert.NoError(t, err)
|
||||
assert.Zero(t, awaitingStatusConfigMaps.Count())
|
||||
assert.Zero(t, awaitingStatusConfigMaps.Len())
|
||||
assert.Zero(t, errs.len())
|
||||
// no result configmaps should have been created
|
||||
cms, err := clientset.CoreV1().ConfigMaps(namespace).List(context.TODO(), metav1.ListOptions{})
|
||||
@@ -366,7 +366,7 @@ func Test_startProvisioningOverPVCs(t *testing.T) {
|
||||
doSetup()
|
||||
awaitingStatusConfigMaps, err = c.startProvisioningOverPVCs(config, errs)
|
||||
assert.NoError(t, err)
|
||||
assert.Zero(t, awaitingStatusConfigMaps.Count())
|
||||
assert.Zero(t, awaitingStatusConfigMaps.Len())
|
||||
assert.Zero(t, errs.len()) // this was not a problem with a single job but with ALL jobs
|
||||
// no result configmaps should have been created
|
||||
cms, err := clientset.CoreV1().ConfigMaps(namespace).List(context.TODO(), metav1.ListOptions{})
|
||||
@@ -391,7 +391,7 @@ func Test_startProvisioningOverPVCs(t *testing.T) {
|
||||
doSetup()
|
||||
awaitingStatusConfigMaps, err = c.startProvisioningOverPVCs(config, errs)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, 2, awaitingStatusConfigMaps.Count())
|
||||
assert.Equal(t, 2, awaitingStatusConfigMaps.Len())
|
||||
assert.Zero(t, errs.len())
|
||||
cms, err := clientset.CoreV1().ConfigMaps(namespace).List(context.TODO(), metav1.ListOptions{})
|
||||
assert.NoError(t, err)
|
||||
@@ -403,7 +403,7 @@ func Test_startProvisioningOverPVCs(t *testing.T) {
|
||||
doSetup()
|
||||
awaitingStatusConfigMaps, err = c.startProvisioningOverPVCs(config, errs)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, 2, awaitingStatusConfigMaps.Count())
|
||||
assert.Equal(t, 2, awaitingStatusConfigMaps.Len())
|
||||
assert.Zero(t, errs.len())
|
||||
cms, err := clientset.CoreV1().ConfigMaps(namespace).List(context.TODO(), metav1.ListOptions{})
|
||||
assert.NoError(t, err)
|
||||
@@ -417,7 +417,7 @@ func Test_startProvisioningOverPVCs(t *testing.T) {
|
||||
doSetup()
|
||||
awaitingStatusConfigMaps, err = c.startProvisioningOverPVCs(config, errs)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, 0, awaitingStatusConfigMaps.Count())
|
||||
assert.Equal(t, 0, awaitingStatusConfigMaps.Len())
|
||||
assert.Equal(t, 1, errs.len())
|
||||
cms, err := clientset.CoreV1().ConfigMaps(namespace).List(context.TODO(), metav1.ListOptions{})
|
||||
assert.NoError(t, err)
|
||||
@@ -433,7 +433,7 @@ func Test_startProvisioningOverPVCs(t *testing.T) {
|
||||
awaitingStatusConfigMaps, err = c.startProvisioningOverPVCs(config, errs)
|
||||
assert.Error(t, err)
|
||||
assert.Zero(t, errs.len())
|
||||
assert.Zero(t, awaitingStatusConfigMaps.Count())
|
||||
assert.Zero(t, awaitingStatusConfigMaps.Len())
|
||||
requestCancelOrchestration.UnSet()
|
||||
})
|
||||
|
||||
@@ -453,7 +453,7 @@ func Test_startProvisioningOverPVCs(t *testing.T) {
|
||||
doSetup()
|
||||
awaitingStatusConfigMaps, err = c.startProvisioningOverPVCs(config, errs)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, 0, awaitingStatusConfigMaps.Count())
|
||||
assert.Equal(t, 0, awaitingStatusConfigMaps.Len())
|
||||
assert.Equal(t, 1, errs.len())
|
||||
cms, err := clientset.CoreV1().ConfigMaps(namespace).List(context.TODO(), metav1.ListOptions{})
|
||||
assert.NoError(t, err)
|
||||
@@ -490,7 +490,7 @@ func Test_startProvisioningOverNodes(t *testing.T) {
|
||||
var errs *provisionErrors
|
||||
var c *Cluster
|
||||
var config *provisionConfig
|
||||
var prepareJobsRun *util.Set
|
||||
var prepareJobsRun sets.String
|
||||
var err error
|
||||
var cms *corev1.ConfigMapList
|
||||
doSetup := func() {
|
||||
@@ -508,7 +508,7 @@ func Test_startProvisioningOverNodes(t *testing.T) {
|
||||
doSetup()
|
||||
prepareJobsRun, err = c.startProvisioningOverNodes(config, errs)
|
||||
assert.NoError(t, err)
|
||||
assert.Zero(t, prepareJobsRun.Count())
|
||||
assert.Zero(t, prepareJobsRun.Len())
|
||||
assert.Zero(t, errs.len())
|
||||
// no result configmaps should have been created
|
||||
cms, err = clientset.CoreV1().ConfigMaps(namespace).List(context.TODO(), metav1.ListOptions{})
|
||||
@@ -532,7 +532,7 @@ func Test_startProvisioningOverNodes(t *testing.T) {
|
||||
doSetup()
|
||||
prepareJobsRun, err = c.startProvisioningOverNodes(config, errs)
|
||||
assert.NoError(t, err)
|
||||
assert.Zero(t, prepareJobsRun.Count())
|
||||
assert.Zero(t, prepareJobsRun.Len())
|
||||
assert.Equal(t, 1, errs.len()) // this was not a problem with a single job but with ALL jobs
|
||||
// no result configmaps should have been created
|
||||
cms, err = clientset.CoreV1().ConfigMaps(namespace).List(context.TODO(), metav1.ListOptions{})
|
||||
@@ -549,7 +549,7 @@ func Test_startProvisioningOverNodes(t *testing.T) {
|
||||
assert.Zero(t, errs.len())
|
||||
assert.ElementsMatch(t,
|
||||
[]string{statusNameNode0, statusNameNode1, statusNameNode2},
|
||||
prepareJobsRun.ToSlice(),
|
||||
prepareJobsRun.List(),
|
||||
)
|
||||
// all result configmaps should have been created
|
||||
cms, err = clientset.CoreV1().ConfigMaps(namespace).List(context.TODO(), metav1.ListOptions{})
|
||||
@@ -568,7 +568,7 @@ func Test_startProvisioningOverNodes(t *testing.T) {
|
||||
assert.Zero(t, errs.len())
|
||||
assert.ElementsMatch(t,
|
||||
[]string{statusNameNode0, statusNameNode1, statusNameNode2},
|
||||
prepareJobsRun.ToSlice(),
|
||||
prepareJobsRun.List(),
|
||||
)
|
||||
})
|
||||
|
||||
@@ -595,7 +595,7 @@ func Test_startProvisioningOverNodes(t *testing.T) {
|
||||
assert.Zero(t, errs.len())
|
||||
assert.ElementsMatch(t,
|
||||
[]string{statusNameNode0, statusNameNode2},
|
||||
prepareJobsRun.ToSlice(),
|
||||
prepareJobsRun.List(),
|
||||
)
|
||||
})
|
||||
|
||||
@@ -605,7 +605,7 @@ func Test_startProvisioningOverNodes(t *testing.T) {
|
||||
prepareJobsRun, err = c.startProvisioningOverNodes(config, errs)
|
||||
assert.Error(t, err)
|
||||
assert.Zero(t, errs.len())
|
||||
assert.Zero(t, prepareJobsRun.Count())
|
||||
assert.Zero(t, prepareJobsRun.Len())
|
||||
requestCancelOrchestration.UnSet()
|
||||
})
|
||||
|
||||
@@ -626,7 +626,7 @@ func Test_startProvisioningOverNodes(t *testing.T) {
|
||||
prepareJobsRun, err = c.startProvisioningOverNodes(config, errs)
|
||||
assert.NoError(t, err)
|
||||
assert.Zero(t, errs.len())
|
||||
assert.Zero(t, prepareJobsRun.Count())
|
||||
assert.Zero(t, prepareJobsRun.Len())
|
||||
})
|
||||
|
||||
t.Run("failures running prepare jobs", func(t *testing.T) {
|
||||
@@ -671,13 +671,13 @@ func Test_startProvisioningOverNodes(t *testing.T) {
|
||||
assert.Equal(t, 1, errs.len())
|
||||
assert.ElementsMatch(t,
|
||||
[]string{statusNameNode0},
|
||||
prepareJobsRun.ToSlice(),
|
||||
prepareJobsRun.List(),
|
||||
)
|
||||
// with a fresh clientset, only the one results ConfigMap should exist
|
||||
cms, err = clientset.CoreV1().ConfigMaps(namespace).List(context.TODO(), metav1.ListOptions{})
|
||||
assert.NoError(t, err)
|
||||
assert.Len(t, cms.Items, 1)
|
||||
assert.Equal(t, prepareJobsRun.ToSlice()[0], cms.Items[0].Name)
|
||||
assert.Equal(t, prepareJobsRun.List()[0], cms.Items[0].Name)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -37,11 +37,11 @@ import (
|
||||
"github.com/rook/rook/pkg/operator/ceph/controller"
|
||||
cephver "github.com/rook/rook/pkg/operator/ceph/version"
|
||||
"github.com/rook/rook/pkg/operator/k8sutil"
|
||||
"github.com/rook/rook/pkg/util"
|
||||
appsv1 "k8s.io/api/apps/v1"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
kerrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/util/sets"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -199,21 +199,21 @@ func (c *Cluster) Start() error {
|
||||
updateConfig := c.newUpdateConfig(config, updateQueue, deployments)
|
||||
|
||||
// prepare for creating new OSDs
|
||||
statusConfigMaps := util.NewSet()
|
||||
statusConfigMaps := sets.NewString()
|
||||
|
||||
logger.Info("start provisioning the OSDs on PVCs, if needed")
|
||||
pvcConfigMaps, err := c.startProvisioningOverPVCs(config, errs)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
statusConfigMaps.AddSet(pvcConfigMaps)
|
||||
statusConfigMaps = statusConfigMaps.Union(pvcConfigMaps)
|
||||
|
||||
logger.Info("start provisioning the OSDs on nodes, if needed")
|
||||
nodeConfigMaps, err := c.startProvisioningOverNodes(config, errs)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
statusConfigMaps.AddSet(nodeConfigMaps.Copy())
|
||||
statusConfigMaps = statusConfigMaps.Union(nodeConfigMaps)
|
||||
|
||||
createConfig := c.newCreateConfig(config, statusConfigMaps, deployments)
|
||||
|
||||
@@ -239,7 +239,7 @@ func (c *Cluster) Start() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Cluster) getExistingOSDDeploymentsOnPVCs() (*util.Set, error) {
|
||||
func (c *Cluster) getExistingOSDDeploymentsOnPVCs() (sets.String, error) {
|
||||
ctx := context.TODO()
|
||||
listOpts := metav1.ListOptions{LabelSelector: fmt.Sprintf("%s=%s,%s", k8sutil.AppAttr, AppName, OSDOverPVCLabelKey)}
|
||||
|
||||
@@ -248,10 +248,10 @@ func (c *Cluster) getExistingOSDDeploymentsOnPVCs() (*util.Set, error) {
|
||||
return nil, errors.Wrap(err, "failed to query existing OSD deployments")
|
||||
}
|
||||
|
||||
result := util.NewSet()
|
||||
result := sets.NewString()
|
||||
for _, deployment := range deployments.Items {
|
||||
if pvcID, ok := deployment.Labels[OSDOverPVCLabelKey]; ok {
|
||||
result.Add(pvcID)
|
||||
result.Insert(pvcID)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user