diff options
| author | Ruakij <ruakij@ruekov.eu> | 2023-01-16 20:39:16 +0100 |
|---|---|---|
| committer | Ruakij <ruakij@ruekov.eu> | 2023-01-16 20:39:16 +0100 |
| commit | 4899161d26d93496e15a293b8e8b99500d537fec (patch) | |
| tree | 70ba55d69b162ad4c71b374d884055fe31261855 | |
| parent | 794ab2d31a1b63313c36ab842a09e1f8a2a381f2 (diff) | |
| parent | 3be6e2f80354ca8182d60fb862c318b734ecc00a (diff) | |
| download | seaweedfs-csi-driver-4899161d26d93496e15a293b8e8b99500d537fec.tar.xz seaweedfs-csi-driver-4899161d26d93496e15a293b8e8b99500d537fec.zip | |
Merge branch 'master' into feat_dataLocality
| -rw-r--r-- | pkg/driver/mounter_seaweedfs.go | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/pkg/driver/mounter_seaweedfs.go b/pkg/driver/mounter_seaweedfs.go index cbb77cd..0fc4281 100644 --- a/pkg/driver/mounter_seaweedfs.go +++ b/pkg/driver/mounter_seaweedfs.go @@ -75,7 +75,8 @@ func (seaweedFs *seaweedFsMounter) Mount(target string) (Unmounter, error) { args = append(args, fmt.Sprintf("-collectionQuotaMB=%d", capacityMB)) } - // Initial values for override-able args + // Values for override-able args + // Whitelist for merging with volContext argsMap := map[string]string { "collection": seaweedFs.collection, "filer": strings.Join(filers, ","), @@ -84,6 +85,13 @@ func (seaweedFs *seaweedFsMounter) Mount(target string) (Unmounter, error) { "concurrentWriters": fmt.Sprint(seaweedFs.driver.ConcurrentWriters), "map.uid": seaweedFs.driver.UidMap, "map.gid": seaweedFs.driver.GidMap, + "disk": "", + "dataCenter": "", + "replication": "", + "ttl": "", + "chunkSizeLimitMB": "", + "volumeServerAccess": "", + "readRetryTime": "", } // Handle DataLocality @@ -113,7 +121,7 @@ func (seaweedFs *seaweedFsMounter) Mount(target string) (Unmounter, error) { "diskType": "disk", } - // Fields supplied in context, but ignored because they are handled explicitly somewhere else + // Explicitly ignored volContext args e.g. handled somewhere else ignoreArgs := []string{ "volumeCapacity", "dataLocality", @@ -129,6 +137,12 @@ func (seaweedFs *seaweedFsMounter) Mount(target string) (Unmounter, error) { arg = newArg } + // Check if arg can be applied + if _, ok := argsMap[arg]; !ok { + glog.Warningf("VolumeContext '%s' ignored", arg) + continue + } + // Write to args-map argsMap[arg] = value } |