You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@impala.apache.org by "Thomas Tauber-Marshall (Code Review)" <ge...@cloudera.org> on 2019/09/03 22:58:33 UTC

[Impala-ASF-CR] IMPALA-8897 (part 2): Fix javascript to work with Knox integration 

Thomas Tauber-Marshall has uploaded this change for review. ( http://gerrit.cloudera.org:8080/14173


Change subject: IMPALA-8897 (part 2): Fix javascript to work with Knox integration
......................................................................

IMPALA-8897 (part 2): Fix javascript to work with Knox integration

This patch qualifies all urls accessed via javascript in the webui
with the appropriate host:port in order to allow these urls to work
when the connection to the webui is being proxied through Apache Knox.

It accomplishes this with the function make_url(), which takes the
href of a link from the page, which may have been rewritten by Knox,
and appends a path to it.

This patch also fixes on issue on the /admissions page, where
resetting a pool's stats could fail due to the page being reloaded
before the reset is executed. Fixed by moving the call to reload to
the completion callback for the 'reset' endpoint.

Testing:
- Added a regex to test_knox_compatability that performs a rough check
  for places in the tmpl files where urls are used in javascript
  without calling make_url().

Change-Id: I3de9fd1bbb8bb38ce63b3160fcafd33eb0530581
---
M tests/webserver/test_web_pages.py
M www/admission_controller.tmpl
M www/common-header.tmpl
M www/query_plan.tmpl
M www/query_summary.tmpl
M www/rpcz.tmpl
6 files changed, 36 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.cloudera.org:29418/Impala-ASF refs/changes/73/14173/1
-- 
To view, visit http://gerrit.cloudera.org:8080/14173
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: Impala-ASF
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3de9fd1bbb8bb38ce63b3160fcafd33eb0530581
Gerrit-Change-Number: 14173
Gerrit-PatchSet: 1
Gerrit-Owner: Thomas Tauber-Marshall <tm...@cloudera.com>

[Impala-ASF-CR] IMPALA-8897 (part 2): Fix javascript to work with Knox integration

Posted by "Impala Public Jenkins (Code Review)" <ge...@cloudera.org>.
Impala Public Jenkins has posted comments on this change. ( http://gerrit.cloudera.org:8080/14173 )

Change subject: IMPALA-8897 (part 2): Fix javascript to work with Knox integration
......................................................................


Patch Set 3: Verified+1


-- 
To view, visit http://gerrit.cloudera.org:8080/14173
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: Impala-ASF
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I3de9fd1bbb8bb38ce63b3160fcafd33eb0530581
Gerrit-Change-Number: 14173
Gerrit-PatchSet: 3
Gerrit-Owner: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Reviewer: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Tim Armstrong <ta...@cloudera.com>
Gerrit-Comment-Date: Thu, 05 Sep 2019 22:52:04 +0000
Gerrit-HasComments: No

[Impala-ASF-CR] IMPALA-8897 (part 2): Fix javascript to work with Knox integration

Posted by "Impala Public Jenkins (Code Review)" <ge...@cloudera.org>.
Impala Public Jenkins has posted comments on this change. ( http://gerrit.cloudera.org:8080/14173 )

Change subject: IMPALA-8897 (part 2): Fix javascript to work with Knox integration
......................................................................


Patch Set 2:

Build Successful 

https://jenkins.impala.io/job/gerrit-code-review-checks/4473/ : Initial code review checks passed. Use gerrit-verify-dryrun-external or gerrit-verify-dryrun to run full precommit tests.


-- 
To view, visit http://gerrit.cloudera.org:8080/14173
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: Impala-ASF
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I3de9fd1bbb8bb38ce63b3160fcafd33eb0530581
Gerrit-Change-Number: 14173
Gerrit-PatchSet: 2
Gerrit-Owner: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Reviewer: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Tim Armstrong <ta...@cloudera.com>
Gerrit-Comment-Date: Thu, 05 Sep 2019 19:10:50 +0000
Gerrit-HasComments: No

[Impala-ASF-CR] IMPALA-8897 (part 2): Fix javascript to work with Knox integration

Posted by "Impala Public Jenkins (Code Review)" <ge...@cloudera.org>.
Impala Public Jenkins has posted comments on this change. ( http://gerrit.cloudera.org:8080/14173 )

Change subject: IMPALA-8897 (part 2): Fix javascript to work with Knox integration
......................................................................


Patch Set 3:

Build started: https://jenkins.impala.io/job/gerrit-verify-dryrun/4885/ DRY_RUN=false


-- 
To view, visit http://gerrit.cloudera.org:8080/14173
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: Impala-ASF
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I3de9fd1bbb8bb38ce63b3160fcafd33eb0530581
Gerrit-Change-Number: 14173
Gerrit-PatchSet: 3
Gerrit-Owner: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Reviewer: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Tim Armstrong <ta...@cloudera.com>
Gerrit-Comment-Date: Thu, 05 Sep 2019 18:44:03 +0000
Gerrit-HasComments: No

[Impala-ASF-CR] IMPALA-8897 (part 2): Fix javascript to work with Knox integration

Posted by "Impala Public Jenkins (Code Review)" <ge...@cloudera.org>.
Impala Public Jenkins has posted comments on this change. ( http://gerrit.cloudera.org:8080/14173 )

Change subject: IMPALA-8897 (part 2): Fix javascript to work with Knox integration
......................................................................


Patch Set 3: Code-Review+2


-- 
To view, visit http://gerrit.cloudera.org:8080/14173
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: Impala-ASF
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I3de9fd1bbb8bb38ce63b3160fcafd33eb0530581
Gerrit-Change-Number: 14173
Gerrit-PatchSet: 3
Gerrit-Owner: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Reviewer: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Tim Armstrong <ta...@cloudera.com>
Gerrit-Comment-Date: Thu, 05 Sep 2019 18:44:02 +0000
Gerrit-HasComments: No

[Impala-ASF-CR] IMPALA-8897 (part 2): Fix javascript to work with Knox integration

Posted by "Impala Public Jenkins (Code Review)" <ge...@cloudera.org>.
Impala Public Jenkins has submitted this change and it was merged. ( http://gerrit.cloudera.org:8080/14173 )

Change subject: IMPALA-8897 (part 2): Fix javascript to work with Knox integration
......................................................................

IMPALA-8897 (part 2): Fix javascript to work with Knox integration

This patch qualifies all urls accessed via javascript in the webui
with the appropriate host:port in order to allow these urls to work
when the connection to the webui is being proxied through Apache Knox.

It accomplishes this with the function make_url(), which takes the
href of a link from the page, which may have been rewritten by Knox,
and appends a path to it.

This patch also fixes on issue on the /admissions page, where
resetting a pool's stats could fail due to the page being reloaded
before the reset is executed. Fixed by moving the call to reload to
the completion callback for the 'reset' endpoint.

Testing:
- Added a regex to test_knox_compatability that performs a rough check
  for places in the tmpl files where urls are used in javascript
  without calling make_url().

Change-Id: I3de9fd1bbb8bb38ce63b3160fcafd33eb0530581
Reviewed-on: http://gerrit.cloudera.org:8080/14173
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
M tests/webserver/test_web_pages.py
M www/admission_controller.tmpl
M www/common-header.tmpl
M www/query_plan.tmpl
M www/query_summary.tmpl
M www/rpcz.tmpl
6 files changed, 38 insertions(+), 13 deletions(-)

Approvals:
  Impala Public Jenkins: Looks good to me, approved; Verified

-- 
To view, visit http://gerrit.cloudera.org:8080/14173
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: Impala-ASF
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I3de9fd1bbb8bb38ce63b3160fcafd33eb0530581
Gerrit-Change-Number: 14173
Gerrit-PatchSet: 4
Gerrit-Owner: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Reviewer: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Tim Armstrong <ta...@cloudera.com>

[Impala-ASF-CR] IMPALA-8897 (part 2): Fix javascript to work with Knox integration

Posted by "Tim Armstrong (Code Review)" <ge...@cloudera.org>.
Tim Armstrong has posted comments on this change. ( http://gerrit.cloudera.org:8080/14173 )

Change subject: IMPALA-8897 (part 2): Fix javascript to work with Knox integration
......................................................................


Patch Set 2: Code-Review+2


-- 
To view, visit http://gerrit.cloudera.org:8080/14173
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: Impala-ASF
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I3de9fd1bbb8bb38ce63b3160fcafd33eb0530581
Gerrit-Change-Number: 14173
Gerrit-PatchSet: 2
Gerrit-Owner: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Reviewer: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Tim Armstrong <ta...@cloudera.com>
Gerrit-Comment-Date: Thu, 05 Sep 2019 18:40:31 +0000
Gerrit-HasComments: No

[Impala-ASF-CR] IMPALA-8897 (part 2): Fix javascript to work with Knox integration

Posted by "Thomas Tauber-Marshall (Code Review)" <ge...@cloudera.org>.
Hello Tim Armstrong, Impala Public Jenkins, 

I'd like you to reexamine a change. Please visit

    http://gerrit.cloudera.org:8080/14173

to look at the new patch set (#2).

Change subject: IMPALA-8897 (part 2): Fix javascript to work with Knox integration
......................................................................

IMPALA-8897 (part 2): Fix javascript to work with Knox integration

This patch qualifies all urls accessed via javascript in the webui
with the appropriate host:port in order to allow these urls to work
when the connection to the webui is being proxied through Apache Knox.

It accomplishes this with the function make_url(), which takes the
href of a link from the page, which may have been rewritten by Knox,
and appends a path to it.

This patch also fixes on issue on the /admissions page, where
resetting a pool's stats could fail due to the page being reloaded
before the reset is executed. Fixed by moving the call to reload to
the completion callback for the 'reset' endpoint.

Testing:
- Added a regex to test_knox_compatability that performs a rough check
  for places in the tmpl files where urls are used in javascript
  without calling make_url().

Change-Id: I3de9fd1bbb8bb38ce63b3160fcafd33eb0530581
---
M tests/webserver/test_web_pages.py
M www/admission_controller.tmpl
M www/common-header.tmpl
M www/query_plan.tmpl
M www/query_summary.tmpl
M www/rpcz.tmpl
6 files changed, 38 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.cloudera.org:29418/Impala-ASF refs/changes/73/14173/2
-- 
To view, visit http://gerrit.cloudera.org:8080/14173
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: Impala-ASF
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I3de9fd1bbb8bb38ce63b3160fcafd33eb0530581
Gerrit-Change-Number: 14173
Gerrit-PatchSet: 2
Gerrit-Owner: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Reviewer: Tim Armstrong <ta...@cloudera.com>

[Impala-ASF-CR] IMPALA-8897 (part 2): Fix javascript to work with Knox integration

Posted by "Impala Public Jenkins (Code Review)" <ge...@cloudera.org>.
Impala Public Jenkins has posted comments on this change. ( http://gerrit.cloudera.org:8080/14173 )

Change subject: IMPALA-8897 (part 2): Fix javascript to work with Knox integration
......................................................................


Patch Set 1:

Build Successful 

https://jenkins.impala.io/job/gerrit-code-review-checks/4455/ : Initial code review checks passed. Use gerrit-verify-dryrun-external or gerrit-verify-dryrun to run full precommit tests.


-- 
To view, visit http://gerrit.cloudera.org:8080/14173
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: Impala-ASF
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I3de9fd1bbb8bb38ce63b3160fcafd33eb0530581
Gerrit-Change-Number: 14173
Gerrit-PatchSet: 1
Gerrit-Owner: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Comment-Date: Tue, 03 Sep 2019 23:39:26 +0000
Gerrit-HasComments: No

[Impala-ASF-CR] IMPALA-8897 (part 2): Fix javascript to work with Knox integration

Posted by "Tim Armstrong (Code Review)" <ge...@cloudera.org>.
Tim Armstrong has posted comments on this change. ( http://gerrit.cloudera.org:8080/14173 )

Change subject: IMPALA-8897 (part 2): Fix javascript to work with Knox integration
......................................................................


Patch Set 1:

(3 comments)

http://gerrit.cloudera.org:8080/#/c/14173/1/tests/webserver/test_web_pages.py
File tests/webserver/test_web_pages.py:

http://gerrit.cloudera.org:8080/#/c/14173/1/tests/webserver/test_web_pages.py@673
PS1, Line 673:     results = grep_dir("/home/thomas/Impala/www", regex, ".*\.tmpl")
I missed this when reviewing the first patch, but it looks like the path is wrong here.


http://gerrit.cloudera.org:8080/#/c/14173/1/www/common-header.tmpl
File www/common-header.tmpl:

http://gerrit.cloudera.org:8080/#/c/14173/1/www/common-header.tmpl@76
PS1, Line 76: compatability
nit: compatibility


http://gerrit.cloudera.org:8080/#/c/14173/1/www/common-header.tmpl@76
PS1, Line 76: shuold
should



-- 
To view, visit http://gerrit.cloudera.org:8080/14173
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: Impala-ASF
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I3de9fd1bbb8bb38ce63b3160fcafd33eb0530581
Gerrit-Change-Number: 14173
Gerrit-PatchSet: 1
Gerrit-Owner: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Reviewer: Tim Armstrong <ta...@cloudera.com>
Gerrit-Comment-Date: Thu, 05 Sep 2019 17:11:00 +0000
Gerrit-HasComments: Yes

[Impala-ASF-CR] IMPALA-8897 (part 2): Fix javascript to work with Knox integration

Posted by "Thomas Tauber-Marshall (Code Review)" <ge...@cloudera.org>.
Thomas Tauber-Marshall has posted comments on this change. ( http://gerrit.cloudera.org:8080/14173 )

Change subject: IMPALA-8897 (part 2): Fix javascript to work with Knox integration
......................................................................


Patch Set 2:

(3 comments)

http://gerrit.cloudera.org:8080/#/c/14173/1/tests/webserver/test_web_pages.py
File tests/webserver/test_web_pages.py:

http://gerrit.cloudera.org:8080/#/c/14173/1/tests/webserver/test_web_pages.py@673
PS1, Line 673:     regex = "(%s)|(%s)|(%s)" % (href_regex, form_regex, javascript_regex)
> I missed this when reviewing the first patch, but it looks like the path is
Done


http://gerrit.cloudera.org:8080/#/c/14173/1/www/common-header.tmpl
File www/common-header.tmpl:

http://gerrit.cloudera.org:8080/#/c/14173/1/www/common-header.tmpl@76
PS1, Line 76: should
> should
Done


http://gerrit.cloudera.org:8080/#/c/14173/1/www/common-header.tmpl@76
PS1, Line 76: compatibility
> nit: compatibility
Done



-- 
To view, visit http://gerrit.cloudera.org:8080/14173
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: Impala-ASF
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I3de9fd1bbb8bb38ce63b3160fcafd33eb0530581
Gerrit-Change-Number: 14173
Gerrit-PatchSet: 2
Gerrit-Owner: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Reviewer: Thomas Tauber-Marshall <tm...@cloudera.com>
Gerrit-Reviewer: Tim Armstrong <ta...@cloudera.com>
Gerrit-Comment-Date: Thu, 05 Sep 2019 18:26:44 +0000
Gerrit-HasComments: Yes