Skip to content

Commit 55c54b6

Browse files
pmkccopybara-github
authored andcommitted
Update Linux VM metadata to:
1. Always show the kernel command line 2. Show if RT kernel was enabled PiperOrigin-RevId: 846435753
1 parent 3593ff5 commit 55c54b6

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

perfkitbenchmarker/linux_virtual_machine.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1200,11 +1200,13 @@ def RecordAdditionalMetadata(self):
12001200
self.os_metadata['kernel_release'] = str(self.kernel_release)
12011201
self.os_metadata['cpu_arch'] = self.cpu_arch
12021202
self.os_metadata.update(self.partition_table)
1203+
self.os_metadata['kernel_command_line'] = self.kernel_command_line
12031204
if FLAGS.append_kernel_command_line:
1204-
self.os_metadata['kernel_command_line'] = self.kernel_command_line
12051205
self.os_metadata['append_kernel_command_line'] = (
12061206
FLAGS.append_kernel_command_line
12071207
)
1208+
if _ENABLE_RT_KERNEL.value:
1209+
self.os_metadata['enable_rt_kernel'] = True
12081210
# TODO(pclay): consider publishing full lsmod as a sample. It's probably too
12091211
# spammy for metadata
12101212
if _KERNEL_MODULES_TO_ADD.value:

tests/linux_virtual_machine_test.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@ class LinuxVirtualMachineTestCase(pkb_common_test_case.PkbCommonTestCase):
521521
pkb_common_test_case.IP_LINK_TEXT
522522
),
523523
'cat /proc/cpuinfo | grep processor | wc -l': '16',
524+
'cat /proc/cmdline': 'test kernel flags'
524525
}
525526

526527
def CreateVm(
@@ -687,6 +688,7 @@ def testBoot(self):
687688
'os_info': self.os_info,
688689
'cpu_arch': self.cpu_arch,
689690
'threads_per_core': 1,
691+
'kernel_command_line': 'test kernel flags',
690692
}
691693
self.assertEqual(expected_os_metadata, vm.os_metadata)
692694

0 commit comments

Comments
 (0)