From 037422ba1f09aa5ab04d411b21623e43bf9317ad Mon Sep 17 00:00:00 2001 From: mmattel Date: Wed, 3 May 2023 12:22:09 +0200 Subject: [PATCH] [docs-only] Set messagepack as default metadata backend --- services/storage-system/pkg/config/config.go | 2 +- services/storage-system/pkg/config/defaults/defaultconfig.go | 2 +- services/storage-users/pkg/config/config.go | 2 +- services/storage-users/pkg/config/defaults/defaultconfig.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/storage-system/pkg/config/config.go b/services/storage-system/pkg/config/config.go index b83bd7be20..06a674acd0 100644 --- a/services/storage-system/pkg/config/config.go +++ b/services/storage-system/pkg/config/config.go @@ -85,7 +85,7 @@ type Drivers struct { // OCISDriver holds ocis Driver config type OCISDriver struct { - MetadataBackend string `yaml:"metadata_backend" env:"OCIS_DECOMPOSEDFS_METADATA_BACKEND;STORAGE_SYSTEM_OCIS_METADATA_BACKEND" desc:"The backend to use for storing metadata. Supported values are 'xattrs' and 'messagepack'. The setting 'xattrs' uses extended attributes to store file metadata while 'messagepack' uses a dedicated file to store file metadata. Defaults to 'xattrs'."` + MetadataBackend string `yaml:"metadata_backend" env:"OCIS_DECOMPOSEDFS_METADATA_BACKEND;STORAGE_SYSTEM_OCIS_METADATA_BACKEND" desc:"The backend to use for storing metadata. Supported values are 'messagepack' and 'xattrs'. The setting 'messagepack' uses a dedicated file to store file metadata while 'xattrs' uses extended attributes to store file metadata. Defaults to 'messagepack'."` // Root is the absolute path to the location of the data Root string `yaml:"root" env:"STORAGE_SYSTEM_OCIS_ROOT" desc:"Path for the directory where the STORAGE-SYSTEM service stores it's persistent data. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage."` diff --git a/services/storage-system/pkg/config/defaults/defaultconfig.go b/services/storage-system/pkg/config/defaults/defaultconfig.go index 0d98d676ff..63fa5eba6e 100644 --- a/services/storage-system/pkg/config/defaults/defaultconfig.go +++ b/services/storage-system/pkg/config/defaults/defaultconfig.go @@ -45,7 +45,7 @@ func DefaultConfig() *config.Config { Driver: "ocis", Drivers: config.Drivers{ OCIS: config.OCISDriver{ - MetadataBackend: "xattrs", + MetadataBackend: "messagepack", Root: filepath.Join(defaults.BaseDataPath(), "storage", "metadata"), MaxAcquireLockCycles: 20, LockCycleDurationFactor: 30, diff --git a/services/storage-users/pkg/config/config.go b/services/storage-users/pkg/config/config.go index f6af0c48ec..2b7c536399 100644 --- a/services/storage-users/pkg/config/config.go +++ b/services/storage-users/pkg/config/config.go @@ -99,7 +99,7 @@ type Drivers struct { // OCISDriver is the storage driver configuration when using 'ocis' storage driver type OCISDriver struct { - MetadataBackend string `yaml:"metadata_backend" env:"OCIS_DECOMPOSEDFS_METADATA_BACKEND;STORAGE_USERS_OCIS_METADATA_BACKEND" desc:"The backend to use for storing metadata. Supported values are 'xattrs' and 'messagepack'. The setting 'xattrs' uses extended attributes to store file metadata while 'messagepack' uses a dedicated file to store file metadata. Defaults to 'xattrs'."` + MetadataBackend string `yaml:"metadata_backend" env:"OCIS_DECOMPOSEDFS_METADATA_BACKEND;STORAGE_USERS_OCIS_METADATA_BACKEND" desc:"The backend to use for storing metadata. Supported values are 'messagepack' and 'xattrs'. The setting 'messagepack' uses a dedicated file to store file metadata while 'xattrs' uses extended attributes to store file metadata. Defaults to 'messagepack'."` // Root is the absolute path to the location of the data Root string `yaml:"root" env:"STORAGE_USERS_OCIS_ROOT" desc:"The directory where the filesystem storage will store blobs and metadata. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/storage/users."` UserLayout string `yaml:"user_layout" env:"STORAGE_USERS_OCIS_USER_LAYOUT" desc:"Template string for the user storage layout in the user directory."` diff --git a/services/storage-users/pkg/config/defaults/defaultconfig.go b/services/storage-users/pkg/config/defaults/defaultconfig.go index 93313a3c5b..ca9235d505 100644 --- a/services/storage-users/pkg/config/defaults/defaultconfig.go +++ b/services/storage-users/pkg/config/defaults/defaultconfig.go @@ -61,7 +61,7 @@ func DefaultConfig() *config.Config { UsersProviderEndpoint: "localhost:9144", }, S3NG: config.S3NGDriver{ - MetadataBackend: "xattrs", + MetadataBackend: "messagepack", Root: filepath.Join(defaults.BaseDataPath(), "storage", "users"), ShareFolder: "/Shares", UserLayout: "{{.Id.OpaqueId}}",