From 9a021fa201febc7da997a054ab4d6f02ff003ec4 Mon Sep 17 00:00:00 2001 From: Alexey Kostin Date: Thu, 14 Mar 2019 18:24:12 +0300 Subject: [PATCH] Disable pool size check flag --- README.md | 2 +- flags.go | 2 ++ getosd.go | 8 +++++--- types.go | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dbb2c9e..66a4e61 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ osd.0 Avg iops: 320 Avg speed: 1.250 MB/s Total writes count: 3260 osd.1 Avg iops: 330 Avg speed: 1.289 MB/s Total writes count: 3397 Total writes (MB): 13 osd.2 Avg iops: 330 Avg speed: 1.289 MB/s Total writes count: 3381 Total writes (MB): 13 -Average iops per osd: 330 Average speed per osd: 1.289 MB/s +Average iops per osd: 330 Average speed per osd: 1.289 MB/s Total writes count: 10038 Total writes (MB): 39 Summary avg iops: 990 Summary avg speed: 3.867 MB/s ``` diff --git a/flags.go b/flags.go index fc27bed..b315156 100644 --- a/flags.go +++ b/flags.go @@ -55,6 +55,8 @@ func route() params { "Threads count on each osd") gnuflag.BoolVar(¶ms.parallel, "parallel", false, "Do test all osd in parallel mode") + gnuflag.BoolVar(¶ms.disablecheck, "disablepoolsizecheck", false, + "Do test all osd in parallel mode") gnuflag.StringVar(¶ms.cpuprofile, "cpuprofile", "", "Name of cpuprofile") gnuflag.StringVar(¶ms.memprofile, "memprofile", "", diff --git a/getosd.go b/getosd.go index 29183cb..a547f24 100644 --- a/getosd.go +++ b/getosd.go @@ -224,9 +224,11 @@ func containsPg(pgs []PlacementGroup, i int64) bool { func getOsds(cephconn *cephconnection, params params) []Device { poolinfo := getPoolSize(cephconn, params) - if poolinfo.Size != 1 { - log.Fatalf("Pool size must be 1. Current size for pool %v is %v. Don't forget that it must be useless pool (not production). Do:\n # ceph osd pool set %v min_size 1\n # ceph osd pool set %v size 1", - poolinfo.Pool, poolinfo.Size, poolinfo.Pool, poolinfo.Pool) + if params.disablecheck == false { + if poolinfo.Size != 1 { + log.Fatalf("Pool size must be 1. Current size for pool %v is %v. Don't forget that it must be useless pool (not production). Do:\n # ceph osd pool set %v min_size 1\n # ceph osd pool set %v size 1", + poolinfo.Pool, poolinfo.Size, poolinfo.Pool, poolinfo.Pool) + } } placementGroups := getPgByPool(cephconn, params) crushosddump := getOsdCrushDump(cephconn) diff --git a/types.go b/types.go index ffffde8..3ca87b3 100644 --- a/types.go +++ b/types.go @@ -9,7 +9,7 @@ type params struct { duration time.Duration threadsCount uint64 blocksize, objectsize uint64 - parallel bool + parallel, disablecheck bool bs, os, cluster, user, keyring, config, pool, define, rdefine, cpuprofile, memprofile string }