From 56f3f9471b2b2d2a5e81339a06b854a659151694 Mon Sep 17 00:00:00 2001 From: Anton Skriptsov Date: Tue, 15 Oct 2019 04:57:31 -0700 Subject: [PATCH] Edgefs: Rtlfs devices should be more then 3 on all nodes fix Signed-off-by: Anton Skriptsov --- .../edgefs/cluster/cluster_deployment_config.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/operator/edgefs/cluster/cluster_deployment_config.go b/pkg/operator/edgefs/cluster/cluster_deployment_config.go index cb1548ede..46e7c645e 100644 --- a/pkg/operator/edgefs/cluster/cluster_deployment_config.go +++ b/pkg/operator/edgefs/cluster/cluster_deployment_config.go @@ -311,7 +311,6 @@ func (c *cluster) validateDeploymentConfig(deploymentConfig edgefsv1.ClusterDepl return err } - deploymentNodesCount := len(deploymentConfig.DevConfig) if deploymentConfig.TransportKey == edgefsv1.DeploymentRtkvs { if len(c.Spec.Storage.Directories) == 0 { return fmt.Errorf("RTKVS configuration error: storage.directory has to " + @@ -322,9 +321,12 @@ func (c *cluster) validateDeploymentConfig(deploymentConfig edgefsv1.ClusterDepl " A per-node NVME KVSSD disks list is expected") } } else if deploymentConfig.TransportKey == edgefsv1.DeploymentRtlfs { - // Check directories devices count on all nodes - if len(c.Spec.Storage.Directories)*deploymentNodesCount < 3 { - return fmt.Errorf("Rtlfs devices should be more then 3 on all nodes summary") + // Check directories devices count on all nodes for autoRtlfs mode + deploymentNodesCount := len(deploymentConfig.DevConfig) + if len(c.Spec.Storage.Directories) > 0 { + if len(c.Spec.Storage.Directories)*deploymentNodesCount < 3 { + return fmt.Errorf("Rtlfs devices should be more then 3 on all nodes summary") + } } } else if deploymentConfig.TransportKey == edgefsv1.DeploymentRtrd { // Check all deployment nodes has available disk devices