Skip to content

A
atlas
Commit 5bccaa64 by Ashutosh Mestry Committed by Madhan Neethiraj
Options

ATLAS-2460: fix for regression in handling HA mode

Signed-off-by: 's avatarMadhan Neethiraj <madhan@apache.org>
parent 519314f0
Showing with 1 addition and 13 deletions
webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java
...@@ -87,14 +87,6 @@ public class ActiveServerFilter implements Filter { ...@@ -87,14 +87,6 @@ public class ActiveServerFilter implements Filter {
HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse; HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse;
LOG.error("Instance in transition. Service may not be ready to return a result"); LOG.error("Instance in transition. Service may not be ready to return a result");
httpServletResponse.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); httpServletResponse.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
} if(serviceState.isInstanceInMigration()) {
HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse;
LOG.error("Instance in migration. Service may not be ready to return a result");
httpServletResponse.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
} if (serviceState.isInstanceInMigration()) {
HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse;
LOG.error("Instance in migration. Service may not be ready to return a result");
httpServletResponse.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
} else if (serviceState.isInstanceInMigration()) { } else if (serviceState.isInstanceInMigration()) {
HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse; HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse;
LOG.error("Instance in migration. Service may not be ready to return a result"); LOG.error("Instance in migration. Service may not be ready to return a result");
......
webapp/src/main/java/org/apache/atlas/web/service/ServiceState.java
...@@ -61,11 +61,7 @@ public class ServiceState { ...@@ -61,11 +61,7 @@ public class ServiceState {
public ServiceState(Configuration configuration) { public ServiceState(Configuration configuration) {
this.configuration = configuration; this.configuration = configuration;
if(StringUtils.isNotEmpty(configuration.getString(ATLAS_MIGRATION_MODE_FILENAME))) { state = !HAConfiguration.isHAEnabled(configuration) ? ServiceStateValue.ACTIVE : ServiceStateValue.PASSIVE;
state = ServiceStateValue.MIGRATING;
} else {
state = !HAConfiguration.isHAEnabled(configuration) ? ServiceStateValue.ACTIVE : ServiceStateValue.PASSIVE;
}
if(!StringUtils.isEmpty(configuration.getString(ATLAS_MIGRATION_MODE_FILENAME, ""))) { if(!StringUtils.isEmpty(configuration.getString(ATLAS_MIGRATION_MODE_FILENAME, ""))) {
state = ServiceStateValue.MIGRATING; state = ServiceStateValue.MIGRATING;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment