vitalif
/
ceph-gobench
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

No trash. Sync done

master
Alexey Kostin 2019-02-26 12:17:01 +03:00
parent ba0e8df3a7
commit 34352241a3
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ceph-gobench.go
View File

@ -27,14 +27,12 @@ func makeoffsets(threads int64, bs int64, objsize int64) [][]int64 {
} }
func bench(cephconn *Cephconnection, osddevice Device, host string, buffs *[][]byte, offset [][]int64, params *Params, func bench(cephconn *Cephconnection, osddevice Device, host string, buffs *[][]byte, offset [][]int64, params *Params,
wg *sync.WaitGroup, ready chan bool, result chan string, allready uint64) { wg *sync.WaitGroup, result chan string) {
var nwg sync.WaitGroup var nwg sync.WaitGroup
tready := make(chan bool, params.threadsCount)
start := uint64(0)
defer wg.Done() defer wg.Done()
for i := int64(0); i < params.threadsCount; i++ { for i := int64(0); i < params.threadsCount; i++ {
nwg.Add(1) nwg.Add(1)
go _bench(cephconn, osddevice, host, buffs, offset[i], params, &nwg, i, tready, result, &start) go _bench(cephconn, osddevice, host, buffs, offset[i], params, &nwg, result)
if params.parallel != true { if params.parallel != true {
nwg.Wait() nwg.Wait()
} }
@ -43,16 +41,10 @@ func bench(cephconn *Cephconnection, osddevice Device, host string, buffs *[][]b
} }
func _bench(cephconn *Cephconnection, osddevice Device, host string, buffs *[][]byte, offset []int64, params *Params, func _bench(cephconn *Cephconnection, osddevice Device, host string, buffs *[][]byte, offset []int64, params *Params,
wg *sync.WaitGroup, i int64, ready chan bool, result chan string, start *uint64) { wg *sync.WaitGroup, result chan string) {
defer wg.Done() defer wg.Done()
time.Sleep(time.Second * time.Duration(i)) // prepare objects time.Sleep(time.Second * time.Duration(1)) // prepare objects
ready <- true log.Println(host, osddevice.Name) //somework
for {
if *start == 1 {
break
}
}
log.Println(host, i, osddevice.Name) //somework
result <- fmt.Sprintf("Host: %v\nOsdname: %v", host, osddevice.Name) result <- fmt.Sprintf("Host: %v\nOsdname: %v", host, osddevice.Name)
} }
@ -78,16 +70,14 @@ func main() {
offsets := makeoffsets(params.threadsCount, params.blocksize, params.objectsize) offsets := makeoffsets(params.threadsCount, params.blocksize, params.objectsize)
var wg sync.WaitGroup var wg sync.WaitGroup
var allready uint64 result := make(chan string, len(offsets))
var ready chan bool
var result chan string
for host, osds := range osddevices { for host, osds := range osddevices {
for _, osd := range osds { for _, osd := range osds {
wg.Add(1) wg.Add(1)
if params.parallel == true { if params.parallel == true {
go bench(cephconn, osd, host, &buffs, offsets, &params, &wg, ready, result, allready) go bench(cephconn, osd, host, &buffs, offsets, &params, &wg, result)
} else { } else {
bench(cephconn, osd, host, &buffs, offsets, &params, &wg, ready, result, allready) bench(cephconn, osd, host, &buffs, offsets, &params, &wg, result)
} }
} }
} }

1
getosd.go
View File

@ -113,7 +113,6 @@ func GetOsdForLocations(params Params, osdcrushdump OsdCrushDump, osddump OsdDum
} }
osdhosts := make(map[string][]Device) osdhosts := make(map[string][]Device)
//var devices []Device
bucketitems := GetCrushHostBuckets(osdcrushdump.Buckets, rootid) bucketitems := GetCrushHostBuckets(osdcrushdump.Buckets, rootid)
if params.define != "" { if params.define != "" {
if strings.HasPrefix(params.define, "osd.") { if strings.HasPrefix(params.define, "osd.") {