-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added a monitor for the results filesystem
Also, extended the Web Dashboard to display the filesystem status and usage statistics.
- Loading branch information
1 parent
74e5187
commit cc60822
Showing
7 changed files
with
266 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #fwk-qserv-results-filesystem-controls label { | ||
| font-weight: bold; | ||
| } | ||
| table#fwk-qserv-results-filesystem caption { | ||
| caption-side: top; | ||
| text-align: right; | ||
| padding-top: 0; | ||
| } | ||
| table#fwk-qserv-results-filesystem tbody th, | ||
| table#fwk-qserv-results-filesystem tbody td { | ||
| vertical-align:middle; | ||
| } | ||
| table#fwk-qserv-results-filesystem pre { | ||
| padding: 0; | ||
| margin: 0; | ||
| } | ||
| table#fwk-qserv-results-filesystem caption.updating { | ||
| background-color: #ffeeba; | ||
| } | ||
| table#fwk-qserv-results-filesystem > thead > tr > th.sticky { | ||
| position:sticky; | ||
| top:80px; | ||
| z-index:2; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
| define([ | ||
| 'webfwk/CSSLoader', | ||
| 'webfwk/Fwk', | ||
| 'webfwk/FwkApplication', | ||
| 'qserv/Common', | ||
| 'underscore'], | ||
|
|
||
| function(CSSLoader, | ||
| Fwk, | ||
| FwkApplication, | ||
| Common, | ||
| _) { | ||
|
|
||
| CSSLoader.load('qserv/css/QservWorkerResultsFilesystem.css'); | ||
|
|
||
| class QservWorkerResultsFilesystem extends FwkApplication { | ||
|
|
||
| constructor(name) { | ||
| super(name); | ||
| } | ||
| fwk_app_on_show() { | ||
| console.log('show: ' + this.fwk_app_name); | ||
| this.fwk_app_on_update(); | ||
| } | ||
| fwk_app_on_hide() { | ||
| console.log('hide: ' + this.fwk_app_name); | ||
| } | ||
| fwk_app_on_update() { | ||
| if (this.fwk_app_visible) { | ||
| this._init(); | ||
| if (this._prev_update_sec === undefined) { | ||
| this._prev_update_sec = 0; | ||
| } | ||
| let now_sec = Fwk.now().sec; | ||
| if (now_sec - this._prev_update_sec > this._update_interval_sec()) { | ||
| this._prev_update_sec = now_sec; | ||
| this._init(); | ||
| this._load(); | ||
| } | ||
| } | ||
| } | ||
| _init() { | ||
| if (this._initialized === undefined) this._initialized = false; | ||
| if (this._initialized) return; | ||
| this._initialized = true; | ||
| let html = ` | ||
| <div class="row" id="fwk-qserv-results-filesystem-controls"> | ||
| <div class="col"> | ||
| <div class="form-row"> | ||
| <div class="form-group col-md-1"> | ||
| <label for="update-interval"><i class="bi bi-arrow-repeat"></i> interval:</label> | ||
| <select id="update-interval" class="form-control form-control-selector"> | ||
| <option value="5">5 sec</option> | ||
| <option value="10" selected>10 sec</option> | ||
| <option value="20">20 sec</option> | ||
| <option value="30">30 sec</option> | ||
| <option value="60">1 min</option> | ||
| <option value="120">2 min</option> | ||
| <option value="300">5 min</option> | ||
| </select> | ||
| </div> | ||
| <div class="form-group col-md-1"> | ||
| <label for="reset-controls-form"> </label> | ||
| <button id="reset-controls-form" class="btn btn-primary form-control">Reset</button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col"> | ||
| <table class="table table-sm table-hover table-bordered" id="fwk-qserv-results-filesystem"> | ||
| <thead class="thead-light"> | ||
| <tr> | ||
| <th class="sticky">worker</th> | ||
| <th class="sticky">protocol</th> | ||
| <th class="sticky">folder</th> | ||
| <th class="sticky" style="text-align:right;">capacity [GB]</th> | ||
| <th class="sticky" style="text-align:right;">free [GB]</th> | ||
| <th class="sticky" style="text-align:right;">available [GB]</th> | ||
| <th class="sticky" style="text-align:right;">used [%]</th> | ||
| <th class="sticky" style="text-align:right;">#files</th> | ||
| <th class="sticky" style="text-align:right;">size [GB]</th> | ||
| </tr> | ||
| </thead> | ||
| <caption class="updating">Loading...</caption> | ||
| <tbody></tbody> | ||
| </table> | ||
| </div> | ||
| </div>`; | ||
| let cont = this.fwk_app_container.html(html); | ||
| cont.find(".form-control-selector").change(() => { | ||
| this._load(); | ||
| }); | ||
| cont.find("button#reset-controls-form").click(() => { | ||
| this._set_update_interval_sec(10); | ||
| this._load(); | ||
| }); | ||
| } | ||
| _form_control(elem_type, id) { | ||
| if (this._form_control_obj === undefined) this._form_control_obj = {}; | ||
| if (!_.has(this._form_control_obj, id)) { | ||
| this._form_control_obj[id] = this.fwk_app_container.find(elem_type + '#' + id); | ||
| } | ||
| return this._form_control_obj[id]; | ||
| } | ||
| _update_interval_sec() { return this._form_control('select', 'update-interval').val(); } | ||
| _set_update_interval_sec(val) { this._form_control('select', 'update-interval').val(val); } | ||
|
|
||
| /** | ||
| * Table for displaying info on MySQL connections that are being open at workers. | ||
| */ | ||
| _table() { | ||
| if (this._table_obj === undefined) { | ||
| this._table_obj = this.fwk_app_container.find('table#fwk-qserv-results-filesystem'); | ||
| } | ||
| return this._table_obj; | ||
| } | ||
|
|
||
| /** | ||
| * Load data from a web service then render it to the application's page. | ||
| */ | ||
| _load() { | ||
| if (this._loading === undefined) this._loading = false; | ||
| if (this._loading) return; | ||
| this._loading = true; | ||
|
|
||
| this._table().children('caption').addClass('updating'); | ||
|
|
||
| Fwk.web_service_GET( | ||
| "/replication/qserv/worker/status", | ||
| {timeout_sec: 2, version: Common.RestAPIVersion}, | ||
| (data) => { | ||
| this._display(data.status); | ||
| Fwk.setLastUpdate(this._table().children('caption')); | ||
| this._table().children('caption').removeClass('updating'); | ||
| this._loading = false; | ||
| }, | ||
| (msg) => { | ||
| console.log('request failed', this.fwk_app_name, msg); | ||
| this._table().children('caption').html('<span style="color:maroon">No Response</span>'); | ||
| this._table().children('caption').removeClass('updating'); | ||
| this._loading = false; | ||
| } | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Display MySQL connections | ||
| */ | ||
| _display(data) { | ||
| let html = ''; | ||
| for (let worker in data) { | ||
| if (!data[worker].success) { | ||
| html += ` | ||
| <tr> | ||
| <th class="table-warning">${worker}</th> | ||
| <td class="table-secondary"> </td> | ||
| <td class="table-secondary"> </td> | ||
| <td class="table-secondary"> </td> | ||
| <td class="table-secondary"> </td> | ||
| <td class="table-secondary"> </td> | ||
| <td class="table-secondary"> </td> | ||
| <td class="table-secondary"> </td> | ||
| <td class="table-secondary"> </td> | ||
| </tr>`; | ||
| } else { | ||
| let filesystem = data[worker].info.filesystem; | ||
| const used = (filesystem.capacity_bytes > 0 && filesystem.available_bytes > 0) ? | ||
| (100.0 * (filesystem.capacity_bytes - filesystem.available_bytes) / filesystem.capacity_bytes).toFixed(1) : | ||
| -1; | ||
| html += ` | ||
| <tr> | ||
| <th>${worker}</th> | ||
| <td>${filesystem.protocol}</td> | ||
| <td>${filesystem.folder}</td> | ||
| <td style="text-align:right;"><pre>${QservWorkerResultsFilesystem._bytes2gb(filesystem.capacity_bytes)}</pre></td> | ||
| <td style="text-align:right;"><pre>${QservWorkerResultsFilesystem._bytes2gb(filesystem.free_bytes)}</pre></td> | ||
| <td style="text-align:right;"><pre>${QservWorkerResultsFilesystem._bytes2gb(filesystem.available_bytes)}</pre></td> | ||
| <td style="text-align:right;"><pre>${used}</pre></td> | ||
| <td style="text-align:right;"><pre>${filesystem.num_result_files}</pre></td> | ||
| <td style="text-align:right;"><pre>${QservWorkerResultsFilesystem._bytes2gb(filesystem.size_result_files_bytes)}</pre></td> | ||
| </tr>`; | ||
| } | ||
| } | ||
| this._table().children('tbody').html(html); | ||
| } | ||
| static _GiB = 1024 * 1024 * 1024; | ||
| static _bytes2gb(bytes) { | ||
| return bytes < 0 ? bytes : (bytes / QservWorkerResultsFilesystem._GiB).toFixed(1); | ||
| } | ||
| } | ||
| return QservWorkerResultsFilesystem; | ||
| }); |