zuul/nodepool
Code Issues Proposed changes

Include user/driver data in node detail list

Browse Source 
This lets operators see the user_data and driver_data in the node
list when passing --detail.  That can be useful for identifying
issues with the metastatic driver, or any other debugging which
would benefit from seeing that data.

Change-Id: I2f36ce98a183b7a8e289376f2228b6370900a057
This commit is contained in:
James E. Blair 2022-06-30 14:31:06 -07:00
parent 025318b825
commit eb9121a733
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodepool/cmd/nodepoolcmd.py
View File

@ -200,7 +200,7 @@ class NodePoolCmd(NodepoolApp):
fields.extend(['pool', 'hostname', 'private_ipv4', 'AZ', fields.extend(['pool', 'hostname', 'private_ipv4', 'AZ',
'connection_port', 'launcher', 'connection_port', 'launcher',
'allocated_to', 'hold_job', 'allocated_to', 'hold_job',
'comment']) 'comment', 'user_data', 'driver_data'])
results = status.node_list(self.zk, node_id) results = status.node_list(self.zk, node_id)
print(status.output(results, 'pretty', fields)) print(status.output(results, 'pretty', fields))

8
nodepool/status.py
View File

@ -127,7 +127,9 @@ def node_list(zk, node_id=None):
("launcher", "Launcher"), ("launcher", "Launcher"),
("allocated_to", "Allocated To"), ("allocated_to", "Allocated To"),
("hold_job", "Hold Job"), ("hold_job", "Hold Job"),
("comment", "Comment") ("comment", "Comment"),
("user_data", "User Data"),
("driver_data", "Driver Data"),
] ]
headers_table = OrderedDict(headers_table) headers_table = OrderedDict(headers_table)
@ -158,7 +160,9 @@ def node_list(zk, node_id=None):
node.launcher, node.launcher,
node.allocated_to, node.allocated_to,
node.hold_job, node.hold_job,
node.comment node.comment,
node.user_data,
node.driver_data,
] ]
return values return values

2
nodepool/tests/unit/test_commands.py
View File

@ -76,7 +76,7 @@ class TestNodepoolCMD(tests.DBTestCase):
col_count = 9 col_count = 9
if detail: if detail:
cmd += ['--detail'] cmd += ['--detail']
col_count = 18 col_count = 20
if not validate_col_count: if not validate_col_count:
col_count = 0 col_count = 0
self.assert_listed(configfile, cmd, 6, status, node_cnt, col_count) self.assert_listed(configfile, cmd, 6, status, node_cnt, col_count)