From f19790589cc89e6ca910aa7fd8504c9f5346cefa Mon Sep 17 00:00:00 2001 From: Igor Gaponenko Date: Mon, 5 Feb 2024 23:59:48 +0000 Subject: [PATCH] Web Dashboard: Extend tasks monitoring page to display czar ids --- src/wbase/Task.cc | 1 + src/www/qserv/js/QservWorkerTasks.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/wbase/Task.cc b/src/wbase/Task.cc index 1dec01c00..2eebe67d7 100644 --- a/src/wbase/Task.cc +++ b/src/wbase/Task.cc @@ -465,6 +465,7 @@ memman::MemMan::Status Task::getMemHandleStatus() { nlohmann::json Task::getJson() const { // It would be nice to have the _queryString in this, but that could make the results very large. nlohmann::json js; + js["czarId"] = _czarId; js["queryId"] = _qId; js["templateId"] = getTemplateId(); js["jobId"] = _jId; diff --git a/src/www/qserv/js/QservWorkerTasks.js b/src/www/qserv/js/QservWorkerTasks.js index 651d8a032..5f7e67888 100644 --- a/src/www/qserv/js/QservWorkerTasks.js +++ b/src/www/qserv/js/QservWorkerTasks.js @@ -110,6 +110,7 @@ function(CSSLoader, QID inter + czar job chunk sub-ch @@ -290,6 +291,7 @@ function(CSSLoader, numTasksTotal += query_stats[queryId].tasks.total; numTasksSelected += query_stats[queryId].tasks.selected; let scanInteractive = false; + let czarId = -1; let tasks = _.sortBy(query_stats[queryId].tasks.entries, 'state'); const snapshotTime_msec = query_stats[queryId].tasks.snapshotTime_msec; let prevJobId = -1; @@ -297,6 +299,7 @@ function(CSSLoader, let task = tasks[j]; // In theory all tasks of the same query should have it the same. scanInteractive = task.scanInteractive; + czarId = task.czarId; // Display jobId and chunkId for the first subchunk of a job only. These parameters // should have the same value for all subchunk tasks. let jobId = ''; @@ -341,6 +344,7 @@ function(CSSLoader,
${scanInteractive ? "yes" : "no"}
+
${czarId}
` + htmlTasks; } }