From 8c4561b8da0b0cd93629b23c92afe8f67ef031c9 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 18 Sep 2023 13:47:03 -0700 Subject: [PATCH] add all missing go.mod for debugging tools (#18049) --- .dockerignore | 11 +++++-- .gitignore | 5 +-- Makefile | 1 + docs/debugging/build.sh | 6 ++++ docs/debugging/pprofgoparser/go.mod | 3 ++ docs/debugging/reorder-disks/go.mod | 2 +- docs/debugging/reorder-disks/go.sum | 4 +-- docs/debugging/s3-verify/go.mod | 24 ++++++++++++++ docs/debugging/s3-verify/go.sum | 51 +++++++++++++++++++++++++++++ docs/distributed/decom.sh | 5 +-- 10 files changed, 103 insertions(+), 9 deletions(-) create mode 100755 docs/debugging/build.sh create mode 100644 docs/debugging/pprofgoparser/go.mod create mode 100644 docs/debugging/s3-verify/go.mod create mode 100644 docs/debugging/s3-verify/go.sum diff --git a/.dockerignore b/.dockerignore index f614e0154..e48fa8233 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,10 +1,17 @@ .git .github -docs default.etcd *.gz *.tar.gz *.bzip2 *.zip browser/node_modules -node_modules \ No newline at end of file +node_modules +docs/debugging/s3-verify/s3-verify +docs/debugging/xl-meta/xl-meta +docs/debugging/s3-check-md5/s3-check-md5 +docs/debugging/hash-set/hash-set +docs/debugging/healing-bin/healing-bin +docs/debugging/inspect/inspect +docs/debugging/pprofgoparser/pprofgoparser +docs/debugging/reorder-disks/reorder-disks diff --git a/.gitignore b/.gitignore index 433f5cd4a..5d277b10d 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,8 @@ minio.RELEASE* mc nancy inspects/* +.bin/ +*.gz docs/debugging/s3-verify/s3-verify docs/debugging/xl-meta/xl-meta docs/debugging/s3-check-md5/s3-check-md5 @@ -39,5 +41,4 @@ docs/debugging/hash-set/hash-set docs/debugging/healing-bin/healing-bin docs/debugging/inspect/inspect docs/debugging/pprofgoparser/pprofgoparser -.bin/ -*.gz \ No newline at end of file +docs/debugging/reorder-disks/reorder-disks diff --git a/Makefile b/Makefile index 88564d90c..4a0b7dae0 100644 --- a/Makefile +++ b/Makefile @@ -131,6 +131,7 @@ verify-healing-inconsistent-versions: ## verify resolving inconsistent versions build: checks ## builds minio to $(PWD) @echo "Building minio binary to './minio'" @CGO_ENABLED=0 go build -tags kqueue -trimpath --ldflags "$(LDFLAGS)" -o $(PWD)/minio 1>/dev/null + @(env bash $(PWD)/docs/debugging/build.sh) hotfix-vars: $(eval LDFLAGS := $(shell MINIO_RELEASE="RELEASE" MINIO_HOTFIX="hotfix.$(shell git rev-parse --short HEAD)" go run buildscripts/gen-ldflags.go $(shell git describe --tags --abbrev=0 | \ diff --git a/docs/debugging/build.sh b/docs/debugging/build.sh new file mode 100755 index 000000000..734c31bc0 --- /dev/null +++ b/docs/debugging/build.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +export CGO_ENABLED=0 +for dir in docs/debugging/*/; do + go build -C ${dir} -v +done diff --git a/docs/debugging/pprofgoparser/go.mod b/docs/debugging/pprofgoparser/go.mod new file mode 100644 index 000000000..de77f00ab --- /dev/null +++ b/docs/debugging/pprofgoparser/go.mod @@ -0,0 +1,3 @@ +module github.com/minio/minio/docs/debugging/pprofgoparser + +go 1.21.1 diff --git a/docs/debugging/reorder-disks/go.mod b/docs/debugging/reorder-disks/go.mod index 7169e7ecd..f31e4f8ff 100644 --- a/docs/debugging/reorder-disks/go.mod +++ b/docs/debugging/reorder-disks/go.mod @@ -2,4 +2,4 @@ module github.com/minio/minio/docs/debugging/reorder-disks go 1.19 -require github.com/minio/pkg v1.6.4 +require github.com/minio/pkg/v2 v2.0.1 diff --git a/docs/debugging/reorder-disks/go.sum b/docs/debugging/reorder-disks/go.sum index 5f4dc09be..59aed56db 100644 --- a/docs/debugging/reorder-disks/go.sum +++ b/docs/debugging/reorder-disks/go.sum @@ -1,2 +1,2 @@ -github.com/minio/pkg v1.6.4 h1:k6XlhyJ8zOn90PI4csuMeePx7BQrcX1jorKriR5J2fo= -github.com/minio/pkg v1.6.4/go.mod h1:0iX1IuJGSCnMvIvrEJauk1GgQSX9JdU6Kh0P3EQRGkI= +github.com/minio/pkg/v2 v2.0.1 h1:MI3xMGCxoN5EEBRp98uEU5J0LlaF+8fLPtL8oHTHLX0= +github.com/minio/pkg/v2 v2.0.1/go.mod h1:6xTAr5M9yobpUroXAAaTrGJ9fhOZIqKYOT0I87u2yZ4= diff --git a/docs/debugging/s3-verify/go.mod b/docs/debugging/s3-verify/go.mod new file mode 100644 index 000000000..44c642af5 --- /dev/null +++ b/docs/debugging/s3-verify/go.mod @@ -0,0 +1,24 @@ +module github.com/minio/minio/docs/debugging/s3-verify + +go 1.21.1 + +require github.com/minio/minio-go/v7 v7.0.63 + +require ( + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/compress v1.16.7 // indirect + github.com/klauspost/cpuid/v2 v2.2.5 // indirect + github.com/minio/md5-simd v1.1.2 // indirect + github.com/minio/sha256-simd v1.0.1 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/rs/xid v1.5.0 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect + golang.org/x/crypto v0.12.0 // indirect + golang.org/x/net v0.14.0 // indirect + golang.org/x/sys v0.11.0 // indirect + golang.org/x/text v0.12.0 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect +) diff --git a/docs/debugging/s3-verify/go.sum b/docs/debugging/s3-verify/go.sum new file mode 100644 index 000000000..cb6f7a2bd --- /dev/null +++ b/docs/debugging/s3-verify/go.sum @@ -0,0 +1,51 @@ +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= +github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= +github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= +github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= +github.com/minio/minio-go/v7 v7.0.63 h1:GbZ2oCvaUdgT5640WJOpyDhhDxvknAJU2/T3yurwcbQ= +github.com/minio/minio-go/v7 v7.0.63/go.mod h1:Q6X7Qjb7WMhvG65qKf4gUgA5XaiSox74kR1uAEjxRS4= +github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM= +github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= +github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= +golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= +golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/docs/distributed/decom.sh b/docs/distributed/decom.sh index 8a2526bbf..5dba69195 100755 --- a/docs/distributed/decom.sh +++ b/docs/distributed/decom.sh @@ -49,6 +49,7 @@ policy_count=$(./mc admin policy list myminio/ | wc -l) ## create a warm tier instance (minio server /tmp/xltier/{1...4}/disk{0...1} --address :9001 2>&1 >/dev/null) & sleep 10 + export MC_HOST_mytier="http://minioadmin:minioadmin@localhost:9001/" ./mc mb -l myminio/bucket2 @@ -71,7 +72,7 @@ kill $pid (minio server /tmp/xl/{1...10}/disk{0...1} /tmp/xl/{11...30}/disk{0...3} 2>&1 >/tmp/expanded.log) & pid=$! -sleep 10 +sleep 30 expanded_user_count=$(./mc admin user list myminio/ | wc -l) expanded_policy_count=$(./mc admin policy list myminio/ | wc -l) @@ -110,7 +111,7 @@ kill $pid (minio server /tmp/xl/{11...30}/disk{0...3} 2>&1 >/dev/null) & pid=$! -sleep 10 +sleep 20 decom_user_count=$(./mc admin user list myminio/ | wc -l) decom_policy_count=$(./mc admin policy list myminio/ | wc -l)