From b2296383483cde9c6bace57f2e90d99718893a31 Mon Sep 17 00:00:00 2001 From: lesovsky Date: Tue, 23 Jun 2020 19:20:59 +0500 Subject: [PATCH] Rename 'idle xacts' to plural form. --- app/app.go | 4 ++-- app/cmd/main.go | 32 ++++++++++++++++---------------- app/config.go | 16 ++++++++-------- app/idle_xacts.go | 4 ++-- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app/app.go b/app/app.go index 94326d0..431db8a 100644 --- a/app/app.go +++ b/app/app.go @@ -9,12 +9,12 @@ import ( func Start(ctx context.Context, c *Config) error { var wg sync.WaitGroup - if c.IdleXact { + if c.IdleXacts { wg.Add(1) go func() { defer wg.Done() - err := runIdleXactWorkload(ctx, c) + err := runIdleXactsWorkload(ctx, c) if err != nil { log.Errorf("idle transactions workload failed: %s", err) } diff --git a/app/cmd/main.go b/app/cmd/main.go index 7c25745..b7e3b48 100644 --- a/app/cmd/main.go +++ b/app/cmd/main.go @@ -17,15 +17,15 @@ var ( func main() { var ( - showVersion = kingpin.Flag("version", "show version and exit").Default().Bool() - logLevel = kingpin.Flag("log-level", "set log level: debug, info, warn, error").Default("warn").Envar("NOISIA_LOG_LEVEL").String() - postgresConninfo = kingpin.Flag("conninfo", "Postgres connection string (DSN or URL), must be specified explicitly").Default("").Envar("NOISIA_POSTGRES_CONNINFO").String() - jobs = kingpin.Flag("jobs", "Run workload with specified number of workers").Default("1").Envar("NOISIA_JOBS").Uint16() - idleXact = kingpin.Flag("idle-xact", "Run idle transactions workload").Default("false").Envar("NOISIA_IDLE_XACT").Bool() - idleXactNaptimeMin = kingpin.Flag("idle-xact.naptime-min", "Min transactions naptime, in seconds").Default("5").Envar("NOISIA_IDLE_XACT_NAPTIME_MIN").Int() - idleXactNaptimeMax = kingpin.Flag("idle-xact.naptime-max", "Max transactions naptime, in seconds").Default("20").Envar("NOISIA_IDLE_XACT_NAPTIME_MAX").Int() - rollbacks = kingpin.Flag("rollbacks", "Run rollbacks workload").Default("false").Envar("NOISIA_ROLLBACKS").Bool() - rollbacksRate = kingpin.Flag("rollbacks.rate", "Number of transactions per second (per worker)").Default("10").Envar("NOISIA_ROLLBACKS_RATE").Int() + showVersion = kingpin.Flag("version", "show version and exit").Default().Bool() + logLevel = kingpin.Flag("log-level", "set log level: debug, info, warn, error").Default("info").Envar("NOISIA_LOG_LEVEL").String() + postgresConninfo = kingpin.Flag("conninfo", "Postgres connection string (DSN or URL), must be specified explicitly").Default("").Envar("NOISIA_POSTGRES_CONNINFO").String() + jobs = kingpin.Flag("jobs", "Run workload with specified number of workers").Default("1").Envar("NOISIA_JOBS").Uint16() + idleXacts = kingpin.Flag("idle-xacts", "Run idle transactions workload").Default("false").Envar("NOISIA_IDLE_XACTS").Bool() + idleXactsNaptimeMin = kingpin.Flag("idle-xacts.naptime-min", "Min transactions naptime, in seconds").Default("5").Envar("NOISIA_IDLE_XACTS_NAPTIME_MIN").Int() + idleXactsNaptimeMax = kingpin.Flag("idle-xacts.naptime-max", "Max transactions naptime, in seconds").Default("20").Envar("NOISIA_IDLE_XACTS_NAPTIME_MAX").Int() + rollbacks = kingpin.Flag("rollbacks", "Run rollbacks workload").Default("false").Envar("NOISIA_ROLLBACKS").Bool() + rollbacksRate = kingpin.Flag("rollbacks.rate", "Number of transactions per second (per worker)").Default("10").Envar("NOISIA_ROLLBACKS_RATE").Int() ) kingpin.Parse() log.SetLevel(*logLevel) @@ -36,13 +36,13 @@ func main() { } config := &app.Config{ - PostgresConninfo: *postgresConninfo, - Jobs: *jobs, - IdleXact: *idleXact, - IdleXactNaptimeMin: *idleXactNaptimeMin, - IdleXactNaptimeMax: *idleXactNaptimeMax, - Rollbacks: *rollbacks, - RollbacksRate: *rollbacksRate, + PostgresConninfo: *postgresConninfo, + Jobs: *jobs, + IdleXacts: *idleXacts, + IdleXactsNaptimeMin: *idleXactsNaptimeMin, + IdleXactsNaptimeMax: *idleXactsNaptimeMax, + Rollbacks: *rollbacks, + RollbacksRate: *rollbacksRate, } if err := config.Validate(); err != nil { diff --git a/app/config.go b/app/config.go index 3d959d2..85155c7 100644 --- a/app/config.go +++ b/app/config.go @@ -5,13 +5,13 @@ import ( ) type Config struct { - PostgresConninfo string - Jobs uint16 // max 65535 - IdleXact bool - IdleXactNaptimeMin int - IdleXactNaptimeMax int - Rollbacks bool - RollbacksRate int + PostgresConninfo string + Jobs uint16 // max 65535 + IdleXacts bool + IdleXactsNaptimeMin int + IdleXactsNaptimeMax int + Rollbacks bool + RollbacksRate int } func (c *Config) Validate() error { @@ -19,7 +19,7 @@ func (c *Config) Validate() error { return errors.New("'conninfo' is not specified") } - if c.IdleXactNaptimeMin < 1 || c.IdleXactNaptimeMin > c.IdleXactNaptimeMax { + if c.IdleXactsNaptimeMin < 1 || c.IdleXactsNaptimeMin > c.IdleXactsNaptimeMax { return errors.New("wrong 'idle-xact.naptime-min' or 'idle-xact.naptime-max' specified") } diff --git a/app/idle_xacts.go b/app/idle_xacts.go index c8b425d..93a3247 100644 --- a/app/idle_xacts.go +++ b/app/idle_xacts.go @@ -8,7 +8,7 @@ import ( "time" ) -func runIdleXactWorkload(ctx context.Context, config *Config) error { +func runIdleXactsWorkload(ctx context.Context, config *Config) error { log.Infoln("Starting idle transactions workload") pool, err := pgxpool.Connect(context.Background(), config.PostgresConninfo) @@ -24,7 +24,7 @@ func runIdleXactWorkload(ctx context.Context, config *Config) error { // run workers only when it's possible to write into channel (channel is limited by number of jobs) case guard <- struct{}{}: go func() { - naptime := time.Duration(rand.Intn(config.IdleXactNaptimeMax-config.IdleXactNaptimeMin)+config.IdleXactNaptimeMin) * time.Second + naptime := time.Duration(rand.Intn(config.IdleXactsNaptimeMax-config.IdleXactsNaptimeMin)+config.IdleXactsNaptimeMin) * time.Second log.Debugln("starting xact with naptime %s", naptime) err := startSingleIdleXact(context.Background(), pool, naptime)