This is an automated email from the ASF dual-hosted git repository. amestry pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 10b6d142e479e0b2a27be6a7dd8b9f82a4d3f723 Author: Deep Singh <[email protected]> AuthorDate: Thu Dec 3 12:01:37 2020 -0600 ATLAS-4049: Few admin apis were not redirected to Active server in HA mode Signed-off-by: Ashutosh Mestry <[email protected]> --- .../main/java/org/apache/atlas/web/filters/ActiveServerFilter.java | 3 ++- .../java/org/apache/atlas/web/filters/ActiveServerFilterTest.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java b/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java index 2c28aaf..98eb3d3 100644 --- a/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java +++ b/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java @@ -109,7 +109,8 @@ public class ActiveServerFilter implements Filter { } } - final String adminUriNotFiltered[] = { "/admin/export", "/admin/import", "/admin/importfile" }; + final String adminUriNotFiltered[] = { "/admin/export", "/admin/import", "/admin/importfile", "/admin/audits", + "/admin/purge", "/admin/expimp/audit", "/admin/metrics", "/admin/server", "/admin/audit/" }; private boolean isFilteredURI(ServletRequest servletRequest) { HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest; String requestURI = httpServletRequest.getRequestURI(); diff --git a/webapp/src/test/java/org/apache/atlas/web/filters/ActiveServerFilterTest.java b/webapp/src/test/java/org/apache/atlas/web/filters/ActiveServerFilterTest.java index d7ae0f2..defa5bb 100644 --- a/webapp/src/test/java/org/apache/atlas/web/filters/ActiveServerFilterTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/filters/ActiveServerFilterTest.java @@ -105,7 +105,9 @@ public class ActiveServerFilterTest { @Test public void adminImportRequestsToPassiveServerShouldToActiveServerAddress() throws IOException, ServletException { - String importExportUrls[] = {"api/admin/export", "api/admin/import", "api/admin/importfile"}; + String importExportUrls[] = {"api/admin/export", "api/admin/import", "api/admin/importfile", "api/admin/audits", + "api/admin/purge", "api/admin/expimp/audit", "api/admin/metrics", + "api/admin/server/dummy_name", "api/admin/audit/dummy_guid/details"}; for (String partialUrl : importExportUrls) { when(serviceState.getState()).thenReturn(ServiceState.ServiceStateValue.PASSIVE);
