ceph: read and validate CSI params in Go routine

This commit moves SetParams and ValidateCSIParam func
into go routine/lock, since it modifies/reads global CSIParam
variable.

Signed-off-by: Rakshith R <rar@redhat.com>
This commit is contained in:
Rakshith R committed 2021-06-21 15:44:54 +05:30
1 parent c961d9f7ac
commit 66c9ccab86
3 files changed
+13 -10

No files matched your search

+12 -1
View File
@@ -34,6 +34,17 @@ func ValidateAndConfigureDrivers(context *clusterd.Context, namespace, rookImage
v *CephCSIVersion
err error
)
if err = setParams(context.Clientset); err != nil {
logger.Errorf("failed to configure CSI parameters. %v", err)
return
}
if err = validateCSIParam(); err != nil {
logger.Errorf("failed to validate CSI parameters. %v", err)
return
}
if !AllowUnsupported && CSIEnabled() {
if v, err = validateCSIVersion(context.Clientset, namespace, rookImage, securityAccount, ownerInfo); err != nil {
logger.Errorf("invalid csi version. %+v", err)
@@ -57,7 +68,7 @@ func ValidateAndConfigureDrivers(context *clusterd.Context, namespace, rookImage
stopDrivers(context.Clientset, namespace, serverVersion)
}
func SetParams(clientset kubernetes.Interface) error {
func setParams(clientset kubernetes.Interface) error {
var err error
csiEnableRBD, err := k8sutil.GetOperatorSetting(clientset, controllerutil.OperatorSettingConfigMapName, "ROOK_CSI_ENABLE_RBD", "true")
+1 -1
View File
@@ -189,7 +189,7 @@ func CSIEnabled() bool {
return EnableRBD || EnableCephFS
}
func ValidateCSIParam() error {
func validateCSIParam() error {
if len(CSIParam.CSIPluginImage) == 0 {
return errors.New("missing csi rbd plugin image")
-8
View File
@@ -240,10 +240,6 @@ func (o *Operator) updateDrivers() error {
return errors.Wrap(err, "error getting server version")
}
if err = csi.SetParams(o.context.Clientset); err != nil {
return errors.Wrap(err, "failed to configure CSI parameters")
}
if serverVersion.Major < csi.KubeMinMajor || serverVersion.Major == csi.KubeMinMajor && serverVersion.Minor < csi.ProvDeploymentSuppVersion {
logger.Infof("CSI drivers only supported in K8s 1.14 or newer. version=%s", serverVersion.String())
// disable csi control variables to disable other csi functions
@@ -269,10 +265,6 @@ func (o *Operator) updateDrivers() error {
return errors.Wrap(err, "failed creating csi config map")
}
if err = csi.ValidateCSIParam(); err != nil {
return errors.Wrap(err, "invalid csi params")
}
go csi.ValidateAndConfigureDrivers(o.context, o.operatorNamespace, o.rookImage, o.securityAccount, serverVersion, ownerInfo)
return nil
}