Skip to content

etcd: add EtcdBackendQuotaSize options #1548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swordqiu merged 1 commit into from
Jul 16, 2026
Merged

etcd: add EtcdBackendQuotaSize options #1548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/apis/onecloud/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,8 @@ type Etcd struct {
EnableTls *bool `json:"enableTls"`
// client service nodePort
ClientNodePort int `json:"clientNodePort"`
// etcd backend quota size MB
EtcdBackendQuotaSize *int64 `json:"etcdBackendQuotaSize"`
}

// Mysql describes a mysql server
Expand Down
18 changes: 11 additions & 7 deletions pkg/manager/component/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,17 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/client-go/kubernetes"

"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"

"yunion.io/x/onecloud/pkg/mcclient"

"yunion.io/x/onecloud-operator/pkg/apis/constants"
"yunion.io/x/onecloud-operator/pkg/apis/onecloud/v1alpha1"
"yunion.io/x/onecloud-operator/pkg/controller"
"yunion.io/x/onecloud-operator/pkg/manager"
"yunion.io/x/onecloud-operator/pkg/util/etcdutil"
"yunion.io/x/onecloud-operator/pkg/util/k8sutil"
"yunion.io/x/onecloud-operator/pkg/util/retryutil"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/pkg/errors"
)

type etcdManager struct {
Expand Down Expand Up @@ -103,6 +100,13 @@ func (m *etcdManager) getProductVersions() []v1alpha1.ProductVersion {
}
}

func (m *etcdManager) getEtcdBackendQuotaSize() int64 {
if m.oc.Spec.Etcd.EtcdBackendQuotaSize != nil && (*m.oc.Spec.Etcd.EtcdBackendQuotaSize*1024*1024) > etcdBackendQuotaSize {
return *m.oc.Spec.Etcd.EtcdBackendQuotaSize * 1024 * 1024
}
return etcdBackendQuotaSize
}

func (m *etcdManager) isSyncing() bool {
m.lock.Lock()
defer m.lock.Unlock()
Expand Down Expand Up @@ -249,7 +253,7 @@ func (m *etcdManager) membersDefrag() {
log.Errorf("fetch etcd status failed: %s", err)
return
}
if status.DbSize > etcdBackendQuotaSize/2 {
if status.DbSize > (m.getEtcdBackendQuotaSize() / 2) {
ctx, cancel = context.WithTimeout(context.Background(), constants.EtcdDefaultRequestTimeout)
defer cancel()
_, err = etcdcli.Compact(ctx, status.Header.Revision)
Expand Down Expand Up @@ -481,7 +485,7 @@ func (m *etcdManager) newEtcdCommand(mb *etcdutil.Member, state, token string, i
"--max-wals %d",
dataDir, mb.Name, mb.PeerURL(), mb.ListenPeerURL(), mb.ListenClientURL(),
mb.ClientURL(), strings.Join(initialCluster, ","), state,
etcdBackendQuotaSize, etcdAutoCompactionRetention, etcdMaxWALFileCount)
m.getEtcdBackendQuotaSize(), etcdAutoCompactionRetention, etcdMaxWALFileCount)
if mb.SecurePeer {
commands += fmt.Sprintf(" --peer-client-cert-auth=true --peer-trusted-ca-file=%[1]s/peer-ca.crt --peer-cert-file=%[1]s/peer.crt --peer-key-file=%[1]s/peer.key", peerTLSDir)
}
Expand Down
Loading