mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-04 01:39:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1956 from owncloud/fix-1955

Browse Source
This commit is contained in:
Alex Unger
2021-04-22 17:10:53 +02:00
committed by GitHub
parent 05f3b50964 fefee56e7a
commit fa339639cb
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelog/unreleased/fix-storage-metadata-default.md
+5
View File
@@ -0,0 +1,5 @@
Bugfix: Fix STORAGE_METADATA_ROOT default value override
The way the value was being set ensured that it was NOT being overridden where it should have been. This patch ensures the correct loading order of values.
https://github.com/owncloud/ocis/pull/1956
storage/pkg/command/storagemetadata.go
+7
View File
@@ -67,6 +67,13 @@ func StorageMetadata(cfg *config.Config) *cli.Command {
cfg.Reva.Storages.OwnCloud.EnableHome = false
cfg.Reva.Storages.S3.EnableHome = false
// We need this hack because the metadata storage can define STORAGE_METADATA_ROOT which has the same destination as
// STORAGE_DRIVER_OCIS_ROOT. When both variables are set one storage will always be out of sync. Ensure the
// metadata storage root is never overridden. This is the kind of stateful code that make you want to cry blood.
if os.Getenv("STORAGE_METADATA_ROOT") != "" && os.Getenv("STORAGE_DRIVER_OCIS_ROOT") != "" {
cfg.Reva.Storages.Common.Root = os.Getenv("STORAGE_METADATA_ROOT")
}
rcfg := storageMetadataFromStruct(c, cfg)
gr.Add(func() error {
storage/pkg/flagset/storagemetadata.go
+7 -7
View File
@@ -89,13 +89,6 @@ func StorageMetadata(cfg *config.Config) []cli.Flag {
},
}
f = append(f, TracingWithConfig(cfg)...)
f = append(f, DebugWithConfig(cfg)...)
f = append(f, SecretWithConfig(cfg)...)
f = append(f, DriverEOSWithConfig(cfg)...)
f = append(f, DriverLocalWithConfig(cfg)...)
f = append(f, DriverOwnCloudWithConfig(cfg)...)
f = append(f, DriverOCISWithConfig(cfg)...)
f = append(f,
&cli.StringFlag{
Name: "storage-root",
@@ -105,6 +98,13 @@ func StorageMetadata(cfg *config.Config) []cli.Flag {
Destination: &cfg.Reva.Storages.Common.Root,
},
)
f = append(f, TracingWithConfig(cfg)...)
f = append(f, DebugWithConfig(cfg)...)
f = append(f, SecretWithConfig(cfg)...)
f = append(f, DriverEOSWithConfig(cfg)...)
f = append(f, DriverLocalWithConfig(cfg)...)
f = append(f, DriverOwnCloudWithConfig(cfg)...)
f = append(f, DriverOCISWithConfig(cfg)...)
return f
}