diff --git a/Changelog b/Changelog index 687930ba..c2599745 100644 --- a/Changelog +++ b/Changelog @@ -10,11 +10,11 @@ v3.4.0 * Fixed bug PT-1747: pt-online-schema-change: metadata lock can break database for rebuild_constraints * Improvement PT-1800: The environment variable PTDEBUG=1 exposes the passwords * Improvement PT-1887: pt-diskstat is not working for new kernels - * Fixed bug PT-1900: At times, pt-query-digest does not hide the parameters properly when parameter=binary + * Fixed bug PT-1900: At times, pt-query-digest does not hide the parameters properly when parameter=binary * Improvement PT-1940: ptsoc dropswap method that was rejected for Mysql 8 has been fixed with Mysql 8.0.14 * Fixed bug PT-1953: pt-summary typo: Memory mamagement. * Fixed bug PT-1959: go part of the toolkit still has the version 3.3.0 - * Fixed bug PT-1965: pt-stalk --mysql-only doesn't collect mysqladmin outputs (Thanks Sergey Kuzmichev) + * Fixed bug PT-1965: pt-stalk --mysql-only doesn't collect mysqladmin output (Thanks Sergey Kuzmichev) * Fixed bug PT-1966: Test no_drop_no_swap for the pt-online-schema-change is broken (Thanks Tsubasa Tanaka) * Fixed bug PT-1974: Support fingerprinting for --print in pt-kill * New Tool PT-1978: Add reporting on unused/redundant indexes for MongoDB by pt-mongodb-summary diff --git a/go.mod b/go.mod index d0822378..6cbbd324 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/percona/percona-toolkit -go 1.18 +go 1.17 require ( github.com/Masterminds/semver v1.4.2 @@ -9,27 +9,25 @@ require ( github.com/go-ini/ini v1.66.4 github.com/golang/mock v1.4.4 github.com/google/uuid v1.3.0 - github.com/hashicorp/go-version v1.2.1-0.20190424083514-192140e6f3e6 - github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c - github.com/kr/pretty v0.3.0 - github.com/lib/pq v1.2.0 - github.com/mattn/go-shellwords v1.0.6 - github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe - github.com/pborman/getopt v0.0.0-20190409184431-ee0cd42419d3 - github.com/percona/go-mysql v0.0.0-20190903141930-197f4ad8db8d + github.com/hashicorp/go-version v1.4.0 + github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef + github.com/lib/pq v1.10.4 + github.com/mattn/go-shellwords v1.0.12 + github.com/montanaflynn/stats v0.6.6 + github.com/pborman/getopt v1.1.0 + github.com/percona/go-mysql v0.0.0-20210427141028-73d29c6da78c github.com/pkg/errors v0.9.1 - github.com/shirou/gopsutil v2.20.8+incompatible - github.com/sirupsen/logrus v1.6.0 - github.com/stretchr/testify v1.7.1 - go.mongodb.org/mongo-driver v1.8.4 - golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f + github.com/shirou/gopsutil v3.21.11+incompatible + github.com/sirupsen/logrus v1.8.1 + github.com/stretchr/testify v1.7.0 + go.mongodb.org/mongo-driver v1.9.0 + golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 k8s.io/api v0.23.5 ) require ( - github.com/AlekSi/pointer v1.2.0 // indirect - github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect + github.com/StackExchange/wmi v1.2.1 // indirect github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -58,7 +56,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.2 // indirect golang.org/x/net v0.0.0-20220403103023-749bd193bc2b // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64 // indirect + golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect diff --git a/go.sum b/go.sum index 37bcaf95..70c1e32e 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,4 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w= -github.com/AlekSi/pointer v1.2.0/go.mod h1:gZGfd3dpW4vEc/UlyfKKi1roIqcCgwOIvb0tSNSBle0= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= @@ -184,12 +182,9 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -283,8 +278,6 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= @@ -312,8 +305,8 @@ github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPR github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.mongodb.org/mongo-driver v1.7.1 h1:jwqTeEM3x6L9xDXrCxN0Hbg7vdGfPBOTIkr0+/LYZDA= go.mongodb.org/mongo-driver v1.7.1/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8= -go.mongodb.org/mongo-driver v1.8.4 h1:NruvZPPL0PBcRJKmbswoWSrmHeUvzdxA3GCPfD/NEOA= -go.mongodb.org/mongo-driver v1.8.4/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= +go.mongodb.org/mongo-driver v1.9.0 h1:f3aLGJvQmBl8d9S40IL+jEyBC6hfLPbJjv9t5hEM9ck= +go.mongodb.org/mongo-driver v1.9.0/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= @@ -321,7 +314,6 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f h1:aZp0e2vLN4MToVqnjNEYEtrEA8RH8U8FN1CU7JgqsPU= golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 h1:tkVvjkPTB7pnW3jnid7kNyAMPVWllTNOf/qKDze4p9o= golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -390,8 +382,8 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 h1:JWgyZ1qgdTaF3N3oxC+MdTV7q golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64 h1:D1v9ucDTYBtbz5vNuBbAhIMAGhQhJ6Ym5ah3maMVNX4= -golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12 h1:QyVthZKMsyaQwBTJE04jdNN0Pp5Fn9Qga0mrgxyERQM= +golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= @@ -453,7 +445,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= @@ -474,7 +465,6 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/src/go/pt-mongodb-index-check/indexes/duplicated_test.go b/src/go/pt-mongodb-index-check/indexes/duplicated_test.go index 708d7f02..cf641290 100644 --- a/src/go/pt-mongodb-index-check/indexes/duplicated_test.go +++ b/src/go/pt-mongodb-index-check/indexes/duplicated_test.go @@ -7,12 +7,13 @@ import ( "time" "github.com/AlekSi/pointer" - tu "github.com/percona/percona-toolkit/src/go/internal/testutils" "github.com/stretchr/testify/assert" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" "gopkg.in/mgo.v2/bson" + + tu "github.com/percona/percona-toolkit/src/go/internal/testutils" ) func TestDuplicateIndexes(t *testing.T) { diff --git a/src/go/pt-mongodb-index-check/indexes/unused_test.go b/src/go/pt-mongodb-index-check/indexes/unused_test.go index 861d159a..8a0ff66c 100644 --- a/src/go/pt-mongodb-index-check/indexes/unused_test.go +++ b/src/go/pt-mongodb-index-check/indexes/unused_test.go @@ -9,12 +9,13 @@ import ( "time" "github.com/AlekSi/pointer" - tu "github.com/percona/percona-toolkit/src/go/internal/testutils" "github.com/stretchr/testify/assert" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" "gopkg.in/mgo.v2/bson" + + tu "github.com/percona/percona-toolkit/src/go/internal/testutils" ) func TestUnusedIndexes(t *testing.T) { @@ -59,7 +60,12 @@ func TestUnusedIndexes(t *testing.T) { assert.NoError(t, err) } - want := []string{"idx_00", "idx_01", "idx_02"} + // Make use of idx_02: {"f4": -1} to exclude it from the results so we ensure only unused indexes + // are being listed. + _, err = database.Collection(collname).Find(ctx, primitive.M{"f4": primitive.M{"$gt": 500}}) + assert.NoError(t, err) + + want := []string{"idx_00", "idx_01"} ui, err := FindUnused(ctx, client, dbname, collname) assert.NoError(t, err) diff --git a/src/go/pt-mongodb-index-check/main.go b/src/go/pt-mongodb-index-check/main.go index 281893d2..a017b06d 100644 --- a/src/go/pt-mongodb-index-check/main.go +++ b/src/go/pt-mongodb-index-check/main.go @@ -10,14 +10,14 @@ import ( "time" "github.com/alecthomas/kong" - "github.com/percona/percona-toolkit/src/go/pt-mongodb-index-check/indexes" - "github.com/percona/percona-toolkit/src/go/pt-mongodb-index-check/templates" "github.com/pkg/errors" + log "github.com/sirupsen/logrus" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" - log "github.com/sirupsen/logrus" + "github.com/percona/percona-toolkit/src/go/pt-mongodb-index-check/indexes" + "github.com/percona/percona-toolkit/src/go/pt-mongodb-index-check/templates" ) type cmdlineArgs struct { @@ -90,12 +90,12 @@ func main() { switch kongctx.Command() { case "check-unused": - resp.Unused = append(resp.Unused, findUnused(ctx, client, args.Databases, args.Collections)...) + resp.Unused = findUnused(ctx, client, args.Databases, args.Collections) case "check-duplicates": - resp.Duplicated = append(resp.Duplicated, findDuplicated(ctx, client, args.Databases, args.Collections)...) + resp.Duplicated = findDuplicated(ctx, client, args.Databases, args.Collections) case "check-all": - resp.Unused = append(resp.Unused, findUnused(ctx, client, args.Databases, args.Collections)...) - resp.Duplicated = append(resp.Duplicated, findDuplicated(ctx, client, args.Databases, args.Collections)...) + resp.Unused = findUnused(ctx, client, args.Databases, args.Collections) + resp.Duplicated = findDuplicated(ctx, client, args.Databases, args.Collections) default: kong.DefaultHelpPrinter(kong.HelpOptions{}, kongctx) } diff --git a/src/go/pt-mongodb-query-digest/main.go b/src/go/pt-mongodb-query-digest/main.go index 564ac3b2..1e21ba5c 100644 --- a/src/go/pt-mongodb-query-digest/main.go +++ b/src/go/pt-mongodb-query-digest/main.go @@ -13,6 +13,11 @@ import ( "github.com/howeyc/gopass" "github.com/pborman/getopt" + log "github.com/sirupsen/logrus" + "go.mongodb.org/mongo-driver/bson/primitive" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/mongo/options" + "github.com/percona/percona-toolkit/src/go/lib/config" "github.com/percona/percona-toolkit/src/go/lib/versioncheck" "github.com/percona/percona-toolkit/src/go/mongolib/fingerprinter" @@ -21,10 +26,6 @@ import ( "github.com/percona/percona-toolkit/src/go/mongolib/stats" "github.com/percona/percona-toolkit/src/go/mongolib/util" "github.com/percona/percona-toolkit/src/go/pt-mongodb-query-digest/filter" - log "github.com/sirupsen/logrus" - "go.mongodb.org/mongo-driver/bson/primitive" - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/mongo/options" ) const ( diff --git a/src/go/pt-mongodb-summary/main.go b/src/go/pt-mongodb-summary/main.go index 11399278..9f341d62 100644 --- a/src/go/pt-mongodb-summary/main.go +++ b/src/go/pt-mongodb-summary/main.go @@ -19,18 +19,19 @@ import ( version "github.com/hashicorp/go-version" "github.com/howeyc/gopass" "github.com/pborman/getopt" - "github.com/percona/percona-toolkit/src/go/lib/config" - "github.com/percona/percona-toolkit/src/go/lib/versioncheck" - "github.com/percona/percona-toolkit/src/go/mongolib/proto" - "github.com/percona/percona-toolkit/src/go/mongolib/util" - "github.com/percona/percona-toolkit/src/go/pt-mongodb-summary/oplog" - "github.com/percona/percona-toolkit/src/go/pt-mongodb-summary/templates" "github.com/pkg/errors" "github.com/shirou/gopsutil/process" log "github.com/sirupsen/logrus" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" + + "github.com/percona/percona-toolkit/src/go/lib/config" + "github.com/percona/percona-toolkit/src/go/lib/versioncheck" + "github.com/percona/percona-toolkit/src/go/mongolib/proto" + "github.com/percona/percona-toolkit/src/go/mongolib/util" + "github.com/percona/percona-toolkit/src/go/pt-mongodb-summary/oplog" + "github.com/percona/percona-toolkit/src/go/pt-mongodb-summary/templates" ) const ( diff --git a/src/go/pt-mongodb-summary/main_test.go b/src/go/pt-mongodb-summary/main_test.go index 339eb6fd..9fce19da 100644 --- a/src/go/pt-mongodb-summary/main_test.go +++ b/src/go/pt-mongodb-summary/main_test.go @@ -8,6 +8,7 @@ import ( "time" "github.com/pborman/getopt" + tu "github.com/percona/percona-toolkit/src/go/internal/testutils" "github.com/percona/percona-toolkit/src/go/mongolib/proto" ) diff --git a/src/go/pt-mongodb-summary/oplog/oplog.go b/src/go/pt-mongodb-summary/oplog/oplog.go index f8807c50..27c4ca0d 100644 --- a/src/go/pt-mongodb-summary/oplog/oplog.go +++ b/src/go/pt-mongodb-summary/oplog/oplog.go @@ -6,12 +6,13 @@ import ( "sort" "time" - "github.com/percona/percona-toolkit/src/go/mongolib/proto" - "github.com/percona/percona-toolkit/src/go/mongolib/util" "github.com/pkg/errors" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" + + "github.com/percona/percona-toolkit/src/go/mongolib/proto" + "github.com/percona/percona-toolkit/src/go/mongolib/util" ) func GetOplogInfo(ctx context.Context, hostnames []string, co *options.ClientOptions) ([]proto.OplogInfo, error) { diff --git a/src/go/pt-pg-summary/main.go b/src/go/pt-pg-summary/main.go index 3289007c..8ecefdad 100644 --- a/src/go/pt-pg-summary/main.go +++ b/src/go/pt-pg-summary/main.go @@ -8,13 +8,13 @@ import ( "text/template" "github.com/alecthomas/kingpin" + _ "github.com/lib/pq" + "github.com/pkg/errors" + log "github.com/sirupsen/logrus" + "github.com/sirupsen/logrus" + "github.com/percona/percona-toolkit/src/go/lib/pginfo" "github.com/percona/percona-toolkit/src/go/pt-pg-summary/templates" - "github.com/pkg/errors" - "github.com/sirupsen/logrus" - log "github.com/sirupsen/logrus" - - _ "github.com/lib/pq" ) var ( diff --git a/src/go/pt-pg-summary/main_test.go b/src/go/pt-pg-summary/main_test.go index 6afabbc7..dca7a208 100644 --- a/src/go/pt-pg-summary/main_test.go +++ b/src/go/pt-pg-summary/main_test.go @@ -5,10 +5,10 @@ import ( "os" "testing" + "github.com/sirupsen/logrus" + "github.com/percona/percona-toolkit/src/go/lib/pginfo" "github.com/percona/percona-toolkit/src/go/pt-pg-summary/internal/tu" - - "github.com/sirupsen/logrus" ) type Test struct { diff --git a/src/go/pt-secure-collect/collect.go b/src/go/pt-secure-collect/collect.go index 148de7e6..501d2d31 100644 --- a/src/go/pt-secure-collect/collect.go +++ b/src/go/pt-secure-collect/collect.go @@ -16,10 +16,11 @@ import ( "time" shellwords "github.com/mattn/go-shellwords" - "github.com/percona/percona-toolkit/src/go/pt-secure-collect/sanitize" - "github.com/percona/percona-toolkit/src/go/pt-secure-collect/sanitize/util" "github.com/pkg/errors" log "github.com/sirupsen/logrus" + + "github.com/percona/percona-toolkit/src/go/pt-secure-collect/sanitize" + "github.com/percona/percona-toolkit/src/go/pt-secure-collect/sanitize/util" ) func collectData(opts *cliOptions) error { diff --git a/src/go/pt-secure-collect/main.go b/src/go/pt-secure-collect/main.go index ef1610c7..76ea29fd 100644 --- a/src/go/pt-secure-collect/main.go +++ b/src/go/pt-secure-collect/main.go @@ -15,8 +15,8 @@ import ( "github.com/alecthomas/kingpin" "github.com/go-ini/ini" "github.com/pkg/errors" - "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" + "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh/terminal" ) diff --git a/src/go/pt-secure-collect/sanitize.go b/src/go/pt-secure-collect/sanitize.go index deaa0b5e..719465f7 100644 --- a/src/go/pt-secure-collect/sanitize.go +++ b/src/go/pt-secure-collect/sanitize.go @@ -3,9 +3,10 @@ package main import ( "os" + "github.com/pkg/errors" + "github.com/percona/percona-toolkit/src/go/pt-secure-collect/sanitize" "github.com/percona/percona-toolkit/src/go/pt-secure-collect/sanitize/util" - "github.com/pkg/errors" ) func sanitizeFile(opts *cliOptions) error {