mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-05-23 10:11:28 +00:00
a17dca7009
* fix(filer): don't disable the SQL idle connection pool when unconfigured The mysql/mysql2/postgres stores called SetMaxIdleConns(maxIdle) unconditionally, so an unset connection_max_idle (0) actively kept zero idle connections - every query opened and closed a fresh connection instead of reusing the pool. Only apply the value when it's set; otherwise leave database/sql's default idle pool of 2 in place. * comments: shorten idle-pool note * fix(filer): default the SQL idle pool via config, keep explicit 0 honored Apply the idle-pool default at the config layer with SetDefault instead of guarding the SetMaxIdleConns call. An absent connection_max_idle now reads back as 2 (pool stays on), while an explicit 0 flows through to SetMaxIdleConns(0) so operators can still disable idle pooling on purpose.
126 lines
3.8 KiB
Go
126 lines
3.8 KiB
Go
// Package postgres2 provides PostgreSQL filer store implementation with bucket support
|
|
// Migrated from github.com/lib/pq to github.com/jackc/pgx for:
|
|
// - Active development and support
|
|
// - Better performance and PostgreSQL-specific features
|
|
// - Improved error handling (no more panics)
|
|
// - Built-in logging capabilities
|
|
// - Superior SSL certificate support
|
|
package postgres2
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strconv"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/filer"
|
|
"github.com/seaweedfs/seaweedfs/weed/filer/abstract_sql"
|
|
"github.com/seaweedfs/seaweedfs/weed/filer/postgres"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
)
|
|
|
|
var _ filer.BucketAware = (*PostgresStore2)(nil)
|
|
|
|
func init() {
|
|
filer.Stores = append(filer.Stores, &PostgresStore2{})
|
|
}
|
|
|
|
type PostgresStore2 struct {
|
|
abstract_sql.AbstractSqlStore
|
|
}
|
|
|
|
func (store *PostgresStore2) GetName() string {
|
|
return "postgres2"
|
|
}
|
|
|
|
func (store *PostgresStore2) Initialize(configuration util.Configuration, prefix string) (err error) {
|
|
// Absent key keeps a pooled default; an explicit 0 disables the idle pool.
|
|
configuration.SetDefault(prefix+"connection_max_idle", 2)
|
|
return store.initialize(
|
|
configuration.GetString(prefix+"createTable"),
|
|
configuration.GetString(prefix+"upsertQuery"),
|
|
configuration.GetBool(prefix+"enableUpsert"),
|
|
configuration.GetString(prefix+"username"),
|
|
configuration.GetString(prefix+"password"),
|
|
configuration.GetString(prefix+"hostname"),
|
|
configuration.GetInt(prefix+"port"),
|
|
configuration.GetString(prefix+"database"),
|
|
configuration.GetString(prefix+"schema"),
|
|
configuration.GetString(prefix+"sslmode"),
|
|
configuration.GetString(prefix+"sslcert"),
|
|
configuration.GetString(prefix+"sslkey"),
|
|
configuration.GetString(prefix+"sslrootcert"),
|
|
configuration.GetString(prefix+"sslcrl"),
|
|
configuration.GetBool(prefix+"pgbouncer_compatible"),
|
|
configuration.GetInt(prefix+"connection_max_idle"),
|
|
configuration.GetInt(prefix+"connection_max_open"),
|
|
configuration.GetInt(prefix+"connection_max_lifetime_seconds"),
|
|
)
|
|
}
|
|
|
|
func (store *PostgresStore2) initialize(createTable, upsertQuery string, enableUpsert bool, user, password, hostname string, port int, database, schema, sslmode, sslcert, sslkey, sslrootcert, sslcrl string, pgbouncerCompatible bool, maxIdle, maxOpen, maxLifetimeSeconds int) (err error) {
|
|
|
|
store.SupportBucketTable = true
|
|
if !enableUpsert {
|
|
upsertQuery = ""
|
|
}
|
|
store.SqlGenerator = &postgres.SqlGenPostgres{
|
|
CreateTableSqlTemplate: createTable,
|
|
DropTableSqlTemplate: `drop table "%s"`,
|
|
UpsertQueryTemplate: upsertQuery,
|
|
}
|
|
|
|
// pgx-optimized connection string with better timeouts and connection handling
|
|
sqlUrl := "connect_timeout=30"
|
|
|
|
if hostname != "" {
|
|
sqlUrl += " host=" + hostname
|
|
}
|
|
if port != 0 {
|
|
sqlUrl += " port=" + strconv.Itoa(port)
|
|
}
|
|
|
|
// SSL configuration - pgx provides better SSL support than lib/pq
|
|
if sslmode != "" {
|
|
sqlUrl += " sslmode=" + sslmode
|
|
}
|
|
if sslcert != "" {
|
|
sqlUrl += " sslcert=" + sslcert
|
|
}
|
|
if sslkey != "" {
|
|
sqlUrl += " sslkey=" + sslkey
|
|
}
|
|
if sslrootcert != "" {
|
|
sqlUrl += " sslrootcert=" + sslrootcert
|
|
}
|
|
if sslcrl != "" {
|
|
sqlUrl += " sslcrl=" + sslcrl
|
|
}
|
|
if user != "" {
|
|
sqlUrl += " user=" + user
|
|
}
|
|
adaptedSqlUrl := sqlUrl
|
|
if password != "" {
|
|
sqlUrl += " password=" + password
|
|
adaptedSqlUrl += " password=ADAPTED"
|
|
}
|
|
if database != "" {
|
|
sqlUrl += " dbname=" + database
|
|
adaptedSqlUrl += " dbname=" + database
|
|
}
|
|
if schema != "" && !pgbouncerCompatible {
|
|
sqlUrl += " search_path=" + schema
|
|
adaptedSqlUrl += " search_path=" + schema
|
|
}
|
|
db, openErr := postgres.OpenPGXDB(sqlUrl, adaptedSqlUrl, pgbouncerCompatible, maxIdle, maxOpen, maxLifetimeSeconds)
|
|
if openErr != nil {
|
|
return openErr
|
|
}
|
|
store.DB = db
|
|
|
|
if err = store.CreateTable(context.Background(), abstract_sql.DEFAULT_TABLE); err != nil {
|
|
return fmt.Errorf("init table %s: %v", abstract_sql.DEFAULT_TABLE, err)
|
|
}
|
|
|
|
return nil
|
|
}
|