Skip to content

Commit e00c8bd

Browse files
bobbypagebobbypage
authored
Merge pull request #2958 from kolyshkin/ct-libct-nits
container/libcontainer: nits
2 parents 0ab27c2 + fab7308 commit e00c8bd

File tree

4 files changed

+48
-52
lines changed

4 files changed

+48
-52
lines changed

‎container/libcontainer/handler.go

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ func getReferencedKBytes(pids []int) (uint64, error) {
383383
if err != nil {
384384
klog.V(5).Infof("Cannot read %s file, err: %s", smapsFilePath, err)
385385
if os.IsNotExist(err) {
386-
continue //smaps file does not exists for all PIDs
386+
continue // smaps file does not exists for all PIDs
387387
}
388388
return 0, err
389389
}
@@ -426,7 +426,7 @@ func clearReferencedBytes(pids []int, cycles uint64, resetInterval uint64) error
426426
if cycles%resetInterval == 0 {
427427
for _, pid := range pids {
428428
clearRefsFilePath := fmt.Sprintf(clearRefsFilePathPattern, pid)
429-
clerRefsFile, err := os.OpenFile(clearRefsFilePath, os.O_WRONLY, 0644)
429+
clerRefsFile, err := os.OpenFile(clearRefsFilePath, os.O_WRONLY, 0o644)
430430
if err != nil {
431431
// clear_refs file may not exist for all PIDs
432432
continue
@@ -455,9 +455,7 @@ func networkStatsFromProc(rootFs string, pid int) ([]info.InterfaceStats, error)
455455
return ifaceStats, nil
456456
}
457457

458-
var (
459-
ignoredDevicePrefixes = []string{"lo", "veth", "docker"}
460-
)
458+
var ignoredDevicePrefixes = []string{"lo", "veth", "docker"}
461459

462460
func isIgnoredDevice(ifName string) bool {
463461
for _, prefix := range ignoredDevicePrefixes {
@@ -615,11 +613,9 @@ func scanAdvancedTCPStats(advancedStats *info.TcpAdvancedStat, advancedTCPStatsF
615613
}
616614

617615
return scanner.Err()
618-
619616
}
620617

621618
func scanTCPStats(tcpStatsFile string) (info.TcpStat, error) {
622-
623619
var stats info.TcpStat
624620

625621
data, err := ioutil.ReadFile(tcpStatsFile)
@@ -628,17 +624,17 @@ func scanTCPStats(tcpStatsFile string) (info.TcpStat, error) {
628624
}
629625

630626
tcpStateMap := map[string]uint64{
631-
"01": 0, //ESTABLISHED
632-
"02": 0, //SYN_SENT
633-
"03": 0, //SYN_RECV
634-
"04": 0, //FIN_WAIT1
635-
"05": 0, //FIN_WAIT2
636-
"06": 0, //TIME_WAIT
637-
"07": 0, //CLOSE
638-
"08": 0, //CLOSE_WAIT
639-
"09": 0, //LAST_ACK
640-
"0A": 0, //LISTEN
641-
"0B": 0, //CLOSING
627+
"01": 0, // ESTABLISHED
628+
"02": 0, // SYN_SENT
629+
"03": 0, // SYN_RECV
630+
"04": 0, // FIN_WAIT1
631+
"05": 0, // FIN_WAIT2
632+
"06": 0, // TIME_WAIT
633+
"07": 0, // CLOSE
634+
"08": 0, // CLOSE_WAIT
635+
"09": 0, // LAST_ACK
636+
"0A": 0, // LISTEN
637+
"0B": 0, // CLOSING
642638
}
643639

644640
reader := strings.NewReader(string(data))
@@ -779,14 +775,14 @@ func setCPUStats(s *cgroups.Stats, ret *info.ContainerStats, withPerCPU bool) {
779775
}
780776

781777
func setDiskIoStats(s *cgroups.Stats, ret *info.ContainerStats) {
782-
ret.DiskIo.IoServiceBytes = DiskStatsCopy(s.BlkioStats.IoServiceBytesRecursive)
783-
ret.DiskIo.IoServiced = DiskStatsCopy(s.BlkioStats.IoServicedRecursive)
784-
ret.DiskIo.IoQueued = DiskStatsCopy(s.BlkioStats.IoQueuedRecursive)
785-
ret.DiskIo.Sectors = DiskStatsCopy(s.BlkioStats.SectorsRecursive)
786-
ret.DiskIo.IoServiceTime = DiskStatsCopy(s.BlkioStats.IoServiceTimeRecursive)
787-
ret.DiskIo.IoWaitTime = DiskStatsCopy(s.BlkioStats.IoWaitTimeRecursive)
788-
ret.DiskIo.IoMerged = DiskStatsCopy(s.BlkioStats.IoMergedRecursive)
789-
ret.DiskIo.IoTime = DiskStatsCopy(s.BlkioStats.IoTimeRecursive)
778+
ret.DiskIo.IoServiceBytes = diskStatsCopy(s.BlkioStats.IoServiceBytesRecursive)
779+
ret.DiskIo.IoServiced = diskStatsCopy(s.BlkioStats.IoServicedRecursive)
780+
ret.DiskIo.IoQueued = diskStatsCopy(s.BlkioStats.IoQueuedRecursive)
781+
ret.DiskIo.Sectors = diskStatsCopy(s.BlkioStats.SectorsRecursive)
782+
ret.DiskIo.IoServiceTime = diskStatsCopy(s.BlkioStats.IoServiceTimeRecursive)
783+
ret.DiskIo.IoWaitTime = diskStatsCopy(s.BlkioStats.IoWaitTimeRecursive)
784+
ret.DiskIo.IoMerged = diskStatsCopy(s.BlkioStats.IoMergedRecursive)
785+
ret.DiskIo.IoTime = diskStatsCopy(s.BlkioStats.IoTimeRecursive)
790786
}
791787

792788
func setMemoryStats(s *cgroups.Stats, ret *info.ContainerStats) {
@@ -896,7 +892,6 @@ func setThreadsStats(s *cgroups.Stats, ret *info.ContainerStats) {
896892
ret.Processes.ThreadsCurrent = s.PidsStats.Current
897893
ret.Processes.ThreadsMax = s.PidsStats.Limit
898894
}
899-
900895
}
901896

902897
func newContainerStats(libcontainerStats *libcontainer.Stats, includedMetrics container.MetricSet) *info.ContainerStats {

‎container/libcontainer/handler_test.go

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestScanInterfaceStats(t *testing.T) {
3030
t.Error(err)
3131
}
3232

33-
var netdevstats = []info.InterfaceStats{
33+
netdevstats := []info.InterfaceStats{
3434
{
3535
Name: "wlp4s0",
3636
RxBytes: 1,
@@ -78,7 +78,7 @@ func TestScanUDPStats(t *testing.T) {
7878
t.Error(err)
7979
}
8080

81-
var udpstats = info.UdpStat{
81+
udpstats := info.UdpStat{
8282
Listen: 2,
8383
Dropped: 4,
8484
RxQueued: 10,
@@ -168,11 +168,10 @@ func TestSetProcessesStats(t *testing.T) {
168168
if expected.Processes.ThreadsMax != ret.Processes.ThreadsMax {
169169
t.Fatalf("expected max threads: %d == %d", ret.Processes.ThreadsMax, expected.Processes.ThreadsMax)
170170
}
171-
172171
}
173172

174173
func TestParseLimitsFile(t *testing.T) {
175-
var testData = []struct {
174+
testData := []struct {
176175
limitLine string
177176
expected []info.UlimitSpec
178177
}{
@@ -211,7 +210,7 @@ func TestParseLimitsFile(t *testing.T) {
211210
}
212211

213212
func TestReferencedBytesStat(t *testing.T) {
214-
//overwrite package variables
213+
// overwrite package variables
215214
smapsFilePathPattern = "testdata/smaps%d"
216215
clearRefsFilePathPattern = "testdata/clear_refs%d"
217216

@@ -223,16 +222,17 @@ func TestReferencedBytesStat(t *testing.T) {
223222
clearRefsFiles := []string{
224223
"testdata/clear_refs4",
225224
"testdata/clear_refs6",
226-
"testdata/clear_refs8"}
225+
"testdata/clear_refs8",
226+
}
227227

228-
//check if clear_refs files have proper values
228+
// check if clear_refs files have proper values
229229
assert.Equal(t, "0\n", getFileContent(t, clearRefsFiles[0]))
230230
assert.Equal(t, "0\n", getFileContent(t, clearRefsFiles[1]))
231231
assert.Equal(t, "0\n", getFileContent(t, clearRefsFiles[2]))
232232
}
233233

234234
func TestReferencedBytesStatWhenNeverCleared(t *testing.T) {
235-
//overwrite package variables
235+
// overwrite package variables
236236
smapsFilePathPattern = "testdata/smaps%d"
237237
clearRefsFilePathPattern = "testdata/clear_refs%d"
238238

@@ -244,16 +244,17 @@ func TestReferencedBytesStatWhenNeverCleared(t *testing.T) {
244244
clearRefsFiles := []string{
245245
"testdata/clear_refs4",
246246
"testdata/clear_refs6",
247-
"testdata/clear_refs8"}
247+
"testdata/clear_refs8",
248+
}
248249

249-
//check if clear_refs files have proper values
250+
// check if clear_refs files have proper values
250251
assert.Equal(t, "0\n", getFileContent(t, clearRefsFiles[0]))
251252
assert.Equal(t, "0\n", getFileContent(t, clearRefsFiles[1]))
252253
assert.Equal(t, "0\n", getFileContent(t, clearRefsFiles[2]))
253254
}
254255

255256
func TestReferencedBytesStatWhenResetIsNeeded(t *testing.T) {
256-
//overwrite package variables
257+
// overwrite package variables
257258
smapsFilePathPattern = "testdata/smaps%d"
258259
clearRefsFilePathPattern = "testdata/clear_refs%d"
259260

@@ -265,9 +266,10 @@ func TestReferencedBytesStatWhenResetIsNeeded(t *testing.T) {
265266
clearRefsFiles := []string{
266267
"testdata/clear_refs4",
267268
"testdata/clear_refs6",
268-
"testdata/clear_refs8"}
269+
"testdata/clear_refs8",
270+
}
269271

270-
//check if clear_refs files have proper values
272+
// check if clear_refs files have proper values
271273
assert.Equal(t, "1\n", getFileContent(t, clearRefsFiles[0]))
272274
assert.Equal(t, "1\n", getFileContent(t, clearRefsFiles[1]))
273275
assert.Equal(t, "1\n", getFileContent(t, clearRefsFiles[2]))
@@ -276,7 +278,7 @@ func TestReferencedBytesStatWhenResetIsNeeded(t *testing.T) {
276278
}
277279

278280
func TestGetReferencedKBytesWhenSmapsMissing(t *testing.T) {
279-
//overwrite package variable
281+
// overwrite package variable
280282
smapsFilePathPattern = "testdata/smaps%d"
281283

282284
pids := []int{10}
@@ -286,7 +288,7 @@ func TestGetReferencedKBytesWhenSmapsMissing(t *testing.T) {
286288
}
287289

288290
func TestClearReferencedBytesWhenClearRefsMissing(t *testing.T) {
289-
//overwrite package variable
291+
// overwrite package variable
290292
clearRefsFilePathPattern = "testdata/clear_refs%d"
291293

292294
pids := []int{10}

‎container/libcontainer/helpers.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ var supportedSubsystems map[string]struct{} = map[string]struct{}{
144144
"perf_event": {},
145145
}
146146

147-
func DiskStatsCopy0(major, minor uint64) *info.PerDiskStats {
147+
func diskStatsCopy0(major, minor uint64) *info.PerDiskStats {
148148
disk := info.PerDiskStats{
149149
Major: major,
150150
Minor: minor,
@@ -153,12 +153,12 @@ func DiskStatsCopy0(major, minor uint64) *info.PerDiskStats {
153153
return &disk
154154
}
155155

156-
type DiskKey struct {
156+
type diskKey struct {
157157
Major uint64
158158
Minor uint64
159159
}
160160

161-
func DiskStatsCopy1(diskStat map[DiskKey]*info.PerDiskStats) []info.PerDiskStats {
161+
func diskStatsCopy1(diskStat map[diskKey]*info.PerDiskStats) []info.PerDiskStats {
162162
i := 0
163163
stat := make([]info.PerDiskStats, len(diskStat))
164164
for _, disk := range diskStat {
@@ -168,21 +168,21 @@ func DiskStatsCopy1(diskStat map[DiskKey]*info.PerDiskStats) []info.PerDiskStats
168168
return stat
169169
}
170170

171-
func DiskStatsCopy(blkioStats []cgroups.BlkioStatEntry) (stat []info.PerDiskStats) {
171+
func diskStatsCopy(blkioStats []cgroups.BlkioStatEntry) (stat []info.PerDiskStats) {
172172
if len(blkioStats) == 0 {
173173
return
174174
}
175-
diskStat := make(map[DiskKey]*info.PerDiskStats)
175+
diskStat := make(map[diskKey]*info.PerDiskStats)
176176
for i := range blkioStats {
177177
major := blkioStats[i].Major
178178
minor := blkioStats[i].Minor
179-
key := DiskKey{
179+
key := diskKey{
180180
Major: major,
181181
Minor: minor,
182182
}
183183
diskp, ok := diskStat[key]
184184
if !ok {
185-
diskp = DiskStatsCopy0(major, minor)
185+
diskp = diskStatsCopy0(major, minor)
186186
diskStat[key] = diskp
187187
}
188188
op := blkioStats[i].Op
@@ -191,7 +191,7 @@ func DiskStatsCopy(blkioStats []cgroups.BlkioStatEntry) (stat []info.PerDiskStat
191191
}
192192
diskp.Stats[op] = blkioStats[i].Value
193193
}
194-
return DiskStatsCopy1(diskStat)
194+
return diskStatsCopy1(diskStat)
195195
}
196196

197197
func NewCgroupManager(name string, paths map[string]string) (cgroups.Manager, error) {
@@ -204,5 +204,4 @@ func NewCgroupManager(name string, paths map[string]string) (cgroups.Manager, er
204204
Name: name,
205205
}
206206
return fs.NewManager(&config, paths, false), nil
207-
208207
}

‎container/libcontainer/helpers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func getFileContent(t *testing.T, filePath string) string {
141141

142142
func clearTestData(t *testing.T, clearRefsPaths []string) {
143143
for _, clearRefsPath := range clearRefsPaths {
144-
err := ioutil.WriteFile(clearRefsPath, []byte("0\n"), 0644)
144+
err := ioutil.WriteFile(clearRefsPath, []byte("0\n"), 0o644)
145145
assert.Nil(t, err)
146146
}
147147
}

0 commit comments

Comments
 (0)