ceph: remove obsolete storeType setting
All clusters are configured with bluestore as the store type therefore we can remove the settings where mentioned in the docs and dead code. Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
This commit is contained in:
6 files changed
+1
-12
No files matched your search
@@ -459,7 +459,6 @@ The following are the settings for Storage Class Device Sets which can be config
|
||||
The following storage selection settings are specific to Ceph and do not apply to other backends. All variables are key-value pairs represented as strings.
|
||||
|
||||
* `metadataDevice`: Name of a device to use for the metadata of OSDs on each node. Performance can be improved by using a low latency device (such as SSD or NVMe) as the metadata device, while other spinning platter (HDD) devices on a node are used to store data. Provisioning will fail if the user specifies a `metadataDevice` but that device is not used as a metadata device by Ceph. Notably, `ceph-volume` will not use a device of the same device class (HDD, SSD, NVMe) as OSD devices for metadata, resulting in this failure.
|
||||
* `storeType`: `bluestore`, the underlying storage format to use for each OSD. The default is set dynamically to `bluestore` for devices and is the only supported format at this point.
|
||||
* `databaseSizeMB`: The size in MB of a bluestore database. Include quotes around the size.
|
||||
* `walSizeMB`: The size in MB of a bluestore write ahead log (WAL). Include quotes around the size.
|
||||
* `deviceClass`: The [CRUSH device class](https://ceph.io/community/new-luminous-crush-device-classes/) to use for this selection of storage devices. (By default, if a device's class has not already been set, OSDs will automatically set a device's class to either `hdd`, `ssd`, or `nvme` based on the hardware properties exposed by the Linux kernel.) These storage classes can then be used to select the devices backing a storage pool by specifying them as the value of [the pool spec's `deviceClass` field](ceph-pool-crd.md#spec).
|
||||
@@ -764,7 +763,6 @@ spec:
|
||||
- name: "sdc1" # One specific partition. Should not have a file system on it.
|
||||
- name: "/dev/disk/by-id/ata-ST4000DM004-XXXX" # both device name and explicit udev links are supported
|
||||
config: # configuration can be specified at the node level which overrides the cluster level config
|
||||
storeType: bluestore
|
||||
- name: "172.17.4.301"
|
||||
deviceFilter: "^sd."
|
||||
```
|
||||
|
||||
@@ -12,7 +12,7 @@ Rook allows creation and customization of object stores through the custom resou
|
||||
|
||||
### Erasure Coded
|
||||
|
||||
Erasure coded pools require the OSDs to use `bluestore` for the configured [`storeType`](ceph-cluster-crd.md#osd-configuration-settings). Additionally, erasure coded pools can only be used with `dataPools`. The `metadataPool` must use a replicated pool.
|
||||
Erasure coded pools can only be used with `dataPools`. The `metadataPool` must use a replicated pool.
|
||||
|
||||
> **NOTE**: This sample requires *at least 3 bluestore OSDs*, with each OSD located on a *different node*.
|
||||
|
||||
|
||||
@@ -218,7 +218,6 @@ spec:
|
||||
# osdsPerDevice: "5"
|
||||
# - name: "/dev/disk/by-id/ata-ST4000DM004-XXXX" # devices can be specified using full udev paths
|
||||
# config: # configuration can be specified at the node level which overrides the cluster level config
|
||||
# storeType: filestore
|
||||
# - name: "172.17.4.301"
|
||||
# deviceFilter: "^sd."
|
||||
# The section for configuring management of daemon disruptions during upgrade or fencing.
|
||||
|
||||
@@ -115,7 +115,6 @@ func addOSDConfigFlags(command *cobra.Command) {
|
||||
// OSD store config flags
|
||||
command.Flags().IntVar(&cfg.storeConfig.WalSizeMB, "osd-wal-size", osdcfg.WalDefaultSizeMB, "default size (MB) for OSD write ahead log (WAL) (bluestore)")
|
||||
command.Flags().IntVar(&cfg.storeConfig.DatabaseSizeMB, "osd-database-size", 0, "default size (MB) for OSD database (bluestore)")
|
||||
command.Flags().StringVar(&cfg.storeConfig.StoreType, "osd-store", "", "type of backing OSD store to use (bluestore or filestore)")
|
||||
command.Flags().IntVar(&cfg.storeConfig.OSDsPerDevice, "osds-per-device", 1, "the number of OSDs per device")
|
||||
command.Flags().BoolVar(&cfg.storeConfig.EncryptedDevice, "encrypted-device", false, "whether to encrypt the OSD with dmcrypt")
|
||||
command.Flags().StringVar(&cfg.storeConfig.DeviceClass, "osd-crush-device-class", "", "The device class for all OSDs configured on this node")
|
||||
|
||||
@@ -33,7 +33,6 @@ func GetConfigStoreName(nodeName string) string {
|
||||
}
|
||||
|
||||
const (
|
||||
StoreTypeKey = "storeType"
|
||||
WalSizeMBKey = "walSizeMB"
|
||||
DatabaseSizeMBKey = "databaseSizeMB"
|
||||
JournalSizeMBKey = "journalSizeMB"
|
||||
@@ -45,7 +44,6 @@ const (
|
||||
|
||||
// StoreConfig represents the configuration of an OSD on a device.
|
||||
type StoreConfig struct {
|
||||
StoreType string `json:"storeType,omitempty"`
|
||||
WalSizeMB int `json:"walSizeMB,omitempty"`
|
||||
DatabaseSizeMB int `json:"databaseSizeMB,omitempty"`
|
||||
OSDsPerDevice int `json:"osdsPerDevice,omitempty"`
|
||||
@@ -66,8 +64,6 @@ func ToStoreConfig(config map[string]string) StoreConfig {
|
||||
storeConfig := NewStoreConfig()
|
||||
for k, v := range config {
|
||||
switch k {
|
||||
case StoreTypeKey:
|
||||
storeConfig.StoreType = v
|
||||
case WalSizeMBKey:
|
||||
storeConfig.WalSizeMB = convertToIntIgnoreErr(v)
|
||||
case DatabaseSizeMBKey:
|
||||
|
||||
@@ -29,7 +29,6 @@ import (
|
||||
cephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
|
||||
rookv1 "github.com/rook/rook/pkg/apis/rook.io/v1"
|
||||
kms "github.com/rook/rook/pkg/daemon/ceph/osd/kms"
|
||||
"github.com/rook/rook/pkg/operator/ceph/cluster/osd/config"
|
||||
opconfig "github.com/rook/rook/pkg/operator/ceph/config"
|
||||
"github.com/rook/rook/pkg/operator/ceph/controller"
|
||||
"github.com/rook/rook/pkg/operator/k8sutil"
|
||||
@@ -325,7 +324,6 @@ func (c *Cluster) makeDeployment(osdProps osdProperties, osd OSDInfo, provisionC
|
||||
return nil, errors.New("empty volumes")
|
||||
}
|
||||
|
||||
storeType := config.Bluestore
|
||||
osdID := strconv.Itoa(osd.ID)
|
||||
tiniEnvVar := v1.EnvVar{Name: "TINI_SUBREAPER", Value: ""}
|
||||
envVars := append(c.getConfigEnvVars(osdProps, dataDir), []v1.EnvVar{
|
||||
@@ -335,7 +333,6 @@ func (c *Cluster) makeDeployment(osdProps osdProperties, osd OSDInfo, provisionC
|
||||
envVars = append(envVars, []v1.EnvVar{
|
||||
{Name: "ROOK_OSD_UUID", Value: osd.UUID},
|
||||
{Name: "ROOK_OSD_ID", Value: osdID},
|
||||
{Name: "ROOK_OSD_STORE_TYPE", Value: storeType},
|
||||
{Name: "ROOK_CEPH_MON_HOST",
|
||||
ValueFrom: &v1.EnvVarSource{
|
||||
SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{
|
||||
|
||||
Reference in new issue
Block a user