big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Queue filter in CS UI v1 does not work as expected. Contributed by Chengbing Liu.

Browse Source
This commit is contained in:
Benjamin Teke 2022-06-17 19:27:58 +02:00
parent 4893f00395
commit 020201cb65
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
View File

@ -103,7 +103,7 @@ private void renderLeafQueueInfoWithPartition(Block html) {
? NodeLabel.DEFAULT_NODE_LABEL_PARTITION : nodeLabel; ? NodeLabel.DEFAULT_NODE_LABEL_PARTITION : nodeLabel;
// first display the queue's label specific details : // first display the queue's label specific details :
ResponseInfo ri = ResponseInfo ri =
info("\'" + lqinfo.getQueuePath().substring(5) info("\'" + lqinfo.getQueuePath()
+ "\' Queue Status for Partition \'" + nodeLabelDisplay + "\'"); + "\' Queue Status for Partition \'" + nodeLabelDisplay + "\'");
renderQueueCapacityInfo(ri, nodeLabel); renderQueueCapacityInfo(ri, nodeLabel);
html.__(InfoBlock.class); html.__(InfoBlock.class);
@ -113,7 +113,7 @@ private void renderLeafQueueInfoWithPartition(Block html) {
// second display the queue specific details : // second display the queue specific details :
ri = ri =
info("\'" + lqinfo.getQueuePath().substring(5) + "\' Queue Status") info("\'" + lqinfo.getQueuePath() + "\' Queue Status")
.__("Queue State:", lqinfo.getQueueState()); .__("Queue State:", lqinfo.getQueueState());
renderCommonLeafQueueInfo(ri); renderCommonLeafQueueInfo(ri);
@ -125,7 +125,7 @@ private void renderLeafQueueInfoWithPartition(Block html) {
private void renderLeafQueueInfoWithoutParition(Block html) { private void renderLeafQueueInfoWithoutParition(Block html) {
ResponseInfo ri = ResponseInfo ri =
info("\'" + lqinfo.getQueuePath().substring(5) + "\' Queue Status") info("\'" + lqinfo.getQueuePath() + "\' Queue Status")
.__("Queue State:", lqinfo.getQueueState()); .__("Queue State:", lqinfo.getQueueState());
renderQueueCapacityInfo(ri, ""); renderQueueCapacityInfo(ri, "");
renderCommonLeafQueueInfo(ri); renderCommonLeafQueueInfo(ri);
@ -348,7 +348,7 @@ public void render(Block html) {
span().$style(join(width(usedCapPercent), span().$style(join(width(usedCapPercent),
";font-size:1px;left:0%;", absUsedCap > absCap ? Q_OVER : Q_UNDER)). ";font-size:1px;left:0%;", absUsedCap > absCap ? Q_OVER : Q_UNDER)).
__('.').__(). __('.').__().
span(".q", "Queue: "+info.getQueuePath().substring(5)).__(). span(".q", info.getQueuePath()).__().
span().$class("qstats").$style(left(Q_STATS_POS)). span().$class("qstats").$style(left(Q_STATS_POS)).
__(join(percent(used), " used")).__(); __(join(percent(used), " used")).__();
@ -492,7 +492,7 @@ public void render(Block html) {
a(_Q).$style(width(Q_MAX_WIDTH)). a(_Q).$style(width(Q_MAX_WIDTH)).
span().$style(join(width(used), ";left:0%;", span().$style(join(width(used), ";left:0%;",
used > 1 ? Q_OVER : Q_UNDER)).__(".").__(). used > 1 ? Q_OVER : Q_UNDER)).__(".").__().
span(".q", "Queue: root").__(). span(".q", "root").__().
span().$class("qstats").$style(left(Q_STATS_POS)). span().$class("qstats").$style(left(Q_STATS_POS)).
__(join(percent(used), " used")).__(). __(join(percent(used), " used")).__().
__(QueueBlock.class).__(); __(QueueBlock.class).__();
@ -522,7 +522,7 @@ public void render(Block html) {
a(_Q).$style(width(Q_MAX_WIDTH)). a(_Q).$style(width(Q_MAX_WIDTH)).
span().$style(join(width(used), ";left:0%;", span().$style(join(width(used), ";left:0%;",
used > 1 ? Q_OVER : Q_UNDER)).__(".").__(). used > 1 ? Q_OVER : Q_UNDER)).__(".").__().
span(".q", "Queue: root").__(). span(".q", "root").__().
span().$class("qstats").$style(left(Q_STATS_POS)). span().$class("qstats").$style(left(Q_STATS_POS)).
__(join(percent(used), " used")).__(). __(join(percent(used), " used")).__().
__(QueueBlock.class).__().__(); __(QueueBlock.class).__().__();
@ -656,12 +656,9 @@ public void render(HtmlBlock.Block html) {
" }", " }",
" });", " });",
" $('#cs').bind('select_node.jstree', function(e, data) {", " $('#cs').bind('select_node.jstree', function(e, data) {",
" var q = $('.q', data.rslt.obj).first().text();", " var queues = $('.q', data.rslt.obj);",
" if (q == 'Queue: root') q = '';", " var q = '^' + queues.first().text();",
" else {", " q += queues.length == 1 ? '$' : '\\\\.';",
" q = q.substr(q.lastIndexOf(':') + 2);",
" q = '^' + q.substr(q.lastIndexOf('.') + 1) + '$';",
" }",
// Update this filter column index for queue if new columns are added // Update this filter column index for queue if new columns are added
// Current index for queue column is 5 // Current index for queue column is 5
" $('#apps').dataTable().fnFilter(q, 5, true);", " $('#apps').dataTable().fnFilter(q, 5, true);",