Skip to content

Commit ef5c12b

Browse files
danielnelsondanielnelson
committed
Fix dmcache tests with 32bit int
1 parent c013cc1 commit ef5c12b

File tree

2 files changed

+84
-84
lines changed

2 files changed

+84
-84
lines changed

‎plugins/inputs/dmcache/dmcache_linux.go

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@ const metricName = "dmcache"
1616

1717
type cacheStatus struct {
1818
device string
19-
length int
19+
length int64
2020
target string
21-
metadataBlocksize int
22-
metadataUsed int
23-
metadataTotal int
24-
cacheBlocksize int
25-
cacheUsed int
26-
cacheTotal int
27-
readHits int
28-
readMisses int
29-
writeHits int
30-
writeMisses int
31-
demotions int
32-
promotions int
33-
dirty int
21+
metadataBlocksize int64
22+
metadataUsed int64
23+
metadataTotal int64
24+
cacheBlocksize int64
25+
cacheUsed int64
26+
cacheTotal int64
27+
readHits int64
28+
readMisses int64
29+
writeHits int64
30+
writeMisses int64
31+
demotions int64
32+
promotions int64
33+
dirty int64
3434
}
3535

3636
func (c *DMCache) Gather(acc telegraf.Accumulator) error {
@@ -69,68 +69,68 @@ func parseDMSetupStatus(line string) (cacheStatus, error) {
6969
}
7070

7171
status.device = strings.TrimRight(values[0], ":")
72-
status.length, err = strconv.Atoi(values[2])
72+
status.length, err = strconv.ParseInt(values[2], 10, 64)
7373
if err != nil {
7474
return cacheStatus{}, err
7575
}
7676
status.target = values[3]
77-
status.metadataBlocksize, err = strconv.Atoi(values[4])
77+
status.metadataBlocksize, err = strconv.ParseInt(values[4], 10, 64)
7878
if err != nil {
7979
return cacheStatus{}, err
8080
}
8181
metadata := strings.Split(values[5], "/")
8282
if len(metadata) != 2 {
8383
return cacheStatus{}, parseError
8484
}
85-
status.metadataUsed, err = strconv.Atoi(metadata[0])
85+
status.metadataUsed, err = strconv.ParseInt(metadata[0], 10, 64)
8686
if err != nil {
8787
return cacheStatus{}, err
8888
}
89-
status.metadataTotal, err = strconv.Atoi(metadata[1])
89+
status.metadataTotal, err = strconv.ParseInt(metadata[1], 10, 64)
9090
if err != nil {
9191
return cacheStatus{}, err
9292
}
93-
status.cacheBlocksize, err = strconv.Atoi(values[6])
93+
status.cacheBlocksize, err = strconv.ParseInt(values[6], 10, 64)
9494
if err != nil {
9595
return cacheStatus{}, err
9696
}
9797
cache := strings.Split(values[7], "/")
9898
if len(cache) != 2 {
9999
return cacheStatus{}, parseError
100100
}
101-
status.cacheUsed, err = strconv.Atoi(cache[0])
101+
status.cacheUsed, err = strconv.ParseInt(cache[0], 10, 64)
102102
if err != nil {
103103
return cacheStatus{}, err
104104
}
105-
status.cacheTotal, err = strconv.Atoi(cache[1])
105+
status.cacheTotal, err = strconv.ParseInt(cache[1], 10, 64)
106106
if err != nil {
107107
return cacheStatus{}, err
108108
}
109-
status.readHits, err = strconv.Atoi(values[8])
109+
status.readHits, err = strconv.ParseInt(values[8], 10, 64)
110110
if err != nil {
111111
return cacheStatus{}, err
112112
}
113-
status.readMisses, err = strconv.Atoi(values[9])
113+
status.readMisses, err = strconv.ParseInt(values[9], 10, 64)
114114
if err != nil {
115115
return cacheStatus{}, err
116116
}
117-
status.writeHits, err = strconv.Atoi(values[10])
117+
status.writeHits, err = strconv.ParseInt(values[10], 10, 64)
118118
if err != nil {
119119
return cacheStatus{}, err
120120
}
121-
status.writeMisses, err = strconv.Atoi(values[11])
121+
status.writeMisses, err = strconv.ParseInt(values[11], 10, 64)
122122
if err != nil {
123123
return cacheStatus{}, err
124124
}
125-
status.demotions, err = strconv.Atoi(values[12])
125+
status.demotions, err = strconv.ParseInt(values[12], 10, 64)
126126
if err != nil {
127127
return cacheStatus{}, err
128128
}
129-
status.promotions, err = strconv.Atoi(values[13])
129+
status.promotions, err = strconv.ParseInt(values[13], 10, 64)
130130
if err != nil {
131131
return cacheStatus{}, err
132132
}
133-
status.dirty, err = strconv.Atoi(values[14])
133+
status.dirty, err = strconv.ParseInt(values[14], 10, 64)
134134
if err != nil {
135135
return cacheStatus{}, err
136136
}

‎plugins/inputs/dmcache/dmcache_linux_test.go

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -35,41 +35,41 @@ func TestPerDeviceGoodOutput(t *testing.T) {
3535
"device": "cs-1",
3636
}
3737
fields1 := map[string]interface{}{
38-
"length": 4883791872,
39-
"metadata_blocksize": 8,
40-
"metadata_used": 1018,
41-
"metadata_total": 1501122,
42-
"cache_blocksize": 512,
43-
"cache_used": 7,
44-
"cache_total": 464962,
45-
"read_hits": 139,
46-
"read_misses": 352643,
47-
"write_hits": 15,
48-
"write_misses": 46,
49-
"demotions": 0,
50-
"promotions": 7,
51-
"dirty": 0,
38+
"length": int64(4883791872),
39+
"metadata_blocksize": int64(8),
40+
"metadata_used": int64(1018),
41+
"metadata_total": int64(1501122),
42+
"cache_blocksize": int64(512),
43+
"cache_used": int64(7),
44+
"cache_total": int64(464962),
45+
"read_hits": int64(139),
46+
"read_misses": int64(352643),
47+
"write_hits": int64(15),
48+
"write_misses": int64(46),
49+
"demotions": int64(0),
50+
"promotions": int64(7),
51+
"dirty": int64(0),
5252
}
5353
acc.AssertContainsTaggedFields(t, measurement, fields1, tags1)
5454

5555
tags2 := map[string]string{
5656
"device": "cs-2",
5757
}
5858
fields2 := map[string]interface{}{
59-
"length": 4294967296,
60-
"metadata_blocksize": 8,
61-
"metadata_used": 72352,
62-
"metadata_total": 1310720,
63-
"cache_blocksize": 128,
64-
"cache_used": 26,
65-
"cache_total": 24327168,
66-
"read_hits": 2409,
67-
"read_misses": 286,
68-
"write_hits": 265,
69-
"write_misses": 524682,
70-
"demotions": 0,
71-
"promotions": 0,
72-
"dirty": 0,
59+
"length": int64(4294967296),
60+
"metadata_blocksize": int64(8),
61+
"metadata_used": int64(72352),
62+
"metadata_total": int64(1310720),
63+
"cache_blocksize": int64(128),
64+
"cache_used": int64(26),
65+
"cache_total": int64(24327168),
66+
"read_hits": int64(2409),
67+
"read_misses": int64(286),
68+
"write_hits": int64(265),
69+
"write_misses": int64(524682),
70+
"demotions": int64(0),
71+
"promotions": int64(0),
72+
"dirty": int64(0),
7373
}
7474
acc.AssertContainsTaggedFields(t, measurement, fields2, tags2)
7575

@@ -78,20 +78,20 @@ func TestPerDeviceGoodOutput(t *testing.T) {
7878
}
7979

8080
fields3 := map[string]interface{}{
81-
"length": 9178759168,
82-
"metadata_blocksize": 16,
83-
"metadata_used": 73370,
84-
"metadata_total": 2811842,
85-
"cache_blocksize": 640,
86-
"cache_used": 33,
87-
"cache_total": 24792130,
88-
"read_hits": 2548,
89-
"read_misses": 352929,
90-
"write_hits": 280,
91-
"write_misses": 524728,
92-
"demotions": 0,
93-
"promotions": 7,
94-
"dirty": 0,
81+
"length": int64(9178759168),
82+
"metadata_blocksize": int64(16),
83+
"metadata_used": int64(73370),
84+
"metadata_total": int64(2811842),
85+
"cache_blocksize": int64(640),
86+
"cache_used": int64(33),
87+
"cache_total": int64(24792130),
88+
"read_hits": int64(2548),
89+
"read_misses": int64(352929),
90+
"write_hits": int64(280),
91+
"write_misses": int64(524728),
92+
"demotions": int64(0),
93+
"promotions": int64(7),
94+
"dirty": int64(0),
9595
}
9696
acc.AssertContainsTaggedFields(t, measurement, fields3, tags3)
9797
}
@@ -113,20 +113,20 @@ func TestNotPerDeviceGoodOutput(t *testing.T) {
113113
}
114114

115115
fields := map[string]interface{}{
116-
"length": 9178759168,
117-
"metadata_blocksize": 16,
118-
"metadata_used": 73370,
119-
"metadata_total": 2811842,
120-
"cache_blocksize": 640,
121-
"cache_used": 33,
122-
"cache_total": 24792130,
123-
"read_hits": 2548,
124-
"read_misses": 352929,
125-
"write_hits": 280,
126-
"write_misses": 524728,
127-
"demotions": 0,
128-
"promotions": 7,
129-
"dirty": 0,
116+
"length": int64(9178759168),
117+
"metadata_blocksize": int64(16),
118+
"metadata_used": int64(73370),
119+
"metadata_total": int64(2811842),
120+
"cache_blocksize": int64(640),
121+
"cache_used": int64(33),
122+
"cache_total": int64(24792130),
123+
"read_hits": int64(2548),
124+
"read_misses": int64(352929),
125+
"write_hits": int64(280),
126+
"write_misses": int64(524728),
127+
"demotions": int64(0),
128+
"promotions": int64(7),
129+
"dirty": int64(0),
130130
}
131131
acc.AssertContainsTaggedFields(t, measurement, fields, tags)
132132
}

0 commit comments

Comments
 (0)