aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-12-03 17:59:03 +0100
committerGitHub <noreply@github.com>2021-12-03 17:59:03 +0100
commit0aa8f07b3adbcda6bfa811dbafb4e4b19f00a5dd (patch)
tree2252e345debbd5b905c77871401341895b3fe627
parent6424ef0812135cee72ebf4f6c348ed20ad640fdb (diff)
parenta9ddf0f3a6fdc6896057e245410d29cd8ce6a74b (diff)
Merge pull request #20361 from vespa-engine/vekterli/fix-active-merge-status-rendering
Fix active merge state count status page rendering
-rw-r--r--storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
index 152cda74d9b..c6991803b4d 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
@@ -1308,10 +1308,10 @@ FileStorHandlerImpl::getStatus(std::ostream& out, const framework::HttpUrlPath&
}
std::lock_guard mergeGuard(_mergeStatesLock);
- out << "<tr><td>Active merge operations</td><td>" << _mergeStates.size() << "</td></tr>\n";
+ out << "<p>Active merge operations: " << _mergeStates.size() << "</p>\n";
if (verbose) {
out << "<h4>Active merges</h4>\n";
- if (_mergeStates.size() == 0) {
+ if (_mergeStates.empty()) {
out << "None\n";
}
for (auto & entry : _mergeStates) {