Make a copy of MachineInfo in GetMachineInfo()

Signed-off-by: Ted Yu <yuzhihong@gmail.com>
google · Apr 10, 2020 · 2dd055c · 2dd055c
1 parent 49f4075
commit 2dd055c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/machine/topology_test.go b/machine/topology_test.go
@@ -257,15 +257,15 @@ func TestTopologyWithoutNodes(t *testing.T) {
 
 	expectedTopology := `[
 		{
-			"node_id":0,
+			"node_id":1,
 			"memory":0,
 			"hugepages":null,
 			"cores":[
 				{
-					"core_id":0,
+					"core_id":1,
 					"thread_ids":[
-					0,
-					2
+					1,
+					3
 					],
 					"caches":[
 					{
@@ -279,15 +279,15 @@ func TestTopologyWithoutNodes(t *testing.T) {
 			"caches":null
 		},
 		{
-			"node_id":1,
+			"node_id":0,
 			"memory":0,
 			"hugepages":null,
 			"cores":[
 				{
-					"core_id":1,
+					"core_id":0,
 					"thread_ids":[
-					1,
-					3
+					0,
+					2
 					],
 					"caches":[
 					{

diff --git a/manager/manager.go b/manager/manager.go
@@ -793,7 +793,27 @@ func (m *manager) GetMachineInfo() (*info.MachineInfo, error) {
 	m.machineMu.RLock()
 	defer m.machineMu.RUnlock()
 	// Copy and return the MachineInfo.
-	return &m.machineInfo, nil
+	copy := info.MachineInfo{
+		NumCores:         m.machineInfo.NumCores,
+		NumPhysicalCores: m.machineInfo.NumPhysicalCores,
+		NumSockets:       m.machineInfo.NumSockets,
+		CpuFrequency:     m.machineInfo.CpuFrequency,
+		MemoryCapacity:   m.machineInfo.MemoryCapacity,
+		MemoryByType:     m.machineInfo.MemoryByType,
+		NVMInfo:          m.machineInfo.NVMInfo,
+		HugePages:        m.machineInfo.HugePages,
+		MachineID:        m.machineInfo.MachineID,
+		SystemUUID:       m.machineInfo.SystemUUID,
+		BootID:           m.machineInfo.BootID,
+		Filesystems:      m.machineInfo.Filesystems,
+		DiskMap:          m.machineInfo.DiskMap,
+		NetworkDevices:   m.machineInfo.NetworkDevices,
+		Topology:         m.machineInfo.Topology,
+		CloudProvider:    m.machineInfo.CloudProvider,
+		InstanceType:     m.machineInfo.InstanceType,
+		InstanceID:       m.machineInfo.InstanceID,
+	}
+	return &copy, nil
 }
 
 func (m *manager) GetVersionInfo() (*info.VersionInfo, error) {