Skip to content

Fix overlord api and console#6686

Merged
clintropolis merged 3 commits intoapache:masterfrom
jihoonson:fix-overlord-api
Nov 30, 2018
Merged

Fix overlord api and console#6686
clintropolis merged 3 commits intoapache:masterfrom
jihoonson:fix-overlord-api

Conversation

@jihoonson
Copy link
Copy Markdown
Contributor

Fixes #6684.

There're two APIs causing the error of "org.apache.druid.java.util.common.ISE: Request did not have an authorization check performed", i.e., /task/{dataSource}/shutdownAllTasks and /dataSources/{dataSource}.

For /task/{dataSource}/shutdownAllTasks, I fixed the bug and changed the path to /datasources/{dataSource}/shutdownAllTasks since I think it makes more sense.

For /dataSources/{dataSource}, I removed it because the new /tasks API can do the same thing. This API was added in #5260 which is tagged 0.13.0, so I think it's fine to remove it.

To test overlord APIs, I fixed OverlordResourceTest to do some real tests. But, authorization check by annotated ResourceFilter is not easy, so I commented out them in the test and opened #6685.

I also fixed the kill button of overlord console.

@jihoonson jihoonson added the Bug label Nov 30, 2018
@jihoonson jihoonson added this to the 0.13.0 milestone Nov 30, 2018
@jihoonson jihoonson changed the title Fix overlord api Fix overlord api and console Nov 30, 2018
Copy link
Copy Markdown
Member

@clintropolis clintropolis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 after CI

I suppose the changes to expectAuthorizationTokenCheck wouldn't have helped here anyway since there is no test for shutdownAllTasks, but I think it's probably good to be checking that checked is called where expected 👍

@clintropolis clintropolis merged commit d6539ab into apache:master Nov 30, 2018
clintropolis pushed a commit to clintropolis/druid that referenced this pull request Nov 30, 2018
* Fix overlord APIs and console

* remove getRunningTasksByDataSource

* add missing path to isApplicable
clintropolis pushed a commit to implydata/druid-public that referenced this pull request Nov 30, 2018
* Fix overlord APIs and console

* remove getRunningTasksByDataSource

* add missing path to isApplicable
fjy pushed a commit that referenced this pull request Nov 30, 2018
* Fix overlord APIs and console

* remove getRunningTasksByDataSource

* add missing path to isApplicable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Two bugs in Overlord API and console

3 participants