WIP: Enable shared clients on testsuite level

cmd/hiveview/assets/lib/app-suite.js

@@ -317,21 +317,175 @@ function deselectTest(row, closeDetails) {
     history.replaceState(null, null, '#');
 }
 
-function testHasClients(testData) {
-    return testData.clientInfo && Object.getOwnPropertyNames(testData.clientInfo).length > 0;
+function testHasClients(testData, suiteData) {
+    if (testData.clientInfo && Object.getOwnPropertyNames(testData.clientInfo).length > 0) {
+        return true;
+    }
+
+    if (testData.summaryResult && testData.summaryResult.clientLogs && 
+        Object.keys(testData.summaryResult.clientLogs).length > 0) {
+        return true;
+    }
+
+    if (suiteData && suiteData.clientInfo) {
+        for (let clientID in suiteData.clientInfo) {
+            let clientName = suiteData.clientInfo[clientID].name;
+            if (testData.name.includes(clientName)) {
+                return true;
+            }
+        }
+    }
+
+    return false;
 }
 
 // formatClientLogsList turns the clientInfo part of a test into a list of links.
 function formatClientLogsList(suiteData, testIndex, clientInfo) {
     let links = [];
-    for (let instanceID in clientInfo) {
-        let instanceInfo = clientInfo[instanceID];
-        let logfile = routes.resultsRoot + instanceInfo.logFile;
-        let url = routes.clientLog(suiteData.suiteID, suiteData.name, testIndex, logfile);
-        let link = html.makeLink(url, instanceInfo.name);
-        link.classList.add('log-link');
-        links.push(link.outerHTML);
+    let testCase = suiteData.testCases[testIndex];
+    let usedSharedClients = new Set(); // Track which shared clients were used in this test
+
+    // First, check if the test has specific information about which shared clients it used
+    if (testCase && testCase.summaryResult && testCase.summaryResult.clientLogs) {
+        for (let clientID in testCase.summaryResult.clientLogs) {
+            usedSharedClients.add(clientID);
+        }
+    }
+
+    // Handle clients listed directly in the test's clientInfo
+    if (clientInfo) {
+        for (let instanceID in clientInfo) {
+            let instanceInfo = clientInfo[instanceID];
+
+            // Skip if no log file
+            if (!instanceInfo.logFile) {
+                continue;
+            }
+
+            // If it's a shared client, mark it as used
+            if (instanceInfo.isShared) {
+                usedSharedClients.add(instanceID);
+            }
+
+            let logfile = routes.resultsRoot + instanceInfo.logFile;
+            let url = routes.clientLog(suiteData.suiteID, suiteData.name, testIndex, logfile);
+
+            // Check if this is a shared client with a log segment
+            let hasSegment = testCase && 
+                             testCase.summaryResult && 
+                             testCase.summaryResult.clientLogs && 
+                             testCase.summaryResult.clientLogs[instanceID];
+
+            if (hasSegment) {
+                // If we have a log segment, update the URL to include the line numbers
+                const clientLogInfo = testCase.summaryResult.clientLogs[instanceID];
+
+                // Use line numbers from the backend
+                url += `#L${clientLogInfo.startLine}-${clientLogInfo.endLine}`;
+            }
+
+            // Add "(shared)" indicator for shared clients
+            let clientName = instanceInfo.name;
+            if (instanceInfo.isShared || hasSegment) {
+                clientName += " (shared)";
+            }
+
+            let link = html.makeLink(url, clientName);
+            link.classList.add('log-link');
+            if (instanceInfo.isShared) {
+                link.classList.add('shared-client-log');
+            }
+            links.push(link.outerHTML);
+        }
+    }
+
+    // For backward compatibility - if test name includes client name, add that client
+    // This handles the case where tests don't yet have clientInfo or clientLogs properly populated
+    if (suiteData.clientInfo) {
+
+        // First try to match by existing client logs
+        if (usedSharedClients.size === 0) {
+            // Group clients by name to identify if there are multiple of the same type
+            let clientsByName = {};
+            for (let instanceID in suiteData.clientInfo) {
+                let sharedClient = suiteData.clientInfo[instanceID];
+                if (!sharedClient.logFile) continue; // Skip if no log file
+
+                // Add to the clients by name map
+                if (!clientsByName[sharedClient.name]) {
+                    clientsByName[sharedClient.name] = [];
+                }
+                clientsByName[sharedClient.name].push({id: instanceID, client: sharedClient});
+            }
+
+            // Now check test name for client match, but only if there's exactly one client of that type
+            for (let clientName in clientsByName) {
+                if (testCase.name.includes(clientName) && clientsByName[clientName].length === 1) {
+                    // If there's exactly one client of this type, it's safe to auto-register
+                    let instanceID = clientsByName[clientName][0].id;
+                    usedSharedClients.add(instanceID);
+                }
+            }
+        }
+
+        // Now add all the used shared clients that haven't been handled yet
+        for (let instanceID in suiteData.clientInfo) {
+            // First check if this client is explicitly registered in the test's clientLogs
+            // This is the most reliable way to determine if a client was used in a test
+            const explicitlyRegistered = testCase && 
+                                       testCase.summaryResult && 
+                                       testCase.summaryResult.clientLogs && 
+                                       testCase.summaryResult.clientLogs[instanceID];
+
+            if (explicitlyRegistered) {
+                usedSharedClients.add(instanceID);
+            }
+
+            // Skip if not used by this test (based on explicit tracking or name matching)
+            if (!usedSharedClients.has(instanceID)) {
+                continue;
+            }
+
+            // Skip clients already handled in clientInfo
+            if (clientInfo && instanceID in clientInfo) {
+                continue;
+            }
+
+            let sharedClient = suiteData.clientInfo[instanceID];
+
+            // Skip if no log file
+            if (!sharedClient.logFile) {
+                continue;
+            }
+
+            // Create a link to the full log file for this shared client
+            let logfile = routes.resultsRoot + sharedClient.logFile;
+            let url = routes.clientLog(suiteData.suiteID, suiteData.name, testIndex, logfile);
+
+            // Check if we have specific log segments for this client in this test
+            let hasSegment = testCase && 
+                             testCase.summaryResult && 
+                             testCase.summaryResult.clientLogs && 
+                             testCase.summaryResult.clientLogs[instanceID];
+
+            if (hasSegment) {
+                // If we have a log segment, update the URL to include the line numbers
+                const clientLogInfo = testCase.summaryResult.clientLogs[instanceID];
+
+                // Only add line range if we have valid line numbers (both > 0)
+                if (clientLogInfo.startLine > 0 && clientLogInfo.endLine > 0) {
+                    url += `#L${clientLogInfo.startLine}-${clientLogInfo.endLine}`;
+                }
+            }
+
+            let clientName = sharedClient.name + " (shared)";
+            let link = html.makeLink(url, clientName);
+
+            link.classList.add('log-link', 'shared-client-log');
+            links.push(link.outerHTML);
+        }
     }
+
     return links.join(', ');
 }
 
@@ -360,7 +514,7 @@ function formatTestDetails(suiteData, row) {
         p.innerHTML = formatTestStatus(d.summaryResult);
         container.appendChild(p);
     }
-    if (!row.column('logs:name').responsiveHidden() && testHasClients(d)) {
+    if (!row.column('logs:name').responsiveHidden() && testHasClients(d, suiteData)) {
         let p = document.createElement('p');
         p.innerHTML = '<b>Clients:</b> ' + formatClientLogsList(suiteData, d.testIndex, d.clientInfo);
         container.appendChild(p);

cmd/hiveview/assets/lib/app-viewer.js

@@ -12,10 +12,16 @@ import { formatBytes, queryParam } from './utils.js';
 $(document).ready(function () {
     common.updateHeader();
 
-    // Check for line number in hash.
-    var line = null;
-    if (window.location.hash.substr(1, 1) == 'L') {
-        line = parseInt(window.location.hash.substr(2));
+    // Check for line number or line range in hash.
+    var startLine = null;
+    var endLine = null;
+    var hash = window.location.hash.substr(1);
+    if (hash.startsWith('L')) {
+        var range = hash.substr(1).split('-');
+        startLine = parseInt(range[0]);
+        if (range.length > 1) {
+            endLine = parseInt(range[1]);
+        }
     }
 
     // Get suite context.
@@ -33,7 +39,7 @@ $(document).ready(function () {
             showError('Invalid parameters! Missing \'suitefile\' or \'testid\' in URL.');
             return;
         }
-        fetchTestLog(routes.resultsRoot + suiteFile, testIndex, line);
+        fetchTestLog(routes.resultsRoot + suiteFile, testIndex, startLine, endLine);
         return;
     }
 
@@ -42,35 +48,61 @@ $(document).ready(function () {
     if (file) {
         $('#fileload').val(file);
         showText('Loading file...');
-        fetchFile(file, line);
+        fetchFile(file, startLine, endLine);
         return;
     }
 
     // Show default text because nothing was loaded.
     showText(document.getElementById('exampletext').innerHTML);
 });
 
-// setHL sets the highlight on a line number.
-function setHL(num, scroll) {
+// setHL sets the highlight on a line number or range of lines.
+function setHL(startLine, endLine, scroll) {
     // out with the old
     $('.highlighted').removeClass('highlighted');
-    if (!num) {
+    if (!startLine) {
         return;
     }
 
     let contentArea = document.getElementById('file-content');
     let gutter = document.getElementById('gutter');
-    let numElem = gutter.children[num - 1];
-    if (!numElem) {
-        console.error('invalid line number:', num);
-        return;
+
+    // Calculate the end line if not provided
+    if (!endLine) {
+        endLine = startLine;
+    }
+
+    // Calculate max available lines and adjust range if needed
+    const maxLines = gutter.children.length;
+
+    // Check if the requested range is beyond the file size
+    if (startLine > maxLines) {
+        startLine = 1;
+    }
+
+    if (endLine > maxLines) {
+        endLine = maxLines;
     }
-    // in with the new
-    let lineElem = contentArea.children[num - 1];
-    $(numElem).addClass('highlighted');
-    $(lineElem).addClass('highlighted');
+
+    // Highlight all lines in the adjusted range
+    for (let num = startLine; num <= endLine; num++) {
+        let numElem = gutter.children[num - 1];
+        if (!numElem) {
+            // Skip invalid line numbers
+            continue;
+        }
+
+        let lineElem = contentArea.children[num - 1];
+        $(numElem).addClass('highlighted');
+        $(lineElem).addClass('highlighted');
+    }
+
+    // Scroll to the start of the highlighted range
     if (scroll) {
-        numElem.scrollIntoView();
+        let firstNumElem = gutter.children[startLine - 1];
+        if (firstNumElem) {
+            firstNumElem.scrollIntoView();
+        }
     }
 }
 
@@ -163,12 +195,12 @@ function appendLine(contentArea, gutter, number, text) {
 }
 
 function lineNumberClicked() {
-    setHL($(this).attr('line'), false);
+    setHL(parseInt($(this).attr('line')), null, false);
     history.replaceState(null, null, '#' + $(this).attr('id'));
 }
 
 // fetchFile loads up a new file to view
-async function fetchFile(url, line /* optional jump to line */ ) {
+async function fetchFile(url, startLine, endLine) {
     let resultsRE = new RegExp('^' + routes.resultsRoot);
     let text;
     try {
@@ -181,11 +213,11 @@ async function fetchFile(url, line /* optional jump to line */ ) {
     let title = url.replace(resultsRE, '');
     showTitle(null, title);
     showText(text);
-    setHL(line, true);
+    setHL(startLine, endLine, true);
 }
 
 // fetchTestLog loads the suite file and displays the output of a test.
-async function fetchTestLog(suiteFile, testIndex, line) {
+async function fetchTestLog(suiteFile, testIndex, startLine, endLine) {
     let data;
     try {
         data = await load(suiteFile, 'json');
@@ -221,7 +253,7 @@ async function fetchTestLog(suiteFile, testIndex, line) {
     }
     showTitle('Test:', name);
     showText(logtext);
-    setHL(line, true);
+    setHL(startLine, endLine, true);
 }
 
 async function load(url, dataType) {

hivesim/data.go

@@ -23,6 +23,18 @@ type TestStartInfo struct {
 	Description string `json:"description"`
 }
 
+// LogOffset tracks the start and end positions in a log file.
+type LogOffset struct {
+	Start int64 `json:"start"` // Byte offset where this section begins
+	End   int64 `json:"end"`   // Byte offset where this section ends
+}
+
+// ClientLogInfo tracks log offsets for a specific client in a test.
+type ClientLogInfo struct {
+	ClientID  string    `json:"client_id"` // ID of the client container
+	LogOffset LogOffset `json:"log_offset"` // Offset range in the log file
+}
+
 // ExecInfo is the result of running a command in a client container.
 type ExecInfo struct {
 	Stdout   string `json:"stdout"`
@@ -46,3 +58,24 @@ type ClientDefinition struct {
 func (m *ClientDefinition) HasRole(role string) bool {
 	return slices.Contains(m.Meta.Roles, role)
 }
+
+// ClientMode defines whether a client is shared across tests or dedicated to a single test.
+// Two modes are supported: DedicatedClient (default) and SharedClient.
+type ClientMode int
+
+const (
+	// DedicatedClient is a client that is used for a single test (default behavior)
+	DedicatedClient ClientMode = iota
+	// SharedClient is a client that is shared across multiple tests in a suite
+	SharedClient
+)
+
+// SharedClientInfo contains information about a shared client instance.
+// This includes container identification and connectivity information.
+type SharedClientInfo struct {
+	ID        string // Container ID
+	Type      string // Client type
+	IP        string // Client IP address
+	CreatedAt int64  // Timestamp when client was created
+	LogFile   string // Path to client log file
+}