github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't export functions not needed outside the etcd package 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/8439/head
Brad Davidson 2023-09-21 18:48:21 +00:00 committed by Brad Davidson
parent a3c52d60a5
commit 890645924f
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pkg/etcd/etcd.go
View File

@ -167,7 +167,7 @@ func (e *ETCD) EndpointName() string {
func (e *ETCD) SetControlConfig(ctx context.Context, config *config.Control) error { func (e *ETCD) SetControlConfig(ctx context.Context, config *config.Control) error {
e.config = config e.config = config
client, err := GetClient(ctx, e.config) client, err := getClient(ctx, e.config)
if err != nil { if err != nil {
return err return err
} }
@ -242,26 +242,26 @@ func (e *ETCD) Test(ctx context.Context) error {
return &MembershipError{Members: memberNameUrls, Self: e.name + "=" + e.peerURL()} return &MembershipError{Members: memberNameUrls, Self: e.name + "=" + e.peerURL()}
} }
// DBDir returns the path to dataDir/db/etcd // dbDir returns the path to dataDir/db/etcd
func DBDir(config *config.Control) string { func dbDir(config *config.Control) string {
return filepath.Join(config.DataDir, "db", "etcd") return filepath.Join(config.DataDir, "db", "etcd")
} }
// walDir returns the path to etcdDBDir/member/wal // walDir returns the path to etcddbDir/member/wal
func walDir(config *config.Control) string { func walDir(config *config.Control) string {
return filepath.Join(DBDir(config), "member", "wal") return filepath.Join(dbDir(config), "member", "wal")
} }
func sqliteFile(config *config.Control) string { func sqliteFile(config *config.Control) string {
return filepath.Join(config.DataDir, "db", "state.db") return filepath.Join(config.DataDir, "db", "state.db")
} }
// nameFile returns the path to etcdDBDir/name. // nameFile returns the path to etcddbDir/name.
func nameFile(config *config.Control) string { func nameFile(config *config.Control) string {
return filepath.Join(DBDir(config), "name") return filepath.Join(dbDir(config), "name")
} }
// ResetFile returns the path to etcdDBDir/reset-flag. // ResetFile returns the path to etcddbDir/reset-flag.
func ResetFile(config *config.Control) string { func ResetFile(config *config.Control) string {
return filepath.Join(config.DataDir, "db", "reset-flag") return filepath.Join(config.DataDir, "db", "reset-flag")
} }
@ -389,7 +389,7 @@ func (e *ETCD) Start(ctx context.Context, clientAccessInfo *clientaccess.Info) e
if isInitialized { if isInitialized {
//check etcd dir permission //check etcd dir permission
etcdDir := DBDir(e.config) etcdDir := dbDir(e.config)
info, err := os.Stat(etcdDir) info, err := os.Stat(etcdDir)
if err != nil { if err != nil {
return err return err
@ -455,7 +455,7 @@ func (e *ETCD) join(ctx context.Context, clientAccessInfo *clientaccess.Info) er
return err return err
} }
client, err := GetClient(clientCtx, e.config, clientURLs...) client, err := getClient(clientCtx, e.config, clientURLs...)
if err != nil { if err != nil {
return err return err
} }
@ -520,7 +520,7 @@ func (e *ETCD) join(ctx context.Context, clientAccessInfo *clientaccess.Info) er
func (e *ETCD) Register(ctx context.Context, config *config.Control, handler http.Handler) (http.Handler, error) { func (e *ETCD) Register(ctx context.Context, config *config.Control, handler http.Handler) (http.Handler, error) {
e.config = config e.config = config
client, err := GetClient(ctx, e.config) client, err := getClient(ctx, e.config)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -560,10 +560,10 @@ func (e *ETCD) Register(ctx context.Context, config *config.Control, handler htt
// Tombstone file checking is unnecessary if we're not running etcd. // Tombstone file checking is unnecessary if we're not running etcd.
if !e.config.DisableETCD { if !e.config.DisableETCD {
tombstoneFile := filepath.Join(DBDir(e.config), "tombstone") tombstoneFile := filepath.Join(dbDir(e.config), "tombstone")
if _, err := os.Stat(tombstoneFile); err == nil { if _, err := os.Stat(tombstoneFile); err == nil {
logrus.Infof("tombstone file has been detected, removing data dir to rejoin the cluster") logrus.Infof("tombstone file has been detected, removing data dir to rejoin the cluster")
if _, err := backupDirWithRetention(DBDir(e.config), maxBackupRetention); err != nil { if _, err := backupDirWithRetention(dbDir(e.config), maxBackupRetention); err != nil {
return nil, err return nil, err
} }
} }
@ -631,12 +631,12 @@ func (e *ETCD) infoHandler() http.Handler {
}) })
} }
// GetClient returns an etcd client connected to the specified endpoints. // getClient returns an etcd client connected to the specified endpoints.
// If no endpoints are provided, endpoints are retrieved from the provided runtime config. // If no endpoints are provided, endpoints are retrieved from the provided runtime config.
// If the runtime config does not list any endpoints, the default endpoint is used. // If the runtime config does not list any endpoints, the default endpoint is used.
// The returned client should be closed when no longer needed, in order to avoid leaking GRPC // The returned client should be closed when no longer needed, in order to avoid leaking GRPC
// client goroutines. // client goroutines.
func GetClient(ctx context.Context, control *config.Control, endpoints ...string) (*clientv3.Client, error) { func getClient(ctx context.Context, control *config.Control, endpoints ...string) (*clientv3.Client, error) {
cfg, err := getClientConfig(ctx, control, endpoints...) cfg, err := getClientConfig(ctx, control, endpoints...)
if err != nil { if err != nil {
return nil, err return nil, err
@ -761,7 +761,7 @@ func (e *ETCD) migrateFromSQLite(ctx context.Context) error {
} }
defer sqliteClient.Close() defer sqliteClient.Close()
etcdClient, err := GetClient(ctx, e.config) etcdClient, err := getClient(ctx, e.config)
if err != nil { if err != nil {
return err return err
} }
@ -853,7 +853,7 @@ func (e *ETCD) cluster(ctx context.Context, reset bool, options executor.Initial
ListenMetricsURLs: e.listenMetricsURLs(reset), ListenMetricsURLs: e.listenMetricsURLs(reset),
ListenPeerURLs: e.listenPeerURLs(reset), ListenPeerURLs: e.listenPeerURLs(reset),
AdvertiseClientURLs: e.advertiseClientURLs(reset), AdvertiseClientURLs: e.advertiseClientURLs(reset),
DataDir: DBDir(e.config), DataDir: dbDir(e.config),
ServerTrust: executor.ServerTrust{ ServerTrust: executor.ServerTrust{
CertFile: e.config.Runtime.ServerETCDCert, CertFile: e.config.Runtime.ServerETCDCert,
KeyFile: e.config.Runtime.ServerETCDKey, KeyFile: e.config.Runtime.ServerETCDKey,
@ -877,7 +877,7 @@ func (e *ETCD) cluster(ctx context.Context, reset bool, options executor.Initial
} }
func (e *ETCD) StartEmbeddedTemporary(ctx context.Context) error { func (e *ETCD) StartEmbeddedTemporary(ctx context.Context) error {
etcdDataDir := DBDir(e.config) etcdDataDir := dbDir(e.config)
tmpDataDir := etcdDataDir + "-tmp" tmpDataDir := etcdDataDir + "-tmp"
os.RemoveAll(tmpDataDir) os.RemoveAll(tmpDataDir)
@ -1222,7 +1222,7 @@ func (e *ETCD) preSnapshotSetup(ctx context.Context, config *config.Control) err
if e.config == nil { if e.config == nil {
e.config = config e.config = config
} }
client, err := GetClient(ctx, e.config) client, err := getClient(ctx, e.config)
if err != nil { if err != nil {
return err return err
} }
@ -1990,7 +1990,7 @@ func (e *ETCD) setSnapshotFunction(ctx context.Context) {
// completion. // completion.
func (e *ETCD) Restore(ctx context.Context) error { func (e *ETCD) Restore(ctx context.Context) error {
// check the old etcd data dir // check the old etcd data dir
oldDataDir := DBDir(e.config) + "-old-" + strconv.Itoa(int(time.Now().Unix())) oldDataDir := dbDir(e.config) + "-old-" + strconv.Itoa(int(time.Now().Unix()))
if e.config.ClusterResetRestorePath == "" { if e.config.ClusterResetRestorePath == "" {
return errors.New("no etcd restore path was specified") return errors.New("no etcd restore path was specified")
} }
@ -2017,7 +2017,7 @@ func (e *ETCD) Restore(ctx context.Context) error {
} }
// move the data directory to a temp path // move the data directory to a temp path
if err := os.Rename(DBDir(e.config), oldDataDir); err != nil { if err := os.Rename(dbDir(e.config), oldDataDir); err != nil {
return err return err
} }
@ -2031,7 +2031,7 @@ func (e *ETCD) Restore(ctx context.Context) error {
return snapshot.NewV3(lg).Restore(snapshot.RestoreConfig{ return snapshot.NewV3(lg).Restore(snapshot.RestoreConfig{
SnapshotPath: restorePath, SnapshotPath: restorePath,
Name: e.name, Name: e.name,
OutputDataDir: DBDir(e.config), OutputDataDir: dbDir(e.config),
OutputWALDir: walDir(e.config), OutputWALDir: walDir(e.config),
PeerURLs: []string{e.peerURL()}, PeerURLs: []string{e.peerURL()},
InitialCluster: e.name + "=" + e.peerURL(), InitialCluster: e.name + "=" + e.peerURL(),
@ -2127,7 +2127,7 @@ func backupDirWithRetention(dir string, maxBackupRetention int) (string, error)
// GetAPIServerURLsFromETCD will try to fetch the version.Program/apiaddresses key from etcd // GetAPIServerURLsFromETCD will try to fetch the version.Program/apiaddresses key from etcd
// and unmarshal it to a list of apiserver endpoints. // and unmarshal it to a list of apiserver endpoints.
func GetAPIServerURLsFromETCD(ctx context.Context, cfg *config.Control) ([]string, error) { func GetAPIServerURLsFromETCD(ctx context.Context, cfg *config.Control) ([]string, error) {
cl, err := GetClient(ctx, cfg) cl, err := getClient(ctx, cfg)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -2181,8 +2181,8 @@ func (e *ETCD) RemoveSelf(ctx context.Context) error {
} }
// backup the data dir to avoid issues when re-enabling etcd // backup the data dir to avoid issues when re-enabling etcd
oldDataDir := DBDir(e.config) + "-old-" + strconv.Itoa(int(time.Now().Unix())) oldDataDir := dbDir(e.config) + "-old-" + strconv.Itoa(int(time.Now().Unix()))
// move the data directory to a temp path // move the data directory to a temp path
return os.Rename(DBDir(e.config), oldDataDir) return os.Rename(dbDir(e.config), oldDataDir)
} }

12
pkg/etcd/etcd_test.go
View File

@ -170,17 +170,17 @@ func Test_UnitETCD_Register(t *testing.T) {
if err := testutil.GenerateRuntime(cnf); err != nil { if err := testutil.GenerateRuntime(cnf); err != nil {
return err return err
} }
if err := os.MkdirAll(DBDir(cnf), 0700); err != nil { if err := os.MkdirAll(dbDir(cnf), 0700); err != nil {
return err return err
} }
tombstoneFile := filepath.Join(DBDir(cnf), "tombstone") tombstoneFile := filepath.Join(dbDir(cnf), "tombstone")
if _, err := os.Create(tombstoneFile); err != nil { if _, err := os.Create(tombstoneFile); err != nil {
return err return err
} }
return nil return nil
}, },
teardown: func(cnf *config.Control) error { teardown: func(cnf *config.Control) error {
tombstoneFile := filepath.Join(DBDir(cnf), "tombstone") tombstoneFile := filepath.Join(dbDir(cnf), "tombstone")
os.Remove(tombstoneFile) os.Remove(tombstoneFile)
testutil.CleanupDataDir(cnf) testutil.CleanupDataDir(cnf)
return nil return nil
@ -244,7 +244,7 @@ func Test_UnitETCD_Start(t *testing.T) {
ctxInfo.ctx, ctxInfo.cancel = context.WithCancel(context.Background()) ctxInfo.ctx, ctxInfo.cancel = context.WithCancel(context.Background())
e.config.EtcdDisableSnapshots = true e.config.EtcdDisableSnapshots = true
testutil.GenerateRuntime(e.config) testutil.GenerateRuntime(e.config)
client, err := GetClient(ctxInfo.ctx, e.config) client, err := getClient(ctxInfo.ctx, e.config)
e.client = client e.client = client
return err return err
@ -275,7 +275,7 @@ func Test_UnitETCD_Start(t *testing.T) {
setup: func(e *ETCD, ctxInfo *contextInfo) error { setup: func(e *ETCD, ctxInfo *contextInfo) error {
ctxInfo.ctx, ctxInfo.cancel = context.WithCancel(context.Background()) ctxInfo.ctx, ctxInfo.cancel = context.WithCancel(context.Background())
testutil.GenerateRuntime(e.config) testutil.GenerateRuntime(e.config)
client, err := GetClient(ctxInfo.ctx, e.config) client, err := getClient(ctxInfo.ctx, e.config)
e.client = client e.client = client
return err return err
@ -308,7 +308,7 @@ func Test_UnitETCD_Start(t *testing.T) {
if err := testutil.GenerateRuntime(e.config); err != nil { if err := testutil.GenerateRuntime(e.config); err != nil {
return err return err
} }
client, err := GetClient(ctxInfo.ctx, e.config) client, err := getClient(ctxInfo.ctx, e.config)
if err != nil { if err != nil {
return err return err
} }