server: add experimental flag for using shared buffer in transacton write
This commit is contained in:
@ -177,6 +177,10 @@ type ServerConfig struct {
|
|||||||
// Currently all etcd memory gets mlocked, but in future the flag can
|
// Currently all etcd memory gets mlocked, but in future the flag can
|
||||||
// be refined to mlock in-use area of bbolt only.
|
// be refined to mlock in-use area of bbolt only.
|
||||||
ExperimentalMemoryMlock bool `json:"experimental-memory-mlock"`
|
ExperimentalMemoryMlock bool `json:"experimental-memory-mlock"`
|
||||||
|
|
||||||
|
// ExperimentalTxnModeWriteWithSharedBuffer enable write transaction to use
|
||||||
|
// a shared buffer in its readonly check operations.
|
||||||
|
ExperimentalTxnModeWriteWithSharedBuffer bool `json:"experimental-txn-mode-write-with-shared-buffer"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// VerifyBootstrap sanity-checks the initial config for bootstrap case
|
// VerifyBootstrap sanity-checks the initial config for bootstrap case
|
||||||
|
@ -355,6 +355,9 @@ type Config struct {
|
|||||||
// Currently all etcd memory gets mlocked, but in future the flag can
|
// Currently all etcd memory gets mlocked, but in future the flag can
|
||||||
// be refined to mlock in-use area of bbolt only.
|
// be refined to mlock in-use area of bbolt only.
|
||||||
ExperimentalMemoryMlock bool `json:"experimental-memory-mlock"`
|
ExperimentalMemoryMlock bool `json:"experimental-memory-mlock"`
|
||||||
|
|
||||||
|
// ExperimentalTxnModeWriteWithSharedBuffer enables write transaction to use a shared buffer in its readonly check operations.
|
||||||
|
ExperimentalTxnModeWriteWithSharedBuffer bool `json:"experimental-txn-mode-write-with-shared-buffer"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// configYAML holds the config suitable for yaml parsing
|
// configYAML holds the config suitable for yaml parsing
|
||||||
@ -446,6 +449,7 @@ func NewConfig() *Config {
|
|||||||
|
|
||||||
ExperimentalDowngradeCheckTime: DefaultDowngradeCheckTime,
|
ExperimentalDowngradeCheckTime: DefaultDowngradeCheckTime,
|
||||||
ExperimentalMemoryMlock: false,
|
ExperimentalMemoryMlock: false,
|
||||||
|
ExperimentalTxnModeWriteWithSharedBuffer: true,
|
||||||
}
|
}
|
||||||
cfg.InitialCluster = cfg.InitialClusterFromName(cfg.Name)
|
cfg.InitialCluster = cfg.InitialClusterFromName(cfg.Name)
|
||||||
return cfg
|
return cfg
|
||||||
|
@ -213,6 +213,7 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) {
|
|||||||
DowngradeCheckTime: cfg.ExperimentalDowngradeCheckTime,
|
DowngradeCheckTime: cfg.ExperimentalDowngradeCheckTime,
|
||||||
WarningApplyDuration: cfg.ExperimentalWarningApplyDuration,
|
WarningApplyDuration: cfg.ExperimentalWarningApplyDuration,
|
||||||
ExperimentalMemoryMlock: cfg.ExperimentalMemoryMlock,
|
ExperimentalMemoryMlock: cfg.ExperimentalMemoryMlock,
|
||||||
|
ExperimentalTxnModeWriteWithSharedBuffer: cfg.ExperimentalTxnModeWriteWithSharedBuffer,
|
||||||
}
|
}
|
||||||
print(e.cfg.logger, *cfg, srvcfg, memberInitialized)
|
print(e.cfg.logger, *cfg, srvcfg, memberInitialized)
|
||||||
if e.Server, err = etcdserver.NewServer(srvcfg); err != nil {
|
if e.Server, err = etcdserver.NewServer(srvcfg); err != nil {
|
||||||
|
@ -267,6 +267,7 @@ func newConfig() *config {
|
|||||||
fs.DurationVar(&cfg.ec.ExperimentalDowngradeCheckTime, "experimental-downgrade-check-time", cfg.ec.ExperimentalDowngradeCheckTime, "Duration of time between two downgrade status check.")
|
fs.DurationVar(&cfg.ec.ExperimentalDowngradeCheckTime, "experimental-downgrade-check-time", cfg.ec.ExperimentalDowngradeCheckTime, "Duration of time between two downgrade status check.")
|
||||||
fs.DurationVar(&cfg.ec.ExperimentalWarningApplyDuration, "experimental-warning-apply-duration", cfg.ec.ExperimentalWarningApplyDuration, "Time duration after which a warning is generated if request takes more time.")
|
fs.DurationVar(&cfg.ec.ExperimentalWarningApplyDuration, "experimental-warning-apply-duration", cfg.ec.ExperimentalWarningApplyDuration, "Time duration after which a warning is generated if request takes more time.")
|
||||||
fs.BoolVar(&cfg.ec.ExperimentalMemoryMlock, "experimental-memory-mlock", cfg.ec.ExperimentalMemoryMlock, "Enable to enforce etcd pages (in particular bbolt) to stay in RAM.")
|
fs.BoolVar(&cfg.ec.ExperimentalMemoryMlock, "experimental-memory-mlock", cfg.ec.ExperimentalMemoryMlock, "Enable to enforce etcd pages (in particular bbolt) to stay in RAM.")
|
||||||
|
fs.BoolVar(&cfg.ec.ExperimentalTxnModeWriteWithSharedBuffer, "experimental-txn-mode-write-with-shared-buffer", true, "Enable the write transaction to use a shared buffer in its readonly check operations.")
|
||||||
|
|
||||||
// unsafe
|
// unsafe
|
||||||
fs.BoolVar(&cfg.ec.UnsafeNoFsync, "unsafe-no-fsync", false, "Disables fsync, unsafe, will cause data loss.")
|
fs.BoolVar(&cfg.ec.UnsafeNoFsync, "unsafe-no-fsync", false, "Disables fsync, unsafe, will cause data loss.")
|
||||||
|
@ -220,6 +220,8 @@ Experimental feature:
|
|||||||
Duration of periodical watch progress notification.
|
Duration of periodical watch progress notification.
|
||||||
--experimental-warning-apply-duration '100ms'
|
--experimental-warning-apply-duration '100ms'
|
||||||
Warning is generated if requests take more than this duration.
|
Warning is generated if requests take more than this duration.
|
||||||
|
--experimental-txn-mode-write-with-shared-buffer 'true'
|
||||||
|
Enable the write transaction to use a shared buffer in its readonly check operations.
|
||||||
|
|
||||||
Unsafe feature:
|
Unsafe feature:
|
||||||
--force-new-cluster 'false'
|
--force-new-cluster 'false'
|
||||||
|
@ -438,7 +438,7 @@ func (a *applierV3backend) Txn(ctx context.Context, rt *pb.TxnRequest) (*pb.TxnR
|
|||||||
// When the transaction contains write operations, we use ReadTx instead of
|
// When the transaction contains write operations, we use ReadTx instead of
|
||||||
// ConcurrentReadTx to avoid extra overhead of copying buffer.
|
// ConcurrentReadTx to avoid extra overhead of copying buffer.
|
||||||
var txn mvcc.TxnWrite
|
var txn mvcc.TxnWrite
|
||||||
if isWrite {
|
if isWrite && a.s.Cfg.ExperimentalTxnModeWriteWithSharedBuffer {
|
||||||
txn = mvcc.NewReadOnlyTxnWrite(a.s.KV().Read(mvcc.SharedBufReadTxMode, trace))
|
txn = mvcc.NewReadOnlyTxnWrite(a.s.KV().Read(mvcc.SharedBufReadTxMode, trace))
|
||||||
} else {
|
} else {
|
||||||
txn = mvcc.NewReadOnlyTxnWrite(a.s.KV().Read(mvcc.ConcurrentReadTxMode, trace))
|
txn = mvcc.NewReadOnlyTxnWrite(a.s.KV().Read(mvcc.ConcurrentReadTxMode, trace))
|
||||||
|
Reference in New Issue
Block a user