feedc0de/my-rook-config
1
0 Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #4260 from leseb/cv-skip-restorecon

Browse Source 
Ceph-volume skip restorecon
This commit is contained in:
Sébastien Han authored and GitHub committed 2019-11-12 20:59:53 +01:00
2 parents 5d16ffc766 a0fdf1bb5f
commit 496e6e52cd
6 files changed
+22 -114
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pkg/daemon/ceph/osd/daemon.go
-5
View File
@@ -57,11 +57,6 @@ func StartOSD(context *clusterd.Context, osdType, osdID, osdUUID, lvPath string,
return fmt.Errorf("failed to update lvm configuration file, %+v", err) // fail return here as validation provided by ceph-volume
}
// Hide restorecon command, only when hostnetworking is enabled
if err := replaceRestoreconCommand(); err != nil {
return fmt.Errorf("failed to hide 'restorecon' command. %+v", err)
}
var volumeGroupName string
if pvcBackedOSD {
volumeGroupName, err = getVolumeGroupName(lvPath)
pkg/daemon/ceph/osd/volume.go
+2 -46
View File
@@ -21,7 +21,6 @@ import (
"encoding/json"
"fmt"
"io/ioutil"
"os"
"path"
"strconv"
"strings"
@@ -38,11 +37,8 @@ import (
// These are not constants because they are used by the tests
var (
cephConfigDir = "/var/lib/ceph"
lvmConfPath = "/etc/lvm/lvm.conf"
restoreconPath = "/usr/sbin/restorecon"
restoreconPathNewPath = restoreconPath + ".old"
redHatReleaseFile = "/etc/redhat-release"
cephConfigDir = "/var/lib/ceph"
lvmConfPath = "/etc/lvm/lvm.conf"
)
const (
@@ -53,10 +49,6 @@ const (
dbDeviceFlag = "--db-devices"
cephVolumeCmd = "ceph-volume"
cephVolumeMinDBSize = 1024 // 1GB
restoreconNewContent = `#!/usr/bin/env bash
echo "restorecon command was replaced with a no-op."
echo "original restorecon command is now at %s"
`
)
func (a *OsdAgent) configureCVDevices(context *clusterd.Context, devices *DeviceOsdMapping) ([]oposd.OSDInfo, error) {
@@ -81,10 +73,6 @@ func (a *OsdAgent) configureCVDevices(context *clusterd.Context, devices *Device
if err := updateLVMConfig(context, a.pvcBacked); err != nil {
return nil, fmt.Errorf("failed to update lvm configuration file, %+v", err) // fail return here as validation provided by ceph-volume
}
// Hide restorecon command, only when hostnetworking is enabled
if err := replaceRestoreconCommand(); err != nil {
return nil, fmt.Errorf("failed to hide 'restorecon' command. %+v", err)
}
if a.pvcBacked {
if lv, err = a.initializeBlockPVC(context, devices); err != nil {
return nil, fmt.Errorf("failed to initialize devices. %+v", err)
@@ -178,38 +166,6 @@ func updateLVMConfig(context *clusterd.Context, onPVC bool) error {
return nil
}
func replaceRestoreconCommand() error {
// Check if Host Networking is enabled
hostnetworking := os.Getenv("ROOK_HOST_NETWORKING")
if hostnetworking == "false" {
logger.Debugf("ROOK_HOST_NETWORKING is %q, not replacing 'restorecon' command", hostnetworking)
return nil
}
// Check whether we are running on RHEL
// The existence of /etc/redhat-release should be enough
_, err := os.Stat(redHatReleaseFile)
if os.IsNotExist(err) {
logger.Debugf("%q does not exist, not replacing 'restorecon' command, only doing this on red hat systems", redHatReleaseFile)
return nil
}
logger.Debugf("renaming %q to %q", restoreconPath, restoreconPathNewPath)
err = os.Rename(restoreconPath, restoreconPathNewPath)
if err != nil {
return fmt.Errorf("failed to rename %q to %q. %+v", restoreconPath, restoreconPathNewPath, err)
}
logger.Debugf("writing new content to %q", restoreconPath)
err = ioutil.WriteFile(restoreconPath, []byte(fmt.Sprintf(restoreconNewContent, restoreconPathNewPath)), 0755)
if err != nil {
return fmt.Errorf("failed to write new content of restorecon to %q. %+v", restoreconPath, err)
}
logger.Infof("Successfully replaced restorecon command to %q", restoreconPathNewPath)
return nil
}
func (a *OsdAgent) initializeDevices(context *clusterd.Context, devices *DeviceOsdMapping) error {
storeFlag := "--bluestore"
if a.storeConfig.StoreType == config.Filestore {
pkg/daemon/ceph/osd/volume_test.go
-46
View File
@@ -18,9 +18,6 @@ package osd
import (
"fmt"
"io/ioutil"
"os"
"strings"
"testing"
"github.com/rook/rook/pkg/clusterd"
@@ -314,46 +311,3 @@ func TestGetDatabaseSize(t *testing.T) {
assert.Equal(t, 0, getDatabaseSize(0, 0))
assert.Equal(t, 2048, getDatabaseSize(4096, 2048))
}
func TestHideRestoreconCommand(t *testing.T) {
os.Setenv("ROOK_HOST_NETWORKING", "false")
defer os.Setenv("ROOK_HOST_NETWORKING", "")
// Should not run if ROOK_HOST_NETWORKING is false
err := replaceRestoreconCommand()
assert.NoError(t, err)
// Should not run if /etc/redhat-release does not exist
os.Setenv("ROOK_HOST_NETWORKING", "true")
err = replaceRestoreconCommand()
assert.NoError(t, err)
// Should run now
// Fake redhat-release file
f, err := ioutil.TempFile("", "redhat-release")
assert.NoError(t, err)
defer f.Close()
defer os.Remove(f.Name())
redHatReleaseFile = f.Name()
assert.FileExists(t, redHatReleaseFile)
// Fake restorecon command
ff, err := ioutil.TempFile("", "restorecon")
defer ff.Close()
defer os.Remove(ff.Name())
assert.NoError(t, err)
restoreconPath = ff.Name()
assert.FileExists(t, restoreconPath)
restoreconPathNewPath = restoreconPath + ".old"
defer os.Remove(restoreconPathNewPath)
err = replaceRestoreconCommand()
assert.NoError(t, err)
assert.FileExists(t, restoreconPathNewPath, "restoreconPath is %q and restoreconPathNewPath is %q", restoreconPath, restoreconPathNewPath)
r, err := ioutil.ReadFile(restoreconPath)
assert.NoError(t, err)
b := strings.Contains(string(r), "restorecon command was replaced with a no-op")
assert.True(t, b, restoreconPath)
}
pkg/operator/ceph/cluster/mon/env.go
+1 -10
View File
@@ -16,11 +16,7 @@ limitations under the License.
package mon
import (
"strconv"
v1 "k8s.io/api/core/v1"
)
import v1 "k8s.io/api/core/v1"
// ClusterNameEnvVar is the cluster name environment var
func ClusterNameEnvVar(name string) v1.EnvVar {
@@ -44,8 +40,3 @@ func AdminSecretEnvVar() v1.EnvVar {
ref := &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: AppName}, Key: adminSecretName}
return v1.EnvVar{Name: "ROOK_ADMIN_SECRET", ValueFrom: &v1.EnvVarSource{SecretKeyRef: ref}}
}
// ClusterHostNetworking is the value of the hostnetworking spec
func ClusterHostNetworking(name bool) v1.EnvVar {
return v1.EnvVar{Name: "ROOK_HOST_NETWORKING", Value: strconv.FormatBool(name)}
}
pkg/operator/ceph/cluster/osd/spec.go
+11 -7
View File
@@ -260,11 +260,6 @@ func (c *Cluster) makeDeployment(osdProps osdProperties, osd OSDInfo) (*apps.Dep
Name: "run-udev",
MountPath: "/run/udev"})
// Activate verbose mode for ceph-volume on activate
envVars = append(envVars, []v1.EnvVar{
{Name: "CEPH_VOLUME_DEBUG", Value: "1"},
}...)
} else if osd.IsDirectory {
// config for dir-based osds is gotten from the commandline or from the mon database
doConfigInit = false
@@ -555,7 +550,6 @@ func (c *Cluster) getConfigEnvVars(storeConfig config.StoreConfig, dataDir, node
opmon.EndpointEnvVar(),
opmon.SecretEnvVar(),
opmon.AdminSecretEnvVar(),
opmon.ClusterHostNetworking(c.Network.IsHost()),
k8sutil.ConfigDirEnvVar(dataDir),
k8sutil.ConfigOverrideEnvVar(),
{Name: "ROOK_FSID", ValueFrom: &v1.EnvVarSource{
@@ -564,9 +558,12 @@ func (c *Cluster) getConfigEnvVars(storeConfig config.StoreConfig, dataDir, node
Key: "fsid",
},
}},
{Name: "CEPH_VOLUME_DEBUG", Value: "1"},
k8sutil.NodeEnvVar(),
}
// Append ceph-volume environment variables
envVars = append(envVars, cephVolumeEnvVar()...)
if storeConfig.StoreType != "" {
envVars = append(envVars, v1.EnvVar{Name: osdStoreEnvVarName, Value: storeConfig.StoreType})
}
@@ -869,3 +866,10 @@ func (c *Cluster) osdPrepareResources(osdClaimName string) v1.ResourceRequiremen
},
}
}
func cephVolumeEnvVar() []v1.EnvVar {
return []v1.EnvVar{
{Name: "CEPH_VOLUME_DEBUG", Value: "1"},
{Name: "CEPH_VOLUME_SKIP_RESTORECON", Value: "1"},
}
}
pkg/operator/ceph/cluster/osd/spec_test.go
+8
View File
@@ -365,3 +365,11 @@ func TestOsdPrepareResources(t *testing.T) {
assert.Equal(t, "0", r.Limits.Memory().String())
assert.Equal(t, "250", r.Requests.Memory().String())
}
func TestCephVolumeEnvVar(t *testing.T) {
cvEnv := cephVolumeEnvVar()
assert.Equal(t, "CEPH_VOLUME_DEBUG", cvEnv[0].Name)
assert.Equal(t, "1", cvEnv[0].Value)
assert.Equal(t, "CEPH_VOLUME_SKIP_RESTORECON", cvEnv[1].Name)
assert.Equal(t, "1", cvEnv[1].Value)
}