Merge pull request #2369 from sabbot/master

EdgeFS: Wrong condition in devices discovery

pkg/operator/edgefs/cluster/target/config/config.go

@@ -71,7 +71,7 @@ func DefaultStoreConfig() StoreConfig {
 		LmdbPageSize:       16348,
 		UseBCacheWB:        false,
 		UseMetadataMask:    "0xff",
-		UseMetadataOffload: true,
+		UseMetadataOffload: false,
 		UseAllSSD:          false,
 		RtrdPLevelOverride: 0,
 	}

pkg/operator/edgefs/cluster/target/configmap.go

@@ -80,6 +80,7 @@ type SetupNode struct {
 	ClusterNodes    []string     `json:"cluster_nodes,omitempty"`
 	Rtrd            RTDevices    `json:"rtrd"`
 	Rtlfs           RtlfsDevices `json:"rtlfs"`
+	NodeType        string       `json:"nodeType"`
 }
 
 // As we relying on StatefulSet, we want to build global ConfigMap shared
@@ -122,6 +123,11 @@ func (c *Cluster) createSetupConfigs(resurrect bool) error {
 			rtlfsAutoDetectPath = "/data"
 		}
 
+		nodeType := "target"
+		if devConfig.isGatewayNode {
+			nodeType = "gateway"
+		}
+
 		if resurrect || devConfig.isGatewayNode {
 			// In resurrection case we only need to adjust networking selections
 			// in ccow.json, ccowd.json and corosync.conf. And keep device transport
@@ -161,6 +167,7 @@ func (c *Cluster) createSetupConfigs(resurrect bool) error {
 			Ipv4Autodetect:  1,
 			RtlfsAutodetect: rtlfsAutoDetectPath,
 			ClusterNodes:    dnsRecords,
+			NodeType:        nodeType,
 		}
 
 		cm[node.Name] = nodeConfig

pkg/operator/edgefs/cluster/target/target.go

@@ -291,6 +291,7 @@ func (c *Cluster) createDeploymentConfig(resurrect bool) error {
 		}
 
 		storeConfig := config.ToStoreConfig(n.Config)
+		logger.Infof("Storage config for node: %s is %+v", n.Name, storeConfig)
 		rtDevices, err := GetRTDevices(availDisks, &storeConfig)
 		if err != nil {
 			logger.Warningf("Can't get rtDevices for node %s due %v", n.Name, err)