From 5377e38fd54b2012a3da4d94d6b8fb09f22227f0 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 4 Jan 2024 10:44:59 -0700 Subject: [PATCH] Handle initial missing plot_id from plotman. Self-corrects within a few seconds. --- CHANGELOG.md | 1 + api/models/plotman.py | 7 +++++-- scripts/forks/chia_install.sh | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9c2eefd..9740d609 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/api/models/plotman.py b/api/models/plotman.py index 2a80507b..a94462c6 100644 --- a/api/models/plotman.py +++ b/api/models/plotman.py @@ -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)): diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 3f461a94..2df5df53 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -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