Skip to content

Commit

Permalink
Handle initial missing plot_id from plotman. Self-corrects within a f…
Browse files Browse the repository at this point in the history
…ew seconds.
  • Loading branch information
guydavis committed Jan 4, 2024
1 parent a14cdcb commit 5377e38
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file. The format
- Support for running Gigahorse containers on arm64 architectures such as Raspberry Pi.
### Changed
- Optionally launch of Gigahorse recompute server when in harvester mode if env var `gigahorse_recompute_server=true` is set.
- Fix for Bladebit GPU plotting jobs taking a minute to display on Plotting page on job start. Should now be seconds only.
### Updated
- [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.1.4) to v2.1.4 - misc improvements, see their release notes.
- [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.1.3.giga26) to v2.1.3.giga26.
Expand Down
7 changes: 5 additions & 2 deletions api/models/plotman.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ def __init__(self, cli_stdout, plotman_pid):
self.columns[8] = 'size'
else: # Check for a plotting job row
values = line.split()
if len(values) > 1 and values[1] in ['chia', 'madmax', 'bladebit']:
if len(values) == len(self.columns):
if len(values) > 1:
if len(values) == (len(self.columns) - 1) and values[0] in ['chia', 'madmax', 'bladebit']:
# Sometimes plotman can't find the plot_id on newly started plotting jobs, use a placeholder
values.insert(0, 'xxxxxx')
if len(values) == len(self.columns) and values[1] in ['chia', 'madmax', 'bladebit']:
row = {}
i = 0
for i in range(len(self.columns)):
Expand Down
4 changes: 2 additions & 2 deletions scripts/forks/chia_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ else
echo "Installing Chia CUDA binaries on ${arch_name}..."
cd /tmp
if [[ "${arch_name}" == "x86_64" ]]; then
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.4-rc1/chia-blockchain-cli_2.1.4rc1-1_amd64.deb
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.4-rc2/chia-blockchain-cli_2.1.4rc2-1_amd64.deb
apt-get install ./chia-blockchain-cli*.deb
else
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.4-rc1/chia-blockchain-cli_2.1.4rc1-1_arm64.deb
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.4-rc2/chia-blockchain-cli_2.1.4rc2-1_arm64.deb
apt-get install ./chia-blockchain-cli*.deb
fi

Expand Down

0 comments on commit 5377e38

Please sign in to comment.