YARN-10974. Queue filter in CS UI v1 does not work as expected. Contributed by Chengbing Liu.
This commit is contained in:
parent
fb4e8172a0
commit
838b63d836
|
@ -103,7 +103,7 @@ class CapacitySchedulerPage extends RmView {
|
|||
? NodeLabel.DEFAULT_NODE_LABEL_PARTITION : nodeLabel;
|
||||
// first display the queue's label specific details :
|
||||
ResponseInfo ri =
|
||||
info("\'" + lqinfo.getQueuePath().substring(5)
|
||||
info("\'" + lqinfo.getQueuePath()
|
||||
+ "\' Queue Status for Partition \'" + nodeLabelDisplay + "\'");
|
||||
renderQueueCapacityInfo(ri, nodeLabel);
|
||||
html.__(InfoBlock.class);
|
||||
|
@ -113,7 +113,7 @@ class CapacitySchedulerPage extends RmView {
|
|||
|
||||
// second display the queue specific details :
|
||||
ri =
|
||||
info("\'" + lqinfo.getQueuePath().substring(5) + "\' Queue Status")
|
||||
info("\'" + lqinfo.getQueuePath() + "\' Queue Status")
|
||||
.__("Queue State:", lqinfo.getQueueState());
|
||||
renderCommonLeafQueueInfo(ri);
|
||||
|
||||
|
@ -125,7 +125,7 @@ class CapacitySchedulerPage extends RmView {
|
|||
|
||||
private void renderLeafQueueInfoWithoutParition(Block html) {
|
||||
ResponseInfo ri =
|
||||
info("\'" + lqinfo.getQueuePath().substring(5) + "\' Queue Status")
|
||||
info("\'" + lqinfo.getQueuePath() + "\' Queue Status")
|
||||
.__("Queue State:", lqinfo.getQueueState());
|
||||
renderQueueCapacityInfo(ri, "");
|
||||
renderCommonLeafQueueInfo(ri);
|
||||
|
@ -337,7 +337,7 @@ class CapacitySchedulerPage extends RmView {
|
|||
span().$style(join(width(usedCapPercent),
|
||||
";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)).
|
||||
__(join(percent(used), " used")).__();
|
||||
|
||||
|
@ -481,7 +481,7 @@ class CapacitySchedulerPage extends RmView {
|
|||
a(_Q).$style(width(Q_MAX_WIDTH)).
|
||||
span().$style(join(width(used), ";left:0%;",
|
||||
used > 1 ? Q_OVER : Q_UNDER)).__(".").__().
|
||||
span(".q", "Queue: root").__().
|
||||
span(".q", "root").__().
|
||||
span().$class("qstats").$style(left(Q_STATS_POS)).
|
||||
__(join(percent(used), " used")).__().
|
||||
__(QueueBlock.class).__();
|
||||
|
@ -511,7 +511,7 @@ class CapacitySchedulerPage extends RmView {
|
|||
a(_Q).$style(width(Q_MAX_WIDTH)).
|
||||
span().$style(join(width(used), ";left:0%;",
|
||||
used > 1 ? Q_OVER : Q_UNDER)).__(".").__().
|
||||
span(".q", "Queue: root").__().
|
||||
span(".q", "root").__().
|
||||
span().$class("qstats").$style(left(Q_STATS_POS)).
|
||||
__(join(percent(used), " used")).__().
|
||||
__(QueueBlock.class).__().__();
|
||||
|
@ -645,12 +645,9 @@ class CapacitySchedulerPage extends RmView {
|
|||
" }",
|
||||
" });",
|
||||
" $('#cs').bind('select_node.jstree', function(e, data) {",
|
||||
" var q = $('.q', data.rslt.obj).first().text();",
|
||||
" if (q == 'Queue: root') q = '';",
|
||||
" else {",
|
||||
" q = q.substr(q.lastIndexOf(':') + 2);",
|
||||
" q = '^' + q.substr(q.lastIndexOf('.') + 1) + '$';",
|
||||
" }",
|
||||
" var queues = $('.q', data.rslt.obj);",
|
||||
" var q = '^' + queues.first().text();",
|
||||
" q += queues.length == 1 ? '$' : '\\\\.';",
|
||||
" $('#apps').dataTable().fnFilter(q, 4, true);",
|
||||
" });",
|
||||
" $('#cs').show();",
|
||||
|
|
Loading…
Reference in New Issue