-
Notifications
You must be signed in to change notification settings - Fork 489
Added monitor activity page for Fate transaction details #6371
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
dlmarion
wants to merge
6
commits into
apache:main
Choose a base branch
from
dlmarion:monitor-fate-tx-activity
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
0d71ae6
Added monitor activity page for Fate transaction details
dlmarion e6b4368
Merge branch 'main' into monitor-fate-tx-activity
dlmarion 1dbeb22
Merge branch 'main' into monitor-fate-tx-activity
dlmarion 45917b2
Call different AdminUtil method to get lock information
dlmarion d499d8f
Changed lock range column to exclude protected information
dlmarion 562cca4
Update javadoc
dlmarion File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
107 changes: 107 additions & 0 deletions
107
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/fate.js
This file contains hidden or 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,107 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| "use strict"; | ||
|
|
||
| const fateHtmlTable = '#fateTable'; | ||
|
|
||
| var dataTableRef; | ||
|
|
||
| function getTableData() { | ||
| return getStoredArray(FATE); | ||
| } | ||
|
|
||
| function createDataTable() { | ||
| $(fateHtmlTable).find('thead').remove(); | ||
| $(fateHtmlTable).find('tbody').remove(); | ||
| dataTableRef = $(fateHtmlTable).DataTable({ | ||
| "autoWidth": false, | ||
| "ajax": function (data, callback) { | ||
| callback({ | ||
| data: getTableData() | ||
| }); | ||
| }, | ||
| "stateSave": true, | ||
| "colReorder": true, | ||
| "columnDefs": [{ | ||
| targets: '_all', | ||
| defaultContent: '-' | ||
| }], | ||
| "columns": [{ | ||
| "data": "type", | ||
| "title": "Type" | ||
| }, | ||
| { | ||
| "data": "op", | ||
| "title": "Operation" | ||
| }, | ||
| { | ||
| "data": "id", | ||
| "title": "Id" | ||
| }, | ||
| { | ||
| "data": "status", | ||
| "title": "State" | ||
| }, | ||
| { | ||
| "data": "created", | ||
| "title": "Created", | ||
| "render": function (data, type, row) { | ||
| if (type === 'display') data = dateFormat(data); | ||
| return data; | ||
| } | ||
| }, | ||
| { | ||
| "data": "created", | ||
| "title": "Age", | ||
| "render": function (data, type, row) { | ||
| var dur = Date.now() - data; | ||
| if (type === 'display') dur = timeDuration(dur); | ||
| return dur; | ||
| } | ||
| }, | ||
| { | ||
| "data": "heldLocks", | ||
| "title": "Locks Held" | ||
| }, | ||
| { | ||
| "data": "waitingLocks", | ||
| "title": "Locks Waiting On" | ||
| }, | ||
| { | ||
| "data": "lockRange", | ||
| "title": "Lock Range" | ||
| } | ||
| ] | ||
| }); | ||
| } | ||
|
|
||
| function refresh() { | ||
| return getFate().then(function () { | ||
| if (dataTableRef) { | ||
| ajaxReloadTable(dataTableRef); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
|
|
||
| $(function () { | ||
| getFate().then(function () { | ||
| createDataTable(); | ||
| }); | ||
| }); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I might be missing something but do we ever populate
emptyLocks,emptyLocks,emptyRanges? Given the names it seems like its intentional that they are empty but why render them in the UI at all in that case? Or are these placeholders for later?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I passed empty collections here because passing null would have caused a NPE. Looking at the code again, I think I need to make another change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In 45917b2 I used a different method on AdminUtil to get the lock information.