Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create 'datadir' package responsible for paths.

Browse Source
This commit is contained in:
Piotr Tabor
2021-04-25 14:25:24 +02:00
parent d2722ff955
commit 6f8f506cf4
5 changed files with 104 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/config/config.go
View File

@@ -25,6 +25,7 @@ import (
"go.etcd.io/etcd/client/pkg/v3/transport"
"go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/pkg/v3/netutil"
"go.etcd.io/etcd/server/v3/datadir"
bolt "go.etcd.io/bbolt"
"go.uber.org/zap"
@@ -274,13 +275,13 @@ func (c *ServerConfig) advertiseMatchesCluster() error {
return fmt.Errorf("failed to resolve %s to match --initial-cluster=%s (%v)", apStr, umap.String(), err)
}
func (c *ServerConfig) MemberDir() string { return filepath.Join(c.DataDir, "member") }
func (c *ServerConfig) MemberDir() string { return datadir.ToMemberDir(c.DataDir) }
func (c *ServerConfig) WALDir() string {
if c.DedicatedWALDir != "" {
return c.DedicatedWALDir
}
return filepath.Join(c.MemberDir(), "wal")
return datadir.ToWalDir(c.DataDir)
}
func (c *ServerConfig) SnapDir() string { return filepath.Join(c.MemberDir(), "snap") }
@@ -324,4 +325,4 @@ func (c *ServerConfig) BootstrapTimeoutEffective() time.Duration {
return time.Second
}
func (c *ServerConfig) BackendPath() string { return filepath.Join(c.SnapDir(), "db") }
func (c *ServerConfig) BackendPath() string { return datadir.ToBackendFileName(c.DataDir) }