diff options
| author | chrislu <chris.lu@gmail.com> | 2021-12-23 17:23:26 -0800 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2021-12-23 17:23:26 -0800 |
| commit | 7bf48ee135a06bbcdc06a05cd7ff4292d8d21514 (patch) | |
| tree | 4be0d6c0844b642ea9db4b148b3a1c1375686bd4 /weed/server | |
| parent | 6de331b014ac83c1b2f8d127f164ede560535d8d (diff) | |
| parent | 6ead7758cea182bcc4c5b7c4dc87c81420d1659b (diff) | |
| download | seaweedfs-7bf48ee135a06bbcdc06a05cd7ff4292d8d21514.tar.xz seaweedfs-7bf48ee135a06bbcdc06a05cd7ff4292d8d21514.zip | |
Merge branch 'master' of https://github.com/chrislusf/seaweedfs
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_server_handlers_write.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/weed/server/filer_server_handlers_write.go b/weed/server/filer_server_handlers_write.go index 46b0302aa..870ce44e6 100644 --- a/weed/server/filer_server_handlers_write.go +++ b/weed/server/filer_server_handlers_write.go @@ -142,9 +142,9 @@ func (fs *FilerServer) detectStorageOption(requestURI, qCollection, qReplication return &operation.StorageOption{ Replication: util.Nvl(qReplication, rule.Replication, bucketDefaultReplication, fs.option.DefaultReplication), Collection: util.Nvl(qCollection, rule.Collection, bucketDefaultCollection, fs.option.Collection), - DataCenter: util.Nvl(dataCenter, fs.option.DataCenter), - Rack: util.Nvl(rack, fs.option.Rack), - DataNode: util.Nvl(dataNode, fs.option.DataNode), + DataCenter: util.Nvl(dataCenter, rule.DataCenter, fs.option.DataCenter), + Rack: util.Nvl(rack, rule.Rack, fs.option.Rack), + DataNode: util.Nvl(dataNode, rule.DataNode, fs.option.DataNode), TtlSeconds: ttlSeconds, DiskType: util.Nvl(diskType, rule.DiskType), Fsync: fsync || rule.Fsync, |