You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by am...@apache.org on 2020/12/09 22:27:20 UTC
[atlas] branch master updated (294ca40 -> 10b6d14)
This is an automated email from the ASF dual-hosted git repository.
amestry pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git.
from 294ca40 ATLAS-3913 Swagger documentation for APIs
new 8801ba6 ATLAS-4059 rename the config flag for enabling internal kafka topic import
new 10b6d14 ATLAS-4049: Few admin apis were not redirected to Active server in HA mode
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
common/src/main/java/org/apache/atlas/utils/KafkaUtils.java | 2 +-
.../main/java/org/apache/atlas/web/filters/ActiveServerFilter.java | 3 ++-
.../java/org/apache/atlas/web/filters/ActiveServerFilterTest.java | 4 +++-
3 files changed, 6 insertions(+), 3 deletions(-)
[atlas] 01/02: ATLAS-4059 rename the config flag for enabling
internal kafka topic import
Posted by am...@apache.org.
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 8801ba6814abbd2c60c88d04cf1649efed2f3429
Author: Deep Singh <de...@gmail.com>
AuthorDate: Thu Dec 3 12:20:31 2020 -0600
ATLAS-4059 rename the config flag for enabling internal kafka topic import
Signed-off-by: Ashutosh Mestry <am...@cloudera.com>
---
common/src/main/java/org/apache/atlas/utils/KafkaUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java b/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java
index 7e9f789..14e205a 100644
--- a/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java
+++ b/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java
@@ -58,7 +58,7 @@ public class KafkaUtils implements AutoCloseable {
private static final String JAAS_PRINCIPAL_PROP = "principal";
private static final String JAAS_DEFAULT_CLIENT_NAME = "KafkaClient";
private static final String JAAS_TICKET_BASED_CLIENT_NAME = "ticketBased-KafkaClient";
- private static final String IMPORT_INTERNAL_TOPICS = "atlas.hook.kafka.import.internal.topics";
+ private static final String IMPORT_INTERNAL_TOPICS = "atlas.kafka.bridge.enable.internal.topics.import";
public static final String ATLAS_KAFKA_PROPERTY_PREFIX = "atlas.kafka";
[atlas] 02/02: ATLAS-4049: Few admin apis were not redirected to
Active server in HA mode
Posted by am...@apache.org.
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 <de...@gmail.com>
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 <am...@cloudera.com>
---
.../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);