This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch ranger-2.8 in repository https://gitbox.apache.org/repos/asf/ranger.git
commit a84203268977c48cd4da313c45805cf0a67f2b1c Author: Fateh Singh <[email protected]> AuthorDate: Wed Sep 17 21:27:22 2025 -0700 RANGER-5319: Follow-up: Check for tagsync HA not required (#668) * RANGER-5319: Follow-up: Check for tagsync ha not required * RANGER-5319: Follow-up: Preserve interrupt status of thread (cherry picked from commit 2ec6cfd0ea90840d26b6b4a13d9fc697542e30e7) --- .../apache/ranger/tagsync/process/TagSyncConfig.java | 4 ---- .../tagsync/sink/tagadmin/TagAdminRESTSink.java | 19 +++++++++---------- .../ranger/tagsync/source/atlas/AtlasTagSource.java | 19 +++++++++---------- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java b/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java index 8e88b0500..61bb38f54 100644 --- a/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java +++ b/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java @@ -229,10 +229,6 @@ synchronized static public boolean isTagSyncServiceActive() { return TagSyncHAInitializerImpl.getInstance(TagSyncConfig.getInstance()).isActive(); } - public boolean isTagSyncHAEnabled() { - return this.getBoolean(TAGSYNC_SERVER_HA_ENABLED_PARAM, false); - } - public static long getTagSyncHAPassiveSleepInterval() { return DEFAULT_TAGSYNC_HA_PASSIVE_SLEEP_INTERVAL; } diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java b/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java index 692e89de8..aa5164a54 100644 --- a/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java +++ b/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java @@ -396,16 +396,15 @@ public void run() { return; } } else { - // Only sleep when HA is enabled, similar to user sync - if (TagSyncConfig.getInstance().isTagSyncHAEnabled()) { - try { - long sleepInterval = TagSyncConfig.getTagSyncHAPassiveSleepInterval(); - LOG.debug("Sleeping for [{}] milliSeconds as this server is running in passive mode", sleepInterval); - Thread.sleep(sleepInterval); - } catch (InterruptedException interrupted) { - LOG.error("Interrupted..: ", interrupted); - return; - } + try { + long sleepInterval = TagSyncConfig.getTagSyncHAPassiveSleepInterval(); + LOG.debug("Sleeping for [{}] milliSeconds as this server is running in passive mode", sleepInterval); + Thread.sleep(sleepInterval); + } catch (InterruptedException interrupted) { + LOG.error("Interrupted..: ", interrupted); + // preserve interrupt status for caller of the thread + Thread.currentThread().interrupt(); + return; } } } diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java index 7cd2b3849..43d99136a 100644 --- a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java +++ b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java @@ -252,16 +252,15 @@ public void run() { } } } else { - // Only sleep when HA is enabled, similar to user sync - if (TagSyncConfig.getInstance().isTagSyncHAEnabled()) { - try { - long sleepInterval = TagSyncConfig.getTagSyncHAPassiveSleepInterval(); - LOG.debug("Sleeping for [{}] milliSeconds as this server is running in passive mode", sleepInterval); - Thread.sleep(sleepInterval); - } catch (InterruptedException interrupted) { - LOG.error("Interrupted..: ", interrupted); - return; - } + try { + long sleepInterval = TagSyncConfig.getTagSyncHAPassiveSleepInterval(); + LOG.debug("Sleeping for [{}] milliSeconds as this server is running in passive mode", sleepInterval); + Thread.sleep(sleepInterval); + } catch (InterruptedException interrupted) { + LOG.error("Interrupted..: ", interrupted); + // preserve interrupt status for caller of the thread + Thread.currentThread().interrupt(); + return; } } }
