root/trading_bot_v4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Database-first cluster status detection + Stop button clarification

Browse Source 
CRITICAL FIX (Nov 30, 2025):
- Dashboard showed 'idle' despite 22+ worker processes running
- Root cause: SSH-based worker detection timing out
- Solution: Check database for running chunks FIRST

Changes:
1. app/api/cluster/status/route.ts:
   - Query exploration database before SSH detection
   - If running chunks exist, mark workers 'active' even if SSH fails
   - Override worker status: 'offline' → 'active' when chunks running
   - Log: '✅ Cluster status: ACTIVE (database shows running chunks)'
   - Database is source of truth, SSH only for supplementary metrics

2. app/cluster/page.tsx:
   - Stop button ALREADY EXISTS (conditionally shown)
   - Shows Start when status='idle', Stop when status='active'
   - No code changes needed - fixed by status detection

Result:
- Dashboard now shows 'ACTIVE' with 2 workers (correct)
- Workers show 'active' status (was 'offline')
- Stop button automatically visible when cluster active
- System resilient to SSH timeouts/network issues

Verified:
- Container restarted: Nov 30 21:18 UTC
- API tested: Returns status='active', activeWorkers=2
- Logs confirm: Database-first logic working
- Workers confirmed running: 22+ processes on worker1, workers on worker2
This commit is contained in:
mindesbunister
2025-11-30 22:23:01 +01:00
parent 83b4915d98
commit cc56b72df2
795 changed files with 312766 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
app/api/cluster/status/route.ts
View File

@@ -1,7 +1,8 @@
import { NextRequest, NextResponse } from 'next/server'
import { exec } from 'child_process'
import { promisify } from 'util'
import fs from 'fs/promises'
import sqlite3 from 'sqlite3'
import { open, Database } from 'sqlite'
import path from 'path'
const execAsync = promisify(exec)
@@ -74,52 +75,84 @@ async function getWorkerStatus(workerName: string, sshCommand: string): Promise<
}
}
async function getLatestResults(): Promise<ChunkResult[]> {
async function getExplorationData() {
try {
// Try to get results from bd-host01
const cmd = 'ssh root@10.10.254.106 "ssh root@10.20.254.100 \'ls -t /home/backtest_dual/backtest/chunk_*_results.csv 2>/dev/null | head -1\'"'
const { stdout } = await execAsync(cmd)
const csvPath = stdout.trim()
const dbPath = path.join(process.cwd(), 'cluster', 'exploration.db')
if (!csvPath) {
return []
}
// Download and parse CSV
const downloadCmd = `ssh root@10.10.254.106 "scp root@10.20.254.100:${csvPath} /tmp/latest_results.csv" && scp root@10.10.254.106:/tmp/latest_results.csv /tmp/cluster_results.csv`
await execAsync(downloadCmd)
const csvContent = await fs.readFile('/tmp/cluster_results.csv', 'utf-8')
const lines = csvContent.split('\n').slice(1, 11) // Skip header, get top 10
const db = await open({
filename: dbPath,
driver: sqlite3.Database
})
const results: ChunkResult[] = []
for (const line of lines) {
if (!line.trim()) continue
// Get total combos and chunk statistics
const totalCombosRow = await db.get('SELECT SUM(total_combos) as total FROM chunks')
const totalCombos = totalCombosRow?.total || 0
const chunks = await db.all('SELECT * FROM chunks ORDER BY chunk_start')
const completedChunks = chunks.filter(c => c.status === 'completed').length
const runningChunks = chunks.filter(c => c.status === 'running').length
const pendingChunks = chunks.filter(c => c.status === 'pending').length
// Try to get strategies (table may not exist yet)
let strategies: any[] = []
let testedCombos = 0
try {
const strategiesCount = await db.get('SELECT COUNT(*) as count FROM strategies')
testedCombos = strategiesCount?.count || 0
const cols = line.split(',')
if (cols.length < 22) continue
results.push({
rank: parseInt(cols[0]),
pnl_per_1k: parseFloat(cols[4]),
win_rate: parseFloat(cols[2]),
trades: parseInt(cols[1]),
profit_factor: parseFloat(cols[5]),
max_drawdown: parseFloat(cols[6]),
params: {
flip_threshold: parseFloat(cols[8]),
ma_gap: parseFloat(cols[9]),
adx_min: parseFloat(cols[10]),
long_pos_max: parseFloat(cols[11]),
short_pos_min: parseFloat(cols[12])
}
})
strategies = await db.all(`
SELECT * FROM strategies
WHERE total_trades >= 700
ORDER BY pnl_per_1k DESC
LIMIT 10
`)
} catch (e) {
// Strategies table doesn't exist yet - this is fine
console.log('Strategies table not yet available')
}
await db.close()
const progress = totalCombos > 0 ? Math.round((testedCombos / totalCombos) * 100) : 0
return {
totalCombos,
testedCombos,
progress,
chunks: {
total: chunks.length,
completed: completedChunks,
running: runningChunks,
pending: pendingChunks
},
strategies
}
return results
} catch (error) {
console.error('Error fetching results:', error)
return []
console.error('Error reading exploration database:', error)
return {
totalCombos: 0,
testedCombos: 0,
progress: 0,
chunks: { total: 0, completed: 0, running: 0, pending: 0 },
strategies: []
}
}
}
interface ChunkResult {
rank: number
pnl_per_1k: number
win_rate: number
trades: number
profit_factor: number
max_drawdown: number
params: {
flip_threshold: number
ma_gap: number
adx_min: number
long_pos_max: number
short_pos_min: number
}
}
@@ -158,19 +191,65 @@ function generateRecommendation(results: ChunkResult[]): string {
export async function GET(request: NextRequest) {
try {
// Get status from both workers
// CRITICAL FIX (Nov 30, 2025): Check database FIRST before SSH detection
// Database is the source of truth - SSH may timeout but workers are still running
const explorationData = await getExplorationData()
const hasRunningChunks = explorationData.chunks.running > 0
// Get status from both workers (SSH for supplementary metrics only)
const [worker1Status, worker2Status] = await Promise.all([
getWorkerStatus('worker1', 'ssh root@10.10.254.106'),
getWorkerStatus('worker2', 'ssh root@10.10.254.106 "ssh root@10.20.254.100"')
])
const workers = [worker1Status, worker2Status]
// If database shows running chunks but SSH shows offline, override to active
// This prevents false "idle" status when SSH detection times out
const workers = [worker1Status, worker2Status].map(w => {
if (hasRunningChunks && w.status === 'offline') {
console.log(`✅ ${w.name}: Database shows running chunks - overriding SSH offline to active`)
return {
...w,
status: 'active' as const,
activeProcesses: w.activeProcesses || 1 // Assume at least 1 process if chunks running
}
}
return w
})
const totalCPU = workers.reduce((sum, w) => sum + w.cpuUsage, 0) / workers.length
const totalProcesses = workers.reduce((sum, w) => sum + w.activeProcesses, 0)
const activeWorkers = workers.filter(w => w.status === 'active').length
// Get latest results
const topStrategies = await getLatestResults()
// Determine cluster status: DATABASE-FIRST APPROACH
// If running chunks exist, cluster is active regardless of SSH detection
let clusterStatus: 'active' | 'idle' = 'idle'
if (hasRunningChunks) {
clusterStatus = 'active'
console.log('✅ Cluster status: ACTIVE (database shows running chunks)')
} else if (activeWorkers > 0) {
clusterStatus = 'active'
console.log('✅ Cluster status: ACTIVE (SSH detected active workers)')
} else {
console.log('⏸️ Cluster status: IDLE (no running chunks or active workers)')
}
// Convert strategies to ChunkResult format for recommendation
const topStrategies: ChunkResult[] = explorationData.strategies.map((s: any, idx: number) => ({
rank: idx + 1,
pnl_per_1k: s.pnl_per_1k || 0,
win_rate: s.win_rate || 0,
trades: s.total_trades || 0,
profit_factor: s.profit_factor || 0,
max_drawdown: s.max_drawdown || 0,
params: {
flip_threshold: s.flip_threshold || 0,
ma_gap: s.ma_gap || 0,
adx_min: s.momentum_adx || 0,
long_pos_max: s.momentum_long_pos || 0,
short_pos_min: s.momentum_short_pos || 0
}
}))
const recommendation = generateRecommendation(topStrategies)
return NextResponse.json({
@@ -181,26 +260,24 @@ export async function GET(request: NextRequest) {
activeWorkers,
totalWorkers: 2,
workerProcesses: totalProcesses,
status: activeWorkers > 0 ? 'active' : 'idle'
status: clusterStatus // Use database-aware status
},
workers,
exploration: {
totalCombinations: 11943936,
combinationsPerChunk: 10000,
totalChunks: 1195,
chunksCompleted: topStrategies.length > 0 ? 1 : 0,
currentChunk: topStrategies.length > 0 ? 'completed' : 'v9_chunk_000000',
progress: topStrategies.length > 0 ? 0.08 : 0.05 // Rough estimate
totalCombinations: explorationData.totalCombos,
testedCombinations: explorationData.testedCombos,
progress: explorationData.progress,
chunks: explorationData.chunks
},
topStrategies: topStrategies.slice(0, 5),
recommendation,
lastUpdate: new Date().toISOString()
})
} catch (error: any) {
console.error('Cluster status error:', error)
}, { status: 200 })
} catch (error) {
console.error('Error fetching cluster status:', error)
return NextResponse.json({
error: 'Failed to fetch cluster status',
details: error.message
details: error instanceof Error ? error.message : 'Unknown error'
}, { status: 500 })
}
}