Skip to content

Commit

Permalink
Merge pull request #113 from lukemartinlogan/master
Browse files Browse the repository at this point in the history
Fix a small bug with hermes jarvis pkg and use lsblk in resource graph
  • Loading branch information
lukemartinlogan authored Jan 24, 2025
2 parents f8c5676 + 39ba620 commit f7e75cb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "python",
"request": "launch",
"program": "${workspaceFolder}/bin/jarvis",
"args": ["bootstrap", "from", "local"],
"args": ["rg", "build"],
"console": "integratedTerminal",
"justMyCode": false,
"env": {
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jarvis ppl update
## Building the Resource Graph

NOTE: This step only needs to be run if you did ``jarvis bootstrap from local`` or ``jarvis init``.
If you bootstrap from a specific machine, then you're finished.
If you bootstrap from a specific machine, then skip this section.

The resource graph is a snapshot of your systems network and storage.
Many packages depend on it for their configurations. The Hermes I/O system, for example,
Expand Down
5 changes: 4 additions & 1 deletion builtin/builtin/hermes_run/pkg.py
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,8 @@ def _configure(self, **kwargs):
dev_df = sdf.concat(dev_list)
if len(dev_df) == 0:
raise Exception('Hermes needs at least one storage device')

print(dev_df)
devs = dev_df.rows
self.config['borg_paths'] = []
for i, dev in enumerate(devs):
Expand All @@ -364,7 +366,8 @@ def _configure(self, **kwargs):
bandwidth = '120MBps'
latency = '5ms'
else:
continue
bandwidth = '120MBps'
latency = '5ms'
mount = f'{mount}/hermes_data'
hermes_server['devices'][custom_name] = {
'mount_point': mount,
Expand Down

0 comments on commit f7e75cb

Please sign in to comment.