Browse Source

add options to scaffold

pull/2996/head
Konstantin Lebedev 3 years ago
parent
commit
f127b326bf
  1. 12
      weed/command/scaffold/filer.toml
  2. 1
      weed/filer/ydb/readme.md
  3. 12
      weed/filer/ydb/ydb_store.go

12
weed/command/scaffold/filer.toml

@ -295,12 +295,14 @@ password=""
# skip tls cert validation # skip tls cert validation
insecure_skip_verify = true insecure_skip_verify = true
[ydb]
[ydb] # https://ydb.tech/
enabled = false enabled = false
useBucketPrefix=true
dsn="grpc://localhost:2136?database=/local"
prefix="en"
poolSizeLimit=50
dsn = "grpc://localhost:2136?database=/local"
prefix = "seaweedfs"
useBucketPrefix = true # Fast Bucket Deletion
poolSizeLimit = 50
dialTimeOut = 10
# Authenticate produced with one of next environment variables: # Authenticate produced with one of next environment variables:
# YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS=<path/to/sa_key_file> — used service account key file by path # YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS=<path/to/sa_key_file> — used service account key file by path
# YDB_ANONYMOUS_CREDENTIALS="1" — used for authenticate with anonymous access. Anonymous access needs for connect to testing YDB installation # YDB_ANONYMOUS_CREDENTIALS="1" — used for authenticate with anonymous access. Anonymous access needs for connect to testing YDB installation

1
weed/filer/ydb/readme.md

@ -13,6 +13,7 @@ dsn=grpcs://ydb-ru.yandex.net:2135/?database=/ru/home/username/db
prefix="seaweedfs" prefix="seaweedfs"
useBucketPrefix=true useBucketPrefix=true
poolSizeLimit=50 poolSizeLimit=50
dialTimeOut = 10
``` ```
Authenticate produced with one of next environment variables: Authenticate produced with one of next environment variables:

12
weed/filer/ydb/ydb_store.go

@ -24,7 +24,7 @@ import (
) )
const ( const (
defaultConnectionTimeOut = 10
defaultDialTimeOut = 10
) )
var ( var (
@ -58,12 +58,12 @@ func (store *YdbStore) Initialize(configuration util.Configuration, prefix strin
configuration.GetString(prefix+"dsn"), configuration.GetString(prefix+"dsn"),
configuration.GetString(prefix+"prefix"), configuration.GetString(prefix+"prefix"),
configuration.GetBool(prefix+"useBucketPrefix"), configuration.GetBool(prefix+"useBucketPrefix"),
configuration.GetInt(prefix+"connectionTimeOut"),
configuration.GetInt(prefix+"dialTimeOut"),
configuration.GetInt(prefix+"poolSizeLimit"), configuration.GetInt(prefix+"poolSizeLimit"),
) )
} }
func (store *YdbStore) initialize(dirBuckets string, dsn string, tablePathPrefix string, useBucketPrefix bool, connectionTimeOut int, poolSizeLimit int) (err error) {
func (store *YdbStore) initialize(dirBuckets string, dsn string, tablePathPrefix string, useBucketPrefix bool, dialTimeOut int, poolSizeLimit int) (err error) {
store.dirBuckets = dirBuckets store.dirBuckets = dirBuckets
store.SupportBucketTable = useBucketPrefix store.SupportBucketTable = useBucketPrefix
if store.SupportBucketTable { if store.SupportBucketTable {
@ -72,11 +72,11 @@ func (store *YdbStore) initialize(dirBuckets string, dsn string, tablePathPrefix
store.dbs = make(map[string]bool) store.dbs = make(map[string]bool)
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
if connectionTimeOut == 0 {
connectionTimeOut = defaultConnectionTimeOut
if dialTimeOut == 0 {
dialTimeOut = defaultDialTimeOut
} }
opts := []ydb.Option{ opts := []ydb.Option{
ydb.WithDialTimeout(time.Duration(connectionTimeOut) * time.Second),
ydb.WithDialTimeout(time.Duration(dialTimeOut) * time.Second),
environ.WithEnvironCredentials(ctx), environ.WithEnvironCredentials(ctx),
} }
if poolSizeLimit > 0 { if poolSizeLimit > 0 {

Loading…
Cancel
Save