From 39ff5ae767bbeaeff04bdff1d2c56812bb2d4dce Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 5 Jul 2026 10:19:20 -0700 Subject: [PATCH] filer: default cassandra2 timeout and ydb prefix so env-var configs match the scaffold (#10234) * cassandra2: default connection_timeout_millisecond so env-var configs keep the 600ms timeout The scaffold documents a 600ms default, but the value has no SetDefault. A config supplied purely through env vars (or a minimal toml) that omits the key read back 0, silently overriding the client timeout with no bound. * ydb: default the table path prefix so env-var configs keep the seaweedfs sub-path The scaffold documents prefix = "seaweedfs", but with no SetDefault a config that omits it lands tables at the database root instead of under seaweedfs/. --- weed/filer/cassandra2/cassandra_store.go | 2 ++ weed/filer/ydb/ydb_store.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/weed/filer/cassandra2/cassandra_store.go b/weed/filer/cassandra2/cassandra_store.go index 20f068f5c..5b099eb05 100644 --- a/weed/filer/cassandra2/cassandra_store.go +++ b/weed/filer/cassandra2/cassandra_store.go @@ -31,6 +31,8 @@ func (store *Cassandra2Store) GetName() string { } func (store *Cassandra2Store) Initialize(configuration util.Configuration, prefix string) (err error) { + // Without this, an env-var config that omits the key drops cluster.Timeout to 0. + configuration.SetDefault(prefix+"connection_timeout_millisecond", 600) enableHostVerification := true if val := configuration.GetString(prefix + "ssl_enable_host_verification"); val != "" { enableHostVerification = configuration.GetBool(prefix + "ssl_enable_host_verification") diff --git a/weed/filer/ydb/ydb_store.go b/weed/filer/ydb/ydb_store.go index 66a38cc0f..a5e1850b7 100644 --- a/weed/filer/ydb/ydb_store.go +++ b/weed/filer/ydb/ydb_store.go @@ -33,6 +33,7 @@ const ( defaultMinPartitionsCount = 5 defaultMaxPartitionsCount = 1000 defaultMaxListChunk = 2000 + defaultTablePathPrefix = "seaweedfs" ) var ( @@ -64,6 +65,7 @@ func (store *YdbStore) GetName() string { } func (store *YdbStore) Initialize(configuration util.Configuration, prefix string) (err error) { + configuration.SetDefault(prefix+"prefix", defaultTablePathPrefix) configuration.SetDefault(prefix+"partitionBySizeEnabled", defaultPartitionBySizeEnabled) configuration.SetDefault(prefix+"partitionSizeMb", defaultPartitionSizeMb) configuration.SetDefault(prefix+"partitionByLoadEnabled", defaultPartitionByLoadEnabled)