Fix vet errors

pugna0 · Jan 1, 2015 · aee5c36 · aee5c36
1 parent 3836d1e
commit aee5c36
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 33 deletions.
diff --git a/container/raw/handler.go b/container/raw/handler.go
@@ -210,20 +210,20 @@ func (self *rawContainerHandler) getFsStats(stats *info.ContainerStats) error {
 		for _, fs := range filesystems {
 			stats.Filesystem = append(stats.Filesystem,
 				info.FsStats{
-					fs.Device,
-					fs.Capacity,
-					fs.Capacity - fs.Free,
-					fs.DiskStats.ReadsCompleted,
-					fs.DiskStats.ReadsMerged,
-					fs.DiskStats.SectorsRead,
-					fs.DiskStats.ReadTime,
-					fs.DiskStats.WritesCompleted,
-					fs.DiskStats.WritesMerged,
-					fs.DiskStats.SectorsWritten,
-					fs.DiskStats.WriteTime,
-					fs.DiskStats.IoInProgress,
-					fs.DiskStats.IoTime,
-					fs.DiskStats.WeightedIoTime,
+					Device:          fs.Device,
+					Limit:           fs.Capacity,
+					Usage:           fs.Capacity - fs.Free,
+					ReadsCompleted:  fs.DiskStats.ReadsCompleted,
+					ReadsMerged:     fs.DiskStats.ReadsMerged,
+					SectorsRead:     fs.DiskStats.SectorsRead,
+					ReadTime:        fs.DiskStats.ReadTime,
+					WritesCompleted: fs.DiskStats.WritesCompleted,
+					WritesMerged:    fs.DiskStats.WritesMerged,
+					SectorsWritten:  fs.DiskStats.SectorsWritten,
+					WriteTime:       fs.DiskStats.WriteTime,
+					IoInProgress:    fs.DiskStats.IoInProgress,
+					IoTime:          fs.DiskStats.IoTime,
+					WeightedIoTime:  fs.DiskStats.WeightedIoTime,
 				})
 		}
 	} else if len(self.externalMounts) > 0 {
@@ -239,20 +239,20 @@ func (self *rawContainerHandler) getFsStats(stats *info.ContainerStats) error {
 		for _, fs := range filesystems {
 			stats.Filesystem = append(stats.Filesystem,
 				info.FsStats{
-					fs.Device,
-					fs.Capacity,
-					fs.Capacity - fs.Free,
-					fs.DiskStats.ReadsCompleted,
-					fs.DiskStats.ReadsMerged,
-					fs.DiskStats.SectorsRead,
-					fs.DiskStats.ReadTime,
-					fs.DiskStats.WritesCompleted,
-					fs.DiskStats.WritesMerged,
-					fs.DiskStats.SectorsWritten,
-					fs.DiskStats.WriteTime,
-					fs.DiskStats.IoInProgress,
-					fs.DiskStats.IoTime,
-					fs.DiskStats.WeightedIoTime,
+					Device:          fs.Device,
+					Limit:           fs.Capacity,
+					Usage:           fs.Capacity - fs.Free,
+					ReadsCompleted:  fs.DiskStats.ReadsCompleted,
+					ReadsMerged:     fs.DiskStats.ReadsMerged,
+					SectorsRead:     fs.DiskStats.SectorsRead,
+					ReadTime:        fs.DiskStats.ReadTime,
+					WritesCompleted: fs.DiskStats.WritesCompleted,
+					WritesMerged:    fs.DiskStats.WritesMerged,
+					SectorsWritten:  fs.DiskStats.SectorsWritten,
+					WriteTime:       fs.DiskStats.WriteTime,
+					IoInProgress:    fs.DiskStats.IoInProgress,
+					IoTime:          fs.DiskStats.IoTime,
+					WeightedIoTime:  fs.DiskStats.WeightedIoTime,
 				})
 		}
 	}

diff --git a/fs/fs.go b/fs/fs.go
@@ -1,5 +1,5 @@
 // +build linux
-//
+
 // Provides Filesystem Stats
 package fs
 

diff --git a/fs/fs_test.go b/fs/fs_test.go
@@ -10,7 +10,7 @@ func TestGetDiskStatsMap(t *testing.T) {
 		t.Errorf("Error calling getDiskStatMap %s", err)
 	}
 	if len(diskStatsMap) != 20 {
-		t.Errorf("diskStatsMap %s not valid", diskStatsMap)
+		t.Errorf("diskStatsMap %+v not valid", diskStatsMap)
 	}
 	keySet := map[string]string{
 		"/dev/sdb1": "/dev/sdb1",
@@ -42,7 +42,7 @@ func TestGetDiskStatsMap(t *testing.T) {
 		delete(keySet, device)
 	}
 	if len(keySet) != 0 {
-		t.Errorf("diskStatsMap %s contains illegal keys %s", diskStatsMap, keySet)
+		t.Errorf("diskStatsMap %+v contains illegal keys %+v", diskStatsMap, keySet)
 	}
 }
 

diff --git a/manager/machine.go b/manager/machine.go
@@ -256,7 +256,7 @@ func getMachineInfo(sysFs sysfs.SysFs) (*info.MachineInfo, error) {
 	}
 
 	for _, fs := range filesystems {
-		machineInfo.Filesystems = append(machineInfo.Filesystems, info.FsInfo{fs.Device, fs.Capacity})
+		machineInfo.Filesystems = append(machineInfo.Filesystems, info.FsInfo{Device: fs.Device, Capacity: fs.Capacity})
 	}
 
 	return machineInfo, nil

diff --git a/utils/procfs/scheddebug_test.go b/utils/procfs/scheddebug_test.go
@@ -625,7 +625,7 @@ func TestSchedDebugReader(t *testing.T) {
 		loads, err := NewSchedulerLoadReader()
 		if testCase.Error != nil {
 			if err == nil {
-				t.Fatal("expected error: %v", testCase.Error)
+				t.Fatalf("expected error: %v", testCase.Error)
 			}
 		}
 		if err != nil {